repo
stringlengths 5
75
| commit
stringlengths 40
40
| message
stringlengths 6
18.2k
| diff
stringlengths 60
262k
|
|---|---|---|---|
sunlightlabs/tcorps | c0656d6e406c946a090ca4aea80df50b52b77285 | Added the hidden inputs back around checkboxes | diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index e6d243b..eb23f70 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,47 +1,45 @@
<div class="mainTaskHeader">
<h2>Edit Profile</h2>
<div class="clear"></div>
</div>
<% form_for @user, :html => {:multipart => true} do |f| %>
<%= errors @user %>
<ul>
<li>
<label for='username'>Username</label>
<%= f.text_field :login, :id => 'username', :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email, :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password, :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, :class => 'text', :size => '32' %>
</li>
<li>
<label for='avatar'>Current Avatar</label>
<%= image_tag @user.avatar.url(:normal) %>
</li>
<li>
<label for='user_avatar'>Upload a new avatar</label>
<%= f.file_field :avatar %>
</li>
- <li>
- <label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
- <%= f.check_box :subscribe_campaigns %>
+ <li class="checkboxIndent">
+ <%= f.check_box :subscribe_campaigns %> Email me when there's a new campaign
</li>
- <li>
- <label for='user_subscribe_all'>Email me about other Sunlight services:</label>
- <%= f.check_box :subscribe_all %>
+ <li class="checkboxIndent">
+ <%= f.check_box :subscribe_all %>Email me about other Sunlight services
</li>
<input type="submit" value="Update" name="commit" id="update_button" />
- </ul>
+ </ul>
<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index cd9a53f..afd15f6 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,133 +1,128 @@
<% content_for :class, :signup %>
<div class="mainTaskHeader">
<h2>Join Us</h2>
<div class="clear"></div>
</div>
<p class="join">Already have an account? <%= link_to 'Sign in!', login_path %></p>
<p>Join the cause, by signing up for Transparency Corps with one of the options below.</p>
<div id="signup_nav" class="nav">
<ul>
<li id="nav_standard" class="active"><a href="#">Standard Sign Up</a></li>
<!--
<li id="nav_aol"><a href="#">AOL</a></li>
<li id="nav_yahoo"><a href="#">Yahoo</a></li>
<li id="nav_google"><a href="#">Google</a></li>
<li id="nav_facebook"><a href="#">Facebook</a></li>
-->
<li id="nav_openid"><a href="#">OpenID</a></li>
</ul>
<div class="clear"></div>
</div>
<div id="signup_options">
<%= errors @user %>
<div id="signup_standard" class="signup_option">
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation %>
</li>
<li class="checkboxIndent">
- <input id="user_subscribe_campaigns" name="user[subscribe_campaigns]" type="checkbox" value="newCampaign">Email me when there's a new campaign
- <!--<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
- <%= f.check_box :subscribe_campaigns %>-->
+ <%= f.check_box :subscribe_campaigns %>Email me when there's a new campaign
</li>
<li class="checkboxIndent">
- <input id="user_subscribe_all" name="user[subscribe_all]" type="checkbox" value="newCampaign">Email me about other Sunlight services
- <!--<input type="checkbox" value="newCampaign">Email me when there's a new campaign
- <label for='user_subscribe_all'>Email me about other Sunlight services:</label>
- <%= f.check_box :subscribe_all %>-->
+ <%= f.check_box :subscribe_all %>Email me about other Sunlight services
</li>
</ul>
<%= f.submit 'Register' %>
<% end %>
</div>
<div id="signup_aol" class="signup_option" style="display: none">
<h3>Sign up using your AOL account.</h3>
<p class="tip">Clicking this button will take you to AOL to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="aolBtn" type="submit">
<span>Sign Up Using AOL</span>
</button>
</div>
<div id="signup_yahoo" class="signup_option" style="display: none">
<h3>Sign up using your Yahoo account.</h3>
<p class="tip">Clicking this button will take you to Yahoo to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="yahooBtn" type="submit">
<span>Sign Up Using Yahoo</span>
</button>
</div>
<div id="signup_google" class="signup_option" style="display: none">
<h3>Sign up using your Google account.</h3>
<p class="tip">Clicking this button will take you to Google to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="googleBtn" type="submit">
<span>Sign Up Using Google</span>
</button>
</div>
<div id="signup_facebook" class="signup_option" style="display: none">
<h3>Sign up using your Facebook account.</h3>
<p class="tip">Clicking this button will take you to Facebook to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="facebookBtn" type="submit">
<span>Sign Up Using Facebook</span>
</button>
</div>
<div id="signup_openid" class="signup_option" style="display: none">
<h3>Sign up using your OpenID account.</h3>
<p class="tip">Clicking this button will take you to OpenID to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<label for="user_openid_identifier">OpenID</label>
<%= f.text_field :openid_identifier, :value => @user.openid_identifier.blank? ? 'http://' : @user.openid_identifier %>
</li>
<li>
<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
<%= f.check_box :subscribe_campaigns %>
</li>
<li>
<label for='user_subscribe_all'>Email me about other Sunlight services:</label>
<%= f.check_box :subscribe_all %>
</li>
</ul>
<button class="openidBtn" type="submit">
<span>Sign Up Using OpenID</span>
</button>
<% end %>
</div>
</div>
<% if open_id_return? %>
<% javascript_tag do %>
switch_nav('openid', 'signup');
<% end %>
<% end %>
\ No newline at end of file
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 148cdcb..64bc1ff 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -1,318 +1,319 @@
/*
* YUI Resect CSS version: 2.2.2
* Copyright (c) 2007, Yahoo! Inc. All rights reserved.
* Licensed under the BSD License: http://developer.yahoo.net/yui/license.txt
*/
body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,optgroup,button,p,blockquote,th,td{margin:0;padding:0;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}table{border-collapse:collapse;border-spacing:0;}caption,th{text-align:left;}ol,ul{list-style:none;}fieldset,img{border:0;}input,textarea,select,optgroup,option,button{font-family:inherit;font-size:100%;}button,input {width: auto;overflow: visible;}optgroup,address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym {border:0;}
dl li{list-style: none;}
a:link{outline: none; color: #00788a;}
a:visited{outline: none; color: #00788a}
a:hover{outline: none; color: #00788a}
a:active{outline: none; color: #00788a}
body{
color:#6c6d6e;
background: url(/images/mainBg.jpg) top left repeat;
font-size: 76%;
line-height: 20px;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
}
div#ltColumn p { font-size: 108%; line-height: 21px;}
.clear{ clear: both;}
.fieldWithErrors {padding: 0; margin: 0; display: inline;}
div#headerWrapper{ background: url(/images/headerBg2_repeat.jpg) top center repeat-x;}
div#pageMain{ background: url(/images/headerBg2.jpg) top center no-repeat; width: 960px; margin: 0 auto;}
div#header{ height: 237px;}
h1{ float: left; width: 260px; height: 176px; margin-left: 20px;}
h1 a{ width: 260px; height: 176px; background: url(/images/logo.png) top left no-repeat; text-indent: -9999em; display: block;}
div#accountInfo a{ color: #fff; font-weight: bold; padding: 0 3px 0 4px; margin-right: 3px; float: right;}
div#accountInfo span{ float: right; margin-right: 5px;}
div#accountInfo{ text-align: right; color: #e6e7e8; padding-top: 11px;}
div#accountInfo a#smAvatar { padding-top:3px; width: 24px; height: 24px; display: block; padding-top: 3px; margin-top: -8px;}
span.bar { float: right;}
div#nav { float: left; margin-top: -25px;}
div#featureSection a {
background: url(/images/btn_getStarted.png) bottom left no-repeat;
display: block;
width: 197px;
height: 85px;
text-indent: -9999em;
margin-left: 720px;
//padding-top: 130px;
padding-top: 105px;
}
div#featureSection h2{ font-size: 250%; color: #e7e7e8; line-height: 35px; margin-bottom: 15px; width: 700px;}
div#featureText{
//width: 480px;
width: 550px;
float: left;
//margin-left: 220px;
margin-left: 50px;
//padding-top: 55px;
padding-top: 40px;
}
div#featureText p {
//width: 370px;
width: 600px;
font-size: 113%;
color: #848383;
}
div#nav ul{ margin-left:350px;}
div#nav ul li {float: left; margin-left: 10px;}
div#nav li a { width: 108px; height: 59px; text-indent: -9999em; display: block;}
li#nav_tasks a{ background: url(/images/nav_tasks.png) left top no-repeat;}
li#nav_tasks a.active{ background: url(/images/nav_tasks.png) left bottom no-repeat;}
div#nav ul li#nav_leaders a{ background: url(/images/nav_leaders.png) left top no-repeat; width: 208px; }
div#nav ul li#nav_leaders a.active{ background: url(/images/nav_leaders.png) left bottom no-repeat; width: 208px; }
li#nav_about a{ background: url(/images/nav_about.png) left top no-repeat;}
li#nav_about a.active{ background: url(/images/nav_about.png) left bottom no-repeat;}
li#nav_contact a{ background: url(/images/nav_contact.png) left top no-repeat;}
li#nav_contact a.active{ background: url(/images/nav_contact.png) left bottom no-repeat;}
div#mainContent{ background: #fff; margin: 0 20px 20px; border-left: 1px solid #e2e2e2; border-right: 1px solid #e2e2e2; border-bottom: 1px solid #e2e2e2; padding-top: 20px; -moz-border-radius-bottomright: 3px; -webkit-border-radius-bottomleft: 3px;}
div#featureSection { background: url(/images/featureBox2.jpg) top left no-repeat; width: 960px; height: 249px; margin: 0px; padding: 0px;}
body.home div#ltColumn{ width: 492px;}
div#ltColumn{ padding: 20px 30px 40px; width: 540px; float: left;}
h2{
font-family: Baskerville, Georgia, Times New Roman, Times, serif;
color: #231f20;
font-size: 235%;
float: left;
}
/*div#ltColumn h2{ background: url(/images/bar_ltColumn.png) bottom left no-repeat; width: 492px; height: 29px; display: block; font-size: 235%; padding-bottom: 10px; margin-bottom: 10px;}*/
div.mainTaskHeader{ background: url(/images/bar_ltColumn.png) bottom left no-repeat; width: 572px; display: block; padding-bottom: 15px; margin-bottom: 20px; }
div.mainTaskHeader h2{ width: 420px; line-height: 32px; margin-top: -5px; float: left;}
body.home div.mainTaskHeader{ background: url(/images/bar_ltColumn_home.png) bottom left no-repeat; width: 492px;}
div#rtColumn{ float: left; background: url(/images/rtBorder.jpg) 3px top repeat-y; margin-left: 43px;}
div#rtContent{ width: 215px; padding: 10px 30px 30px 30px;}
body.home div#rtContent{ width: 306px; }
div#rtBorder{ background: url(/images/rtBorder_top.jpg) left top no-repeat; }
body.home div#rtColumn{ margin-left: 0;}
h3{ color: #4f4e4d; font-size: 140%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; margin-bottom: 5px;}
div#rtColumn h3{ background: url(/images/bar_rtColumn.png) bottom left no-repeat; margin-bottom: 20px; font-size: 160%; line-height: 21px; padding-bottom: 5px;}
div#rtColumn h4 { font-size: 130%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; float: left; height: auto !important; min-height: 27px; width: auto !important; max-width: 140px;}
body.home div#rtColumn h4{ width: auto !important; max-width: 180px;}
body.home div.taskTop{ padding: 20px 20px 0;}
div.taskTop{ padding: 15px 15px 0; }
div#rtColumn div.taskTop img { max-width: 180px; }
div#ltColumn img { max-width: 540px; }
p img { display: block; margin-top: 10px; margin-bottom: 10px;}
div#rtContent ul li{ background: #f9f9f9; border: 1px solid #e6e7e7; -moz-border-radius: 3px; -webkit-border-radius: 3px;}
div.taskMetadata span.taskValue, body.home div#rtColumn div.taskMetadata span.taskValue{ background: url(/images/task_pointCircle.png) top left no-repeat; color: #fff; width: 27px; height: 27px; text-align: center; padding-top: 3px; margin-right: 5px; margin-top: -4px;}
div#rtColumn div.taskMetadata span.taskValue{ margin-right: 0;}
div#ltColumn div.taskMetadata span.taskValue{ background: url(/images/mainTask_pointCircle.jpg) top left no-repeat; width: 30px; height: 30px; float: right; padding-top: 5px; margin-right: 5px}
div.taskMetadata span {float: right;}
div#ltColumn div.taskMetadata span{ margin-right: 55px;}
div.taskMetadata { font-style: oblique;}
div#ltColumn div.taskMetadata { font-style: oblique; font-size: 110%;}
div.taskHeader{ margin-bottom: 10px;}
p {margin-bottom: 20px;}
div#rtColumn ul li { margin-bottom: 20px;}
div.taskDetail{ background: #ececed; -moz-border-radius-bottomright: 3px; -webkit-border-radius-bottomleft: 3px; padding: 5px 15px;}
body.home div.taskDetail{ padding: 5px 20px;}
div#ltColumn div.taskDetail, form#contactForm, div#signup_options, form.edit_user, div#signin_options{ background: #f9f9f9; -moz-border-radius: 3px; -webkit-border-radius: 3px; border: solid 1px #ececed; padding: 15px 20px; margin-bottom: 15px;}
div#signup_options, div#signin_options{ margin-top: -2px;}
p.join {font-weight: bold; font-size: 1.2em;}
div#signup_options, form#contactForm, div.signin_option ul, form.edit_user{ padding-top: 25px; padding-bottom: 40px;}
span.tagValue{
background: url(/images/highlightBar2.jpg) left top repeat-x;
position: absolute;
top: 0;
left: 0;
text-indent: -9999em;
float: left;
overflow: hidden;
}
div#rtContent span.tagValue{ background: url(/images/highlightBar.jpg) left top repeat-x;}
div.taskBar{ background-color: #fff; width: 403px; border: 1px solid #bfbfbe; position: relative; line-height: 1.3em; height: 10px; float: left; margin: 6px 13px 0 0;}
div#rtContent div.taskBar{ width: 180px; height: 5px;}
body.home div#rtContent div.taskBar{ width: 185px;}
ul#taskList div.taskBar{ height: 5px;}
div#ltColumn ul#taskList div.taskMetadata span{ margin-right: 10px;}
div#ltColumn ul#taskList div.taskTop{ padding: 15px 0 0 0 ;}
ul#taskList li { border-bottom: solid 1px #ececed; padding-bottom: 15px; margin-bottom: 15px;}
ul#taskList h3 { font-size: 150%; float: left;}
div#ltColumn ul#taskList div.taskDetail { padding: 8px 20px;}
div#ltColumn ul#taskList span.tagNumber{ font-size: 90%;}
div#ltColumn ul#taskList span.tagValue { background: url(/images/highlightBar.jpg) repeat-x left top;}
span.startBtn{ width: 98px; height: 36px; border: none 0; background: none; margin-bottom: 15px; cursor: pointer;}
span.startBtn a{ width: 98px; height: 36px; text-indent: -9999em; background: url(/images/btn_start.png) top left no-repeat; display: block; border: none;}
span.tagNumber { font-weight: bold; font-size: 90%; color: #da7c02;}
div#ltColumn span.tagNumber { font-size: 110%; padding-top: 5px; }
div#taskScoreboard{ float: right; background: url(/images/scoreboardBg.jpg) top right no-repeat; width: 312px; height: 158px; }
div#taskScoreboard dt, div#taskScoreboard dd{ color: #fff; font-size: 150%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; line-height: 28px;}
div#taskScoreboard dl { padding: 50px 0 0 60px;}
div#taskScoreboard dt{ float: left; font-weight: bold; margin-right: 5px;}
form#contactForm label, form#new_user label, form#new_user_session label, form.edit_user label{ font-weight: bold; width: 100px; display: block; float: left; padding-top:5px;}
form#new_user label, form.edit_user label{ width: 160px;}
form#contactForm input, form#contactForm textarea, form#new_user input, form#new_user textarea, form#new_user_session input, form#new_user_session textarea, form.edit_user input, input#openid_username{ border: dotted 1px #d8d8d8; -moz-border-radius: 3px; -webkit-border-radius: 3px; width: 300px; padding: 5px;}
form#contactForm input, form#new_user input, form#new_user_session input, form.edit_user input{ height: 15px;}
form li{ margin-bottom: 10px;}
+input:hidden {display: none}
form.edit_user input#user_avatar{ height: 25px;}
input#openid_username{ margin-bottom: 15px;}
button.submitBtn span{ background: url(/images/btn_submit.png) top left no-repeat; display: block; width: 136px; height: 43px; text-indent: -9999em; }
button.submitBtn{ border: 0; background: none; margin-left: 100px; margin-top: 20px;}
div#footer{ width: 960; margin: 0 auto; font-size: 90%; padding: 0 20px;}
div#footerBrand{ float: left; border-right: 1px solid #6c6b6b; margin-right: 15px; padding-right: 15px;}
div#footerBrand a{ background: url(/images/foundationLogo.png) top left no-repeat; display: block; text-indent: -9999em; width: 132px; height: 61px;}
/* Styling for popup task page - needs attention */
body.task div.header {height: 50px; padding: 10px; margin-bottom: 10px;}
body.task div.campaign {float: left; width: 78%;}
body.task div.nav {float: right; width: 18%;}
body.task div.header span.title {
font-size: 200%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; color: #231f20; margin-bottom: 10px; padding-top: 5px;
}
body.task div.header span.instructions {
font-family: Helvetica Neue, Helvetica, Arial, sans-serif; margin-bottom: 15px;
}
body.task div.header span.instructions p {padding: 0; margin: 5px;}
body.task div.header div.nav a.back {}
input#anotherTask {
background: url(/images/btn_anotherTask.png) top left no-repeat; width: 148px; height: 37px; display: block; text-indent: -9999em; border: none;
}
iframe#task_frame {width: 100%; height: 800px; margin: 0; padding: 0; clear: both; margin-top: 10px;}
form#new_user input#user_submit, form#new_user_session input#user_session_submit, form.edit_user input#update_button, button.openidBtn { border: none; display: block; width: 137px; height: 44px; text-indent: -9999em; margin-top: 20px;}
div#signin_options button.openidBtn{ margin-left: 0px;}
button.openidBtn{ margin-left: 160px;}
input#update_button{ background: url(/images/btn_update.png) top left no-repeat; margin-left: 160px;}
form#new_user input#user_submit{ background: url(/images/btn_register.png) top left no-repeat; margin-left: 160px;}
form#new_user_session input#user_session_submit { background: url(/images/btn_login.png) top left no-repeat; margin-left: 100px;}
div#signup_nav li, div#signin_nav li{ float: left; padding: 5px 5px 8px; margin-top: 10px; margin-right: 5px;}
li#nav_aol a{ width: 75px; height: 20px; background: url(/images/logo_aol.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_aol { width: 75px; height: 20px;}
li#nav_yahoo a{ width: 75px; height: 20px; background: url(/images/logo_yahoo.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_yahoo { width: 75px; height: 20px;}
li#nav_google a{ width: 75px; height: 20px; background: url(/images/logo_google.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_google { width: 75px; height: 20px;}
li#nav_facebook a{ width: 75px; height: 20px; background: url(/images/logo_facebook.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_facebook { width: 75px; height: 20px;}
li#nav_openid a{ width: 75px; height: 20px; background: url(/images/logo_openid.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_openid { width: 75px; height: 20px;}
li.active{ background-color: #F9F9F9; border-top: 1px solid #ECECED; border-left: 1px solid #ECECED; border-right: 1px solid #ECECED; -moz-border-radius-topright: 4px; -webkit-border-radius-topleft: 4px;}
li#nav_standard a{ color: #d65203; font-weight: bold; text-decoration: none;}
div#signup_options button, div#signin_options button{ border: none; text-indent: -9999em; display: block; height: 42px; }
button.aolBtn{ background: url(/images/btn_aol.png) top left no-repeat; width: 176px; }
button.yahooBtn{ background: url(/images/btn_yahoo.png) top left no-repeat; width: 196px; }
button.googleBtn{ background: url(/images/btn_google.png) top left no-repeat; width: 196px; }
button.facebookBtn{ background: url(/images/btn_facebook.png) top left no-repeat; width: 209px; }
button.openidBtn{ background: url(/images/btn_openid.png) top left no-repeat; width: 209px; }
div#signin_options button.aolBtn{ background: url(/images/btn_aol2.png) top left no-repeat; width: 176px; }
div#signin_options button.yahooBtn{ background: url(/images/btn_yahoo2.png) top left no-repeat; width: 196px; }
div#signin_options button.googleBtn{ background: url(/images/btn_google2.png) top left no-repeat; width: 196px; }
div#signin_options button.facebookBtn{ background: url(/images/btn_facebook2.png) top left no-repeat; width: 209px; }
div#signin_options button.openidBtn{ background: url(/images/btn_openid2.png) top left no-repeat; width: 209px; }
p.tip{ font-style: oblique; font-size: 90%; line-height: 15px; color: #909192;}
input#startTask { background: url(/images/btn_startthis.png) top left no-repeat; width: 124px; height: 36px; display: block; text-indent: -9999em; border: none;}
body.leaders div#ltColumn{ width: 860px;}
div.rank { margin-bottom: 30px;}
div.rank p{ text-align: center; font-style: oblique;}
ol.leaders{ margin-left: 50px;}
ol.leaders li{ margin-left: 10px; margin-right: 10px;float: left; width: 170px; }
ol.leaders li img{ float: left; margin: 0 10px 20px 0;}
div.rankHeader{ background: url(/images/fullBar.png) bottom left no-repeat; width: ; padding-bottom: 30px; margin-bottom: 20px;}
body.leaders dl{ font-family: Baskerville, Georgia, Times New Roman, Times, serif; padding-top: 40px; padding-left: 60px;}
body.leaders dt{ float: left;}
span.leaderName{ display: block; line-height: 18px; padding-top: 15px;}
dt.rankTitle, dt.pointTitle {display: none; }
dd.rankTitle{ font-size: 280%; color: #231f20; margin-bottom: 10px; font-weight: bold;}
div.rankHeader dl dt { margin-right: 3px;}
.level{ font-size: 140%; margin-bottom: 8px; color: #797474; }
dd.pointTitle, span.leaderPoints {font-family: Helvetica Neue, Helvetica, Arial, sans-serif; color: #a8a8a8; font-style: oblique;}
div.rankHeader img { float: left; margin: 0 10px 10px 40px;}
div.contact_form_validation, div.error { margin-bottom: 15px; font-size: 120%; font-weight: bold; color: #b52802;}
div.error{ margin-bottom: 0px;}
div.errors{ margin-bottom: 15px;}
div.flash {
width: 520px; background: #f7f2cc; -moz-border-radius: 3px; -webkit-border-radius: 3px;
padding: 10px; margin-left: 30px;
}
div.flash.failure {
border: 1px solid #fae19c; color: #da7c02;
}
div.flash.success {
border: 1px solid #fae19c; color: #da7c02;
}
body.home div.flash {
width: 472px;
}
div#rtColumn ul#newMembers li { background: none; border: none; height: 64px; margin-bottom: 15px;}
div#rtColumn ul#newMembers img { float: left; height: 64px; margin: 0 15px 15px 0;}
li.checkboxIndent { margin-left: 160px; font-style: oblique; font-size: 95%; margin-bottom: 5px;}
li.checkboxIndent input { display: block; float: left; margin-right: 10px; margin-top: 2px;}
\ No newline at end of file
|
sunlightlabs/tcorps | 9f100cd9241b330166bf46e7ab571f8b1a34ae1d | #77 - Obey the start time set in the admin area | diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index b58295e..795973f 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -1,41 +1,41 @@
class Campaign < ActiveRecord::Base
belongs_to :creator, :class_name => 'User'
has_many :tasks
validates_presence_of :name, :points, :url, :runs, :start_at
validates_numericality_of :runs, :greater_than => 0
named_scope :active,
:select => "campaigns.*",
- :conditions => "(select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs"
+ :conditions => ["start_at < ? and (select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs", Time.now]
named_scope :active_for, lambda {|user|
# ActiveRecord does not offer ?-style interpolation for the select parameter,
# and the id attribute is not subject to user manipulation, so this is safe
{
:select => "campaigns.*",
- :conditions => "(select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs and (campaigns.user_runs IS NULL OR campaigns.user_runs = 0 OR (select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL and tasks.user_id = #{user.id}) < campaigns.user_runs)"
+ :conditions => ["start_at < ? and (select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs and (campaigns.user_runs IS NULL OR campaigns.user_runs = 0 OR (select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL and tasks.user_id = ?) < campaigns.user_runs)", Time.now, user.id]
}
}
def self.percent_complete
tasks_complete = Task.completed.count
runs = Campaign.sum :runs
return 0 if tasks_complete == 0 or runs == 0
((Task.completed.count.to_f / Campaign.sum(:runs).to_f) * 100).to_i
end
def percent_complete
# since runs must be greater than 0 in the validations,
# NaN and divide by zero errors are not an issue
((tasks.completed.count.to_f / runs.to_f) * 100).to_i
end
def complete?(user = nil)
if user
tasks.for_user(user).completed.count == user_runs
else
tasks.completed.count == runs
end
end
end
\ No newline at end of file
diff --git a/test/factories.rb b/test/factories.rb
index df08197..1cca56b 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -1,44 +1,44 @@
require 'factory_girl'
Factory.define :task do |t|
t.association :user
t.association :campaign
end
Factory.define :completed_task, :parent => :task do |t|
t.completed_at {Time.now}
end
Factory.define :campaign do |c|
c.association :creator, :factory => :manager
c.name {Factory.next :campaign_name}
c.keyword {Factory.next :campaign_keyword}
c.url {|a| "http://example.com/#{a.keyword}"}
c.instructions 'Instructions'
c.description 'Public description'
c.private_description 'Private description'
c.points 5
c.runs 100
c.user_runs 100
- c.start_at {Time.now}
+ c.start_at {2.days.ago}
end
Factory.sequence(:campaign_keyword) {|i| "campaign#{i}"}
Factory.sequence(:campaign_name) {|i| "Campaign #{i}"}
Factory.define :user do |u|
u.login {Factory.next :user_login}
u.email {Factory.next :user_email}
u.password 'test'
u.password_confirmation 'test'
end
Factory.sequence(:user_login) {|i| "user#{i}"}
Factory.sequence(:user_email) {|i| "user#{i}@example.com"}
Factory.define :manager, :parent => :user do |u|
u.organization_name 'Organization Name'
end
Factory.define :admin, :parent => :user do |u|
u.admin true
end
\ No newline at end of file
diff --git a/test/unit/campaign_test.rb b/test/unit/campaign_test.rb
index 6269261..973e820 100644
--- a/test/unit/campaign_test.rb
+++ b/test/unit/campaign_test.rb
@@ -1,143 +1,160 @@
require 'test_helper'
class CampaignTest < ActiveSupport::TestCase
test 'Campaign.percent_complete measures percent of all completed tasks' do
campaign1 = Factory :campaign, :runs => 5
campaign2 = Factory :campaign, :runs => 5
3.times {Factory :task, :campaign => campaign1}
3.times {Factory :task, :campaign => campaign2}
2.times {Factory :completed_task, :campaign => campaign1}
2.times {Factory :completed_task, :campaign => campaign2}
assert_equal 40, Campaign.percent_complete
2.times {Factory :completed_task, :campaign => campaign1}
assert_equal 60, Campaign.percent_complete
end
test '#percent_complete measures percent of completed tasks' do
campaign = Factory :campaign, :runs => 5
task1 = Factory :task, :campaign => campaign
task2 = Factory :task, :campaign => campaign
task3 = Factory :task, :campaign => campaign
task4 = Factory :task, :campaign => campaign
task5 = Factory :task, :campaign => campaign
assert_equal 0, campaign.percent_complete
task1.update_attribute :completed_at, Time.now
assert_equal 20, campaign.percent_complete
task2.update_attribute :completed_at, Time.now
assert_equal 40, campaign.percent_complete
task3.update_attribute :completed_at, Time.now
assert_equal 60, campaign.percent_complete
task4.update_attribute :completed_at, Time.now
assert_equal 80, campaign.percent_complete
task5.update_attribute :completed_at, Time.now
assert_equal 100, campaign.percent_complete
end
+ test '#active named scope limits search to campaigns who are past their start time' do
+ started = Factory :campaign, :start_at => 3.days.ago
+ not_started = Factory :campaign, :start_at => 3.days.from_now
+
+ assert Campaign.active.include?(started)
+ assert !Campaign.active.include?(not_started)
+ end
+
test '#active named scope limits search to campaigns who have fewer completed tasks than the # of specified runs' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert !Campaign.active.include?(campaign3)
end
- test '#active named scope limits search to campaigns where the user has not reached their individual run limit' do
+ test '#active_for named scope limits search to campaigns where the user has not reached their individual run limit' do
user = Factory :user
campaign1 = Factory :campaign, :runs => 20, :user_runs => 2
campaign2 = Factory :campaign, :runs => 20, :user_runs => 2
campaign3 = Factory :campaign, :runs => 20, :user_runs => 2
campaign4 = Factory :campaign, :runs => 20, :user_runs => nil
Factory :task, :campaign => campaign1, :user => user
Factory :task, :campaign => campaign1, :user => user
Factory :completed_task, :campaign => campaign2, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert Campaign.active.include?(campaign3)
assert Campaign.active.include?(campaign4)
assert Campaign.active_for(user).include?(campaign1)
assert Campaign.active_for(user).include?(campaign2)
assert !Campaign.active_for(user).include?(campaign3)
assert Campaign.active_for(user).include?(campaign4)
end
+ test '#active_for named scope limits search to campaigns who are past their start time' do
+ started = Factory :campaign, :user_runs => 2, :start_at => 3.days.ago
+ not_started = Factory :campaign, :user_runs => 2, :start_at => 3.days.from_now
+ user = Factory :user
+
+ assert Campaign.active_for(user).include?(started)
+ assert !Campaign.active_for(user).include?(not_started)
+ end
+
test '#complete? indicates whether the maximum runs have been met' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert !campaign1.complete?
assert !campaign2.complete?
assert campaign3.complete?
end
test '#complete? with a user passed in indicates whether the maximum runs for that user have been met' do
user1 = Factory :user
user2 = Factory :user
user3 = Factory :user
campaign1 = Factory :campaign, :runs => 3, :user_runs => 1
campaign2 = Factory :campaign, :runs => 3, :user_runs => 2
campaign3 = Factory :campaign, :runs => 3, :user_runs => 3
Factory :task, :campaign => campaign1, :user => user1
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user1
Factory :completed_task, :campaign => campaign3, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user3
assert !campaign1.complete?(user1)
assert !campaign1.complete?(user2)
assert !campaign1.complete?
assert !campaign2.complete?(user1)
assert campaign2.complete?(user2)
assert !campaign2.complete?
assert !campaign3.complete?(user1)
assert !campaign3.complete?(user2)
assert !campaign3.complete?(user3)
assert campaign3.complete?
end
test '#complete? for a user will always return false if the user_runs field is blank' do
user = Factory :user
endless_campaign = Factory :campaign, :user_runs => nil, :runs => 5000
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
end
end
\ No newline at end of file
|
sunlightlabs/tcorps | c25aa7e89940ab4aa16b6eeae74992227383d59f | style changes to checkboxes for Join us section | diff --git a/app/views/layouts/partials/_user_sidebar.html.erb b/app/views/layouts/partials/_user_sidebar.html.erb
index f382140..c206447 100644
--- a/app/views/layouts/partials/_user_sidebar.html.erb
+++ b/app/views/layouts/partials/_user_sidebar.html.erb
@@ -1,9 +1,10 @@
<h3 class="space">Top Members</h3>
<ul id="newMembers">
<% @users.each do |user| %>
<li>
<%= image_tag user.avatar.url(:normal) %>
<span class="leaderName"><%= h user.login %></span>
+ <span class="leaderPoints"><%= user.sum_points %> pts</span>
</li>
<% end %>
</ul>
\ No newline at end of file
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 9c32cd3..cd9a53f 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,130 +1,133 @@
<% content_for :class, :signup %>
<div class="mainTaskHeader">
<h2>Join Us</h2>
<div class="clear"></div>
</div>
<p class="join">Already have an account? <%= link_to 'Sign in!', login_path %></p>
<p>Join the cause, by signing up for Transparency Corps with one of the options below.</p>
<div id="signup_nav" class="nav">
<ul>
<li id="nav_standard" class="active"><a href="#">Standard Sign Up</a></li>
<!--
<li id="nav_aol"><a href="#">AOL</a></li>
<li id="nav_yahoo"><a href="#">Yahoo</a></li>
<li id="nav_google"><a href="#">Google</a></li>
<li id="nav_facebook"><a href="#">Facebook</a></li>
-->
<li id="nav_openid"><a href="#">OpenID</a></li>
</ul>
<div class="clear"></div>
</div>
<div id="signup_options">
<%= errors @user %>
<div id="signup_standard" class="signup_option">
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation %>
</li>
- <li>
- <label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
- <%= f.check_box :subscribe_campaigns %>
+ <li class="checkboxIndent">
+ <input id="user_subscribe_campaigns" name="user[subscribe_campaigns]" type="checkbox" value="newCampaign">Email me when there's a new campaign
+ <!--<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
+ <%= f.check_box :subscribe_campaigns %>-->
</li>
- <li>
+ <li class="checkboxIndent">
+ <input id="user_subscribe_all" name="user[subscribe_all]" type="checkbox" value="newCampaign">Email me about other Sunlight services
+ <!--<input type="checkbox" value="newCampaign">Email me when there's a new campaign
<label for='user_subscribe_all'>Email me about other Sunlight services:</label>
- <%= f.check_box :subscribe_all %>
+ <%= f.check_box :subscribe_all %>-->
</li>
</ul>
<%= f.submit 'Register' %>
<% end %>
</div>
<div id="signup_aol" class="signup_option" style="display: none">
<h3>Sign up using your AOL account.</h3>
<p class="tip">Clicking this button will take you to AOL to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="aolBtn" type="submit">
<span>Sign Up Using AOL</span>
</button>
</div>
<div id="signup_yahoo" class="signup_option" style="display: none">
<h3>Sign up using your Yahoo account.</h3>
<p class="tip">Clicking this button will take you to Yahoo to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="yahooBtn" type="submit">
<span>Sign Up Using Yahoo</span>
</button>
</div>
<div id="signup_google" class="signup_option" style="display: none">
<h3>Sign up using your Google account.</h3>
<p class="tip">Clicking this button will take you to Google to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="googleBtn" type="submit">
<span>Sign Up Using Google</span>
</button>
</div>
<div id="signup_facebook" class="signup_option" style="display: none">
<h3>Sign up using your Facebook account.</h3>
<p class="tip">Clicking this button will take you to Facebook to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="facebookBtn" type="submit">
<span>Sign Up Using Facebook</span>
</button>
</div>
<div id="signup_openid" class="signup_option" style="display: none">
<h3>Sign up using your OpenID account.</h3>
<p class="tip">Clicking this button will take you to OpenID to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<label for="user_openid_identifier">OpenID</label>
<%= f.text_field :openid_identifier, :value => @user.openid_identifier.blank? ? 'http://' : @user.openid_identifier %>
</li>
<li>
<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
<%= f.check_box :subscribe_campaigns %>
</li>
<li>
<label for='user_subscribe_all'>Email me about other Sunlight services:</label>
<%= f.check_box :subscribe_all %>
</li>
</ul>
<button class="openidBtn" type="submit">
<span>Sign Up Using OpenID</span>
</button>
<% end %>
</div>
</div>
<% if open_id_return? %>
<% javascript_tag do %>
switch_nav('openid', 'signup');
<% end %>
<% end %>
\ No newline at end of file
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 95674e9..148cdcb 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -1,315 +1,318 @@
/*
* YUI Resect CSS version: 2.2.2
* Copyright (c) 2007, Yahoo! Inc. All rights reserved.
* Licensed under the BSD License: http://developer.yahoo.net/yui/license.txt
*/
body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,optgroup,button,p,blockquote,th,td{margin:0;padding:0;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}table{border-collapse:collapse;border-spacing:0;}caption,th{text-align:left;}ol,ul{list-style:none;}fieldset,img{border:0;}input,textarea,select,optgroup,option,button{font-family:inherit;font-size:100%;}button,input {width: auto;overflow: visible;}optgroup,address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym {border:0;}
dl li{list-style: none;}
a:link{outline: none; color: #00788a;}
a:visited{outline: none; color: #00788a}
a:hover{outline: none; color: #00788a}
a:active{outline: none; color: #00788a}
body{
color:#6c6d6e;
background: url(/images/mainBg.jpg) top left repeat;
font-size: 76%;
line-height: 20px;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
}
div#ltColumn p { font-size: 108%; line-height: 21px;}
.clear{ clear: both;}
.fieldWithErrors {padding: 0; margin: 0; display: inline;}
div#headerWrapper{ background: url(/images/headerBg2_repeat.jpg) top center repeat-x;}
div#pageMain{ background: url(/images/headerBg2.jpg) top center no-repeat; width: 960px; margin: 0 auto;}
div#header{ height: 237px;}
h1{ float: left; width: 260px; height: 176px; margin-left: 20px;}
h1 a{ width: 260px; height: 176px; background: url(/images/logo.png) top left no-repeat; text-indent: -9999em; display: block;}
div#accountInfo a{ color: #fff; font-weight: bold; padding: 0 3px 0 4px; margin-right: 3px; float: right;}
div#accountInfo span{ float: right; margin-right: 5px;}
div#accountInfo{ text-align: right; color: #e6e7e8; padding-top: 11px;}
div#accountInfo a#smAvatar { padding-top:3px; width: 24px; height: 24px; display: block; padding-top: 3px; margin-top: -8px;}
span.bar { float: right;}
div#nav { float: left; margin-top: -25px;}
div#featureSection a {
background: url(/images/btn_getStarted.png) bottom left no-repeat;
display: block;
width: 197px;
height: 85px;
text-indent: -9999em;
margin-left: 720px;
//padding-top: 130px;
padding-top: 105px;
}
div#featureSection h2{ font-size: 250%; color: #e7e7e8; line-height: 35px; margin-bottom: 15px; width: 700px;}
div#featureText{
//width: 480px;
width: 550px;
float: left;
//margin-left: 220px;
margin-left: 50px;
//padding-top: 55px;
padding-top: 40px;
}
div#featureText p {
//width: 370px;
width: 600px;
font-size: 113%;
color: #848383;
}
div#nav ul{ margin-left:350px;}
div#nav ul li {float: left; margin-left: 10px;}
div#nav li a { width: 108px; height: 59px; text-indent: -9999em; display: block;}
li#nav_tasks a{ background: url(/images/nav_tasks.png) left top no-repeat;}
li#nav_tasks a.active{ background: url(/images/nav_tasks.png) left bottom no-repeat;}
div#nav ul li#nav_leaders a{ background: url(/images/nav_leaders.png) left top no-repeat; width: 208px; }
div#nav ul li#nav_leaders a.active{ background: url(/images/nav_leaders.png) left bottom no-repeat; width: 208px; }
li#nav_about a{ background: url(/images/nav_about.png) left top no-repeat;}
li#nav_about a.active{ background: url(/images/nav_about.png) left bottom no-repeat;}
li#nav_contact a{ background: url(/images/nav_contact.png) left top no-repeat;}
li#nav_contact a.active{ background: url(/images/nav_contact.png) left bottom no-repeat;}
div#mainContent{ background: #fff; margin: 0 20px 20px; border-left: 1px solid #e2e2e2; border-right: 1px solid #e2e2e2; border-bottom: 1px solid #e2e2e2; padding-top: 20px; -moz-border-radius-bottomright: 3px; -webkit-border-radius-bottomleft: 3px;}
div#featureSection { background: url(/images/featureBox2.jpg) top left no-repeat; width: 960px; height: 249px; margin: 0px; padding: 0px;}
body.home div#ltColumn{ width: 492px;}
div#ltColumn{ padding: 20px 30px 40px; width: 540px; float: left;}
h2{
font-family: Baskerville, Georgia, Times New Roman, Times, serif;
color: #231f20;
font-size: 235%;
float: left;
}
/*div#ltColumn h2{ background: url(/images/bar_ltColumn.png) bottom left no-repeat; width: 492px; height: 29px; display: block; font-size: 235%; padding-bottom: 10px; margin-bottom: 10px;}*/
div.mainTaskHeader{ background: url(/images/bar_ltColumn.png) bottom left no-repeat; width: 572px; display: block; padding-bottom: 15px; margin-bottom: 20px; }
div.mainTaskHeader h2{ width: 420px; line-height: 32px; margin-top: -5px; float: left;}
body.home div.mainTaskHeader{ background: url(/images/bar_ltColumn_home.png) bottom left no-repeat; width: 492px;}
div#rtColumn{ float: left; background: url(/images/rtBorder.jpg) 3px top repeat-y; margin-left: 43px;}
div#rtContent{ width: 215px; padding: 10px 30px 30px 30px;}
body.home div#rtContent{ width: 306px; }
div#rtBorder{ background: url(/images/rtBorder_top.jpg) left top no-repeat; }
body.home div#rtColumn{ margin-left: 0;}
h3{ color: #4f4e4d; font-size: 140%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; margin-bottom: 5px;}
div#rtColumn h3{ background: url(/images/bar_rtColumn.png) bottom left no-repeat; margin-bottom: 20px; font-size: 160%; line-height: 21px; padding-bottom: 5px;}
div#rtColumn h4 { font-size: 130%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; float: left; height: auto !important; min-height: 27px; width: auto !important; max-width: 140px;}
body.home div#rtColumn h4{ width: auto !important; max-width: 180px;}
body.home div.taskTop{ padding: 20px 20px 0;}
div.taskTop{ padding: 15px 15px 0; }
div#rtColumn div.taskTop img { max-width: 180px; }
div#ltColumn img { max-width: 540px; }
p img { display: block; margin-top: 10px; margin-bottom: 10px;}
div#rtContent ul li{ background: #f9f9f9; border: 1px solid #e6e7e7; -moz-border-radius: 3px; -webkit-border-radius: 3px;}
div.taskMetadata span.taskValue, body.home div#rtColumn div.taskMetadata span.taskValue{ background: url(/images/task_pointCircle.png) top left no-repeat; color: #fff; width: 27px; height: 27px; text-align: center; padding-top: 3px; margin-right: 5px; margin-top: -4px;}
div#rtColumn div.taskMetadata span.taskValue{ margin-right: 0;}
div#ltColumn div.taskMetadata span.taskValue{ background: url(/images/mainTask_pointCircle.jpg) top left no-repeat; width: 30px; height: 30px; float: right; padding-top: 5px; margin-right: 5px}
div.taskMetadata span {float: right;}
div#ltColumn div.taskMetadata span{ margin-right: 55px;}
div.taskMetadata { font-style: oblique;}
div#ltColumn div.taskMetadata { font-style: oblique; font-size: 110%;}
div.taskHeader{ margin-bottom: 10px;}
p {margin-bottom: 20px;}
div#rtColumn ul li { margin-bottom: 20px;}
div.taskDetail{ background: #ececed; -moz-border-radius-bottomright: 3px; -webkit-border-radius-bottomleft: 3px; padding: 5px 15px;}
body.home div.taskDetail{ padding: 5px 20px;}
div#ltColumn div.taskDetail, form#contactForm, div#signup_options, form.edit_user, div#signin_options{ background: #f9f9f9; -moz-border-radius: 3px; -webkit-border-radius: 3px; border: solid 1px #ececed; padding: 15px 20px; margin-bottom: 15px;}
div#signup_options, div#signin_options{ margin-top: -2px;}
p.join {font-weight: bold; font-size: 1.2em;}
div#signup_options, form#contactForm, div.signin_option ul, form.edit_user{ padding-top: 25px; padding-bottom: 40px;}
span.tagValue{
background: url(/images/highlightBar2.jpg) left top repeat-x;
position: absolute;
top: 0;
left: 0;
text-indent: -9999em;
float: left;
overflow: hidden;
}
div#rtContent span.tagValue{ background: url(/images/highlightBar.jpg) left top repeat-x;}
div.taskBar{ background-color: #fff; width: 403px; border: 1px solid #bfbfbe; position: relative; line-height: 1.3em; height: 10px; float: left; margin: 6px 13px 0 0;}
div#rtContent div.taskBar{ width: 180px; height: 5px;}
body.home div#rtContent div.taskBar{ width: 185px;}
ul#taskList div.taskBar{ height: 5px;}
div#ltColumn ul#taskList div.taskMetadata span{ margin-right: 10px;}
div#ltColumn ul#taskList div.taskTop{ padding: 15px 0 0 0 ;}
ul#taskList li { border-bottom: solid 1px #ececed; padding-bottom: 15px; margin-bottom: 15px;}
ul#taskList h3 { font-size: 150%; float: left;}
div#ltColumn ul#taskList div.taskDetail { padding: 8px 20px;}
div#ltColumn ul#taskList span.tagNumber{ font-size: 90%;}
div#ltColumn ul#taskList span.tagValue { background: url(/images/highlightBar.jpg) repeat-x left top;}
span.startBtn{ width: 98px; height: 36px; border: none 0; background: none; margin-bottom: 15px; cursor: pointer;}
span.startBtn a{ width: 98px; height: 36px; text-indent: -9999em; background: url(/images/btn_start.png) top left no-repeat; display: block; border: none;}
span.tagNumber { font-weight: bold; font-size: 90%; color: #da7c02;}
div#ltColumn span.tagNumber { font-size: 110%; padding-top: 5px; }
div#taskScoreboard{ float: right; background: url(/images/scoreboardBg.jpg) top right no-repeat; width: 312px; height: 158px; }
div#taskScoreboard dt, div#taskScoreboard dd{ color: #fff; font-size: 150%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; line-height: 28px;}
div#taskScoreboard dl { padding: 50px 0 0 60px;}
div#taskScoreboard dt{ float: left; font-weight: bold; margin-right: 5px;}
form#contactForm label, form#new_user label, form#new_user_session label, form.edit_user label{ font-weight: bold; width: 100px; display: block; float: left; padding-top:5px;}
form#new_user label, form.edit_user label{ width: 160px;}
form#contactForm input, form#contactForm textarea, form#new_user input, form#new_user textarea, form#new_user_session input, form#new_user_session textarea, form.edit_user input, input#openid_username{ border: dotted 1px #d8d8d8; -moz-border-radius: 3px; -webkit-border-radius: 3px; width: 300px; padding: 5px;}
form#contactForm input, form#new_user input, form#new_user_session input, form.edit_user input{ height: 15px;}
form li{ margin-bottom: 10px;}
form.edit_user input#user_avatar{ height: 25px;}
input#openid_username{ margin-bottom: 15px;}
button.submitBtn span{ background: url(/images/btn_submit.png) top left no-repeat; display: block; width: 136px; height: 43px; text-indent: -9999em; }
button.submitBtn{ border: 0; background: none; margin-left: 100px; margin-top: 20px;}
div#footer{ width: 960; margin: 0 auto; font-size: 90%; padding: 0 20px;}
div#footerBrand{ float: left; border-right: 1px solid #6c6b6b; margin-right: 15px; padding-right: 15px;}
div#footerBrand a{ background: url(/images/foundationLogo.png) top left no-repeat; display: block; text-indent: -9999em; width: 132px; height: 61px;}
/* Styling for popup task page - needs attention */
body.task div.header {height: 50px; padding: 10px; margin-bottom: 10px;}
body.task div.campaign {float: left; width: 78%;}
body.task div.nav {float: right; width: 18%;}
body.task div.header span.title {
font-size: 200%; font-family: Baskerville, Georgia, Times New Roman, Times, serif; color: #231f20; margin-bottom: 10px; padding-top: 5px;
}
body.task div.header span.instructions {
font-family: Helvetica Neue, Helvetica, Arial, sans-serif; margin-bottom: 15px;
}
body.task div.header span.instructions p {padding: 0; margin: 5px;}
body.task div.header div.nav a.back {}
input#anotherTask {
background: url(/images/btn_anotherTask.png) top left no-repeat; width: 148px; height: 37px; display: block; text-indent: -9999em; border: none;
}
iframe#task_frame {width: 100%; height: 800px; margin: 0; padding: 0; clear: both; margin-top: 10px;}
form#new_user input#user_submit, form#new_user_session input#user_session_submit, form.edit_user input#update_button, button.openidBtn { border: none; display: block; width: 137px; height: 44px; text-indent: -9999em; margin-top: 20px;}
div#signin_options button.openidBtn{ margin-left: 0px;}
button.openidBtn{ margin-left: 160px;}
input#update_button{ background: url(/images/btn_update.png) top left no-repeat; margin-left: 160px;}
form#new_user input#user_submit{ background: url(/images/btn_register.png) top left no-repeat; margin-left: 160px;}
form#new_user_session input#user_session_submit { background: url(/images/btn_login.png) top left no-repeat; margin-left: 100px;}
div#signup_nav li, div#signin_nav li{ float: left; padding: 5px 5px 8px; margin-top: 10px; margin-right: 5px;}
li#nav_aol a{ width: 75px; height: 20px; background: url(/images/logo_aol.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_aol { width: 75px; height: 20px;}
li#nav_yahoo a{ width: 75px; height: 20px; background: url(/images/logo_yahoo.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_yahoo { width: 75px; height: 20px;}
li#nav_google a{ width: 75px; height: 20px; background: url(/images/logo_google.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_google { width: 75px; height: 20px;}
li#nav_facebook a{ width: 75px; height: 20px; background: url(/images/logo_facebook.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_facebook { width: 75px; height: 20px;}
li#nav_openid a{ width: 75px; height: 20px; background: url(/images/logo_openid.png) top center no-repeat; text-indent: -9999em; display: block;}
li#nav_openid { width: 75px; height: 20px;}
li.active{ background-color: #F9F9F9; border-top: 1px solid #ECECED; border-left: 1px solid #ECECED; border-right: 1px solid #ECECED; -moz-border-radius-topright: 4px; -webkit-border-radius-topleft: 4px;}
li#nav_standard a{ color: #d65203; font-weight: bold; text-decoration: none;}
div#signup_options button, div#signin_options button{ border: none; text-indent: -9999em; display: block; height: 42px; }
button.aolBtn{ background: url(/images/btn_aol.png) top left no-repeat; width: 176px; }
button.yahooBtn{ background: url(/images/btn_yahoo.png) top left no-repeat; width: 196px; }
button.googleBtn{ background: url(/images/btn_google.png) top left no-repeat; width: 196px; }
button.facebookBtn{ background: url(/images/btn_facebook.png) top left no-repeat; width: 209px; }
button.openidBtn{ background: url(/images/btn_openid.png) top left no-repeat; width: 209px; }
div#signin_options button.aolBtn{ background: url(/images/btn_aol2.png) top left no-repeat; width: 176px; }
div#signin_options button.yahooBtn{ background: url(/images/btn_yahoo2.png) top left no-repeat; width: 196px; }
div#signin_options button.googleBtn{ background: url(/images/btn_google2.png) top left no-repeat; width: 196px; }
div#signin_options button.facebookBtn{ background: url(/images/btn_facebook2.png) top left no-repeat; width: 209px; }
div#signin_options button.openidBtn{ background: url(/images/btn_openid2.png) top left no-repeat; width: 209px; }
p.tip{ font-style: oblique; font-size: 90%; line-height: 15px; color: #909192;}
input#startTask { background: url(/images/btn_startthis.png) top left no-repeat; width: 124px; height: 36px; display: block; text-indent: -9999em; border: none;}
body.leaders div#ltColumn{ width: 860px;}
div.rank { margin-bottom: 30px;}
div.rank p{ text-align: center; font-style: oblique;}
ol.leaders{ margin-left: 50px;}
ol.leaders li{ margin-left: 10px; margin-right: 10px;float: left; width: 170px; }
ol.leaders li img{ float: left; margin: 0 10px 20px 0;}
div.rankHeader{ background: url(/images/fullBar.png) bottom left no-repeat; width: ; padding-bottom: 30px; margin-bottom: 20px;}
body.leaders dl{ font-family: Baskerville, Georgia, Times New Roman, Times, serif; padding-top: 40px; padding-left: 60px;}
body.leaders dt{ float: left;}
span.leaderName{ display: block; line-height: 18px; padding-top: 15px;}
dt.rankTitle, dt.pointTitle {display: none; }
dd.rankTitle{ font-size: 280%; color: #231f20; margin-bottom: 10px; font-weight: bold;}
div.rankHeader dl dt { margin-right: 3px;}
.level{ font-size: 140%; margin-bottom: 8px; color: #797474; }
dd.pointTitle, span.leaderPoints {font-family: Helvetica Neue, Helvetica, Arial, sans-serif; color: #a8a8a8; font-style: oblique;}
div.rankHeader img { float: left; margin: 0 10px 10px 40px;}
div.contact_form_validation, div.error { margin-bottom: 15px; font-size: 120%; font-weight: bold; color: #b52802;}
div.error{ margin-bottom: 0px;}
div.errors{ margin-bottom: 15px;}
div.flash {
width: 520px; background: #f7f2cc; -moz-border-radius: 3px; -webkit-border-radius: 3px;
padding: 10px; margin-left: 30px;
}
div.flash.failure {
border: 1px solid #fae19c; color: #da7c02;
}
div.flash.success {
border: 1px solid #fae19c; color: #da7c02;
}
body.home div.flash {
width: 472px;
}
div#rtColumn ul#newMembers li { background: none; border: none; height: 64px; margin-bottom: 15px;}
-div#rtColumn ul#newMembers img { float: left; height: 64px; margin: 0 15px 15px 0;}
\ No newline at end of file
+div#rtColumn ul#newMembers img { float: left; height: 64px; margin: 0 15px 15px 0;}
+
+li.checkboxIndent { margin-left: 160px; font-style: oblique; font-size: 95%; margin-bottom: 5px;}
+li.checkboxIndent input { display: block; float: left; margin-right: 10px; margin-top: 2px;}
\ No newline at end of file
|
sunlightlabs/tcorps | 2671d791228b98998d9cbb19623cb95e95d68f51 | Added a checkbox for subscribing to Sunlight services | diff --git a/app/models/user.rb b/app/models/user.rb
index 17a11dc..4beedb3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,49 +1,49 @@
class User < ActiveRecord::Base
- attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns
+ attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns, :subscribe_all
has_many :tasks
has_many :campaigns, :foreign_key => :creator_id
has_attached_file :avatar,
:styles => {:normal => '64x64#', :tiny => '24x24#'},
:default_url => "/images/avatar_:gender_:style.jpg"
named_scope :by_points, :select => 'users.*, (select sum(tasks.points) as sum_points from tasks where completed_at is not null and tasks.user_id = users.id) as sum_points', :order => 'sum_points desc'
named_scope :leaders, lambda {
{:conditions => ['sum_points >= ?', LEVELS.keys.sort.first]}
}
named_scope :participants, :select => 'users.*, (select count(*) from tasks where completed_at is not null and tasks.user_id = users.id) as num_tasks', :conditions => 'num_tasks > 0'
named_scope :campaign_subscribers, :conditions => ['subscribe_campaigns = ?', true]
acts_as_authentic
def total_points
tasks.sum :points, :conditions => 'completed_at is not null'
end
def campaign_points(campaign)
tasks.sum :points, :conditions => ['completed_at is not null and campaign_id = ?', campaign.id]
end
def manager?
!organization_name.blank?
end
def level
points = respond_to?(:sum_points) ? sum_points.to_i : total_points
levels = LEVELS.keys.sort
level = 0
levels.each_with_index do |minimum, i|
level = i + 1 if points >= minimum
end
level
end
Paperclip.interpolates :gender do |attachment, style|
[:female, :male][rand 2]
end
end
\ No newline at end of file
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 468dfc9..e6d243b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,42 +1,47 @@
<div class="mainTaskHeader">
<h2>Edit Profile</h2>
<div class="clear"></div>
</div>
<% form_for @user, :html => {:multipart => true} do |f| %>
<%= errors @user %>
<ul>
<li>
<label for='username'>Username</label>
<%= f.text_field :login, :id => 'username', :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email, :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password, :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, :class => 'text', :size => '32' %>
</li>
<li>
<label for='avatar'>Current Avatar</label>
<%= image_tag @user.avatar.url(:normal) %>
</li>
<li>
<label for='user_avatar'>Upload a new avatar</label>
<%= f.file_field :avatar %>
</li>
<li>
<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
<%= f.check_box :subscribe_campaigns %>
</li>
+ <li>
+ <label for='user_subscribe_all'>Email me about other Sunlight services:</label>
+ <%= f.check_box :subscribe_all %>
+ </li>
+
<input type="submit" value="Update" name="commit" id="update_button" />
</ul>
<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 8edd7a0..9c32cd3 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,122 +1,130 @@
<% content_for :class, :signup %>
<div class="mainTaskHeader">
<h2>Join Us</h2>
<div class="clear"></div>
</div>
<p class="join">Already have an account? <%= link_to 'Sign in!', login_path %></p>
<p>Join the cause, by signing up for Transparency Corps with one of the options below.</p>
<div id="signup_nav" class="nav">
<ul>
<li id="nav_standard" class="active"><a href="#">Standard Sign Up</a></li>
<!--
<li id="nav_aol"><a href="#">AOL</a></li>
<li id="nav_yahoo"><a href="#">Yahoo</a></li>
<li id="nav_google"><a href="#">Google</a></li>
<li id="nav_facebook"><a href="#">Facebook</a></li>
-->
<li id="nav_openid"><a href="#">OpenID</a></li>
</ul>
<div class="clear"></div>
</div>
<div id="signup_options">
<%= errors @user %>
<div id="signup_standard" class="signup_option">
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation %>
</li>
<li>
<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
<%= f.check_box :subscribe_campaigns %>
</li>
+ <li>
+ <label for='user_subscribe_all'>Email me about other Sunlight services:</label>
+ <%= f.check_box :subscribe_all %>
+ </li>
</ul>
<%= f.submit 'Register' %>
<% end %>
</div>
<div id="signup_aol" class="signup_option" style="display: none">
<h3>Sign up using your AOL account.</h3>
<p class="tip">Clicking this button will take you to AOL to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="aolBtn" type="submit">
<span>Sign Up Using AOL</span>
</button>
</div>
<div id="signup_yahoo" class="signup_option" style="display: none">
<h3>Sign up using your Yahoo account.</h3>
<p class="tip">Clicking this button will take you to Yahoo to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="yahooBtn" type="submit">
<span>Sign Up Using Yahoo</span>
</button>
</div>
<div id="signup_google" class="signup_option" style="display: none">
<h3>Sign up using your Google account.</h3>
<p class="tip">Clicking this button will take you to Google to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="googleBtn" type="submit">
<span>Sign Up Using Google</span>
</button>
</div>
<div id="signup_facebook" class="signup_option" style="display: none">
<h3>Sign up using your Facebook account.</h3>
<p class="tip">Clicking this button will take you to Facebook to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="facebookBtn" type="submit">
<span>Sign Up Using Facebook</span>
</button>
</div>
<div id="signup_openid" class="signup_option" style="display: none">
<h3>Sign up using your OpenID account.</h3>
<p class="tip">Clicking this button will take you to OpenID to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<label for="user_openid_identifier">OpenID</label>
<%= f.text_field :openid_identifier, :value => @user.openid_identifier.blank? ? 'http://' : @user.openid_identifier %>
</li>
<li>
<label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
<%= f.check_box :subscribe_campaigns %>
</li>
+ <li>
+ <label for='user_subscribe_all'>Email me about other Sunlight services:</label>
+ <%= f.check_box :subscribe_all %>
+ </li>
</ul>
<button class="openidBtn" type="submit">
<span>Sign Up Using OpenID</span>
</button>
<% end %>
</div>
</div>
<% if open_id_return? %>
<% javascript_tag do %>
switch_nav('openid', 'signup');
<% end %>
<% end %>
\ No newline at end of file
diff --git a/db/migrate/013_add_checkbox_for_universal_subscription.rb b/db/migrate/013_add_checkbox_for_universal_subscription.rb
new file mode 100644
index 0000000..f2a47c0
--- /dev/null
+++ b/db/migrate/013_add_checkbox_for_universal_subscription.rb
@@ -0,0 +1,11 @@
+class AddCheckboxForUniversalSubscription < ActiveRecord::Migration
+ def self.up
+ add_column :users, :subscribe_all, :boolean, :default => 0
+ add_index :users, :subscribe_all
+ end
+
+ def self.down
+ remove_index :users, :subscribe_all
+ remove_column :users, :subscribe_all
+ end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 5a05591..45b4bb6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,87 +1,89 @@
# This file is auto-generated from the current state of the database. Instead of editing this file,
# please use the migrations feature of Active Record to incrementally modify your database, and
# then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your database schema. If you need
# to create the application database on another system, you should be using db:schema:load, not running
# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 12) do
+ActiveRecord::Schema.define(:version => 13) do
create_table "campaigns", :force => true do |t|
t.string "name"
t.string "keyword"
t.string "url"
t.text "instructions"
t.text "description"
t.text "private_description"
t.text "template"
t.integer "points"
t.integer "runs", :default => 0
t.datetime "created_at"
t.datetime "updated_at"
t.integer "user_runs"
t.integer "creator_id"
t.datetime "start_at"
end
add_index "campaigns", ["creator_id"], :name => "index_campaigns_on_creator_id"
add_index "campaigns", ["keyword"], :name => "index_campaigns_on_keyword"
create_table "open_id_authentication_associations", :force => true do |t|
t.integer "issued"
t.integer "lifetime"
t.string "handle"
t.string "assoc_type"
t.binary "server_url"
t.binary "secret"
end
create_table "open_id_authentication_nonces", :force => true do |t|
t.integer "timestamp", :null => false
t.string "server_url"
t.string "salt", :null => false
end
create_table "tasks", :force => true do |t|
t.integer "user_id"
t.integer "campaign_id"
t.integer "points"
t.datetime "completed_at"
t.string "key"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "elapsed_seconds"
end
add_index "tasks", ["campaign_id"], :name => "index_tasks_on_campaign_id"
add_index "tasks", ["key"], :name => "index_tasks_on_key"
add_index "tasks", ["user_id", "campaign_id"], :name => "index_tasks_on_user_id_and_campaign_id"
create_table "users", :force => true do |t|
t.boolean "admin", :default => false
t.string "email"
t.datetime "created_at"
t.datetime "updated_at"
t.string "login", :null => false
t.string "crypted_password"
t.string "password_salt"
t.string "persistence_token", :null => false
t.string "openid_identifier"
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
t.datetime "avatar_updated_at"
t.string "organization_name"
t.boolean "subscribe_campaigns", :default => false
+ t.boolean "subscribe_all", :default => false
end
add_index "users", ["login"], :name => "index_users_on_login"
add_index "users", ["openid_identifier"], :name => "index_users_on_openid_identifier"
add_index "users", ["persistence_token"], :name => "index_users_on_persistence_token"
+ add_index "users", ["subscribe_all"], :name => "index_users_on_subscribe_all"
add_index "users", ["subscribe_campaigns"], :name => "index_users_on_subscribe_campaigns"
end
|
sunlightlabs/tcorps | 5d06867d1c7b9e3a11126be5d30953b9d6688753 | After much wrangling, simply hid the links to explain, profile, and select when running under sqlite3 | diff --git a/config/environments/development.rb b/config/environments/development.rb
index e9df74f..1316dc0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,23 +1,26 @@
# Settings specified here will take precedence over those in config/environment.rb
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
# since you don't have to restart the webserver when you make code changes.
config.cache_classes = false
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
# config.action_mailer.raise_delivery_errors = false
CLICKPASS_SITE_KEY = 'uvdTy5rmBP'
SITE_HOST = 'localhost:3000'
-config.middleware.use "Rack::Bug"
\ No newline at end of file
+require 'rack/bug'
+ActionController::Dispatcher.middleware.use ::Rack::Bug,
+ :ip_masks => [IPAddr.new("127.0.0.1")],
+ :secret_key => "secretkeeeeeeeeeyyyyyyyyyyyyyy"
diff --git a/vendor/plugins/rack-bug/.gitignore b/vendor/plugins/rack-bug/.gitignore
new file mode 100644
index 0000000..de8e10e
--- /dev/null
+++ b/vendor/plugins/rack-bug/.gitignore
@@ -0,0 +1,3 @@
+coverage
+pkg
+TODO
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/History.txt b/vendor/plugins/rack-bug/History.txt
new file mode 100644
index 0000000..e69de29
diff --git a/vendor/plugins/rack-bug/MIT-LICENSE.txt b/vendor/plugins/rack-bug/MIT-LICENSE.txt
new file mode 100644
index 0000000..e2463e6
--- /dev/null
+++ b/vendor/plugins/rack-bug/MIT-LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2009 Bryan Helmkamp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/plugins/rack-bug/README.rdoc b/vendor/plugins/rack-bug/README.rdoc
new file mode 100644
index 0000000..516c1f7
--- /dev/null
+++ b/vendor/plugins/rack-bug/README.rdoc
@@ -0,0 +1,19 @@
+Usage:
+
+ script/plugin install git://github.com/brynary/rack-bug.git
+
+ # config/environments/development.rb
+ config.middleware.use "Rack::Bug"
+
+ # add bookmarklet to browser
+ open http://RAILS_APP/__rack_bug__/bookmarklet.html
+
+Thanks to:
+
+ Django debug toolbar
+ Rails footnotes
+ Rack's ShowException middleware
+ Oink
+ Rack::Cache
+
+
diff --git a/vendor/plugins/rack-bug/Rakefile b/vendor/plugins/rack-bug/Rakefile
new file mode 100644
index 0000000..6859c49
--- /dev/null
+++ b/vendor/plugins/rack-bug/Rakefile
@@ -0,0 +1,49 @@
+require "rubygems"
+require "rake/gempackagetask"
+require "rake/clean"
+require "spec/rake/spectask"
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
+
+require "rack/bug"
+
+Spec::Rake::SpecTask.new do |t|
+ t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+end
+
+desc "Run the specs"
+task :default => :spec
+
+desc "Run all specs in spec directory with RCov"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+ t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+ t.rcov = true
+ t.rcov_opts = lambda do
+ IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+ end
+end
+
+spec = Gem::Specification.new do |s|
+ s.name = "rack-bug"
+ s.version = Rack::Bug::VERSION
+ s.author = "Bryan Helmkamp"
+ s.email = "bryan" + "@" + "brynary.com"
+ s.homepage = "http://github.com/brynary/rack-bug"
+ s.summary = "Debugging toolbar for Rack applications implemented as middleware"
+ s.description = s.summary
+ s.files = %w[History.txt Rakefile README.rdoc] + Dir["lib/**/*"]
+
+ # rdoc
+ s.has_rdoc = true
+ s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
+end
+
+Rake::GemPackageTask.new(spec) do |package|
+ package.gem_spec = spec
+end
+
+desc 'Install the package as a gem.'
+task :install => [:clean, :package] do
+ gem = Dir['pkg/*.gem'].first
+ sh "sudo gem install --no-rdoc --no-ri --local #{gem}"
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug.rb b/vendor/plugins/rack-bug/lib/rack/bug.rb
new file mode 100644
index 0000000..ea36ebe
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug.rb
@@ -0,0 +1,26 @@
+require "rack"
+
+module Rack::Bug
+ require "rack/bug/toolbar"
+
+ VERSION = "0.1.0"
+
+ class SecurityError < StandardError
+ end
+
+ def self.enable
+ Thread.current["rack-bug.enabled"] = true
+ end
+
+ def self.disable
+ Thread.current["rack-bug.enabled"] = false
+ end
+
+ def self.enabled?
+ Thread.current["rack-bug.enabled"] == true
+ end
+
+ def self.new(*args, &block)
+ Toolbar.new(*args, &block)
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/options.rb b/vendor/plugins/rack-bug/lib/rack/bug/options.rb
new file mode 100644
index 0000000..8c12f40
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/options.rb
@@ -0,0 +1,90 @@
+module Rack::Bug
+
+ module Options
+ class << self
+ private
+ def option_accessor(key)
+ define_method(key) { || read_option(key) }
+ define_method("#{key}=") { |value| write_option(key, value) }
+ define_method("#{key}?") { || !! read_option(key) }
+ end
+ end
+
+ option_accessor :secret_key
+ option_accessor :ip_masks
+ option_accessor :password
+ option_accessor :panel_classes
+ option_accessor :intercept_redirects
+
+ # The underlying options Hash. During initialization (or outside of a
+ # request), this is a default values Hash. During a request, this is the
+ # Rack environment Hash. The default values Hash is merged in underneath
+ # the Rack environment before each request is processed.
+ def options
+ @env || @default_options
+ end
+
+ # Set multiple options.
+ def options=(hash={})
+ hash.each { |key,value| write_option(key, value) }
+ end
+
+ # Set an option. When +option+ is a Symbol, it is set in the Rack
+ # Environment as "rack-cache.option". When +option+ is a String, it
+ # exactly as specified. The +option+ argument may also be a Hash in
+ # which case each key/value pair is merged into the environment as if
+ # the #set method were called on each.
+ def set(option, value=self, &block)
+ if block_given?
+ write_option option, block
+ elsif value == self
+ self.options = option.to_hash
+ else
+ write_option option, value
+ end
+ end
+
+ private
+
+ def read_option(key)
+ options[option_name(key)]
+ end
+
+ def write_option(key, value)
+ options[option_name(key)] = value
+ end
+
+ def option_name(key)
+ case key
+ when Symbol ; "rack-bug.#{key}"
+ when String ; key
+ else raise ArgumentError
+ end
+ end
+
+ def initialize_options(options={})
+ @default_options = {
+ 'rack-bug.ip_masks' => [IPAddr.new("127.0.0.1")],
+ 'rack-bug.password' => nil,
+ 'rack-bug.verbose' => nil,
+ 'rack-bug.secret_key' => nil,
+ 'rack-bug.intercept_redirects' => false,
+ 'rack-bug.panels' => [],
+ 'rack-bug.panel_classes' => [
+ RailsInfoPanel,
+ TimerPanel,
+ RequestVariablesPanel,
+ EnvPanel,
+ SQLPanel,
+ ActiveRecordPanel,
+ CachePanel,
+ TemplatesPanel,
+ LogPanel,
+ MemoryPanel
+ ]
+ }
+ self.options = options
+ end
+
+ end
+end
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panel.rb
new file mode 100644
index 0000000..c895b1b
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panel.rb
@@ -0,0 +1,50 @@
+require "erb"
+
+module Rack
+ module Bug
+
+ # Panels are also Rack middleware
+ class Panel
+ include Render
+ include ERB::Util
+
+ attr_reader :request
+
+ def initialize(app)
+ if panel_app
+ @app = Rack::Cascade.new([panel_app, app])
+ else
+ @app = app
+ end
+ end
+
+ def call(env)
+ before(env)
+ status, headers, body = @app.call(env)
+ @request = Request.new(env)
+ after(env, status, headers, body)
+ env["rack-bug.panels"] << self
+ return [status, headers, body]
+ end
+
+ def panel_app
+ nil
+ end
+
+ def has_content?
+ true
+ end
+
+ def before(env)
+ end
+
+ def after(env, status, headers, body)
+ end
+
+ def render(template)
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panel_app.rb b/vendor/plugins/rack-bug/lib/rack/bug/panel_app.rb
new file mode 100644
index 0000000..18d731f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panel_app.rb
@@ -0,0 +1,35 @@
+require "rack/bug/params_signature"
+
+module Rack
+ module Bug
+
+ class PanelApp
+ include Rack::Bug::Render
+
+ attr_reader :request
+
+ def call(env)
+ @request = Rack::Request.new(env)
+ dispatch
+ end
+
+ def render_template(*args)
+ Rack::Response.new([super]).to_a
+ end
+
+ def params
+ @request.GET
+ end
+
+ def not_found
+ [404, {}, []]
+ end
+
+ def validate_params
+ ParamsSignature.new(request).validate!
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel.rb
new file mode 100644
index 0000000..425c3a4
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel.rb
@@ -0,0 +1,46 @@
+require "rack/bug/panel"
+require "rack/bug/panels/active_record_panel/activerecord_extensions"
+
+module Rack
+ module Bug
+
+ class ActiveRecordPanel < Panel
+
+ def self.record(class_name)
+ return unless Rack::Bug.enabled?
+ records[class_name] += 1
+ end
+
+ def self.reset
+ Thread.current["rack.bug.active_records"] = Hash.new { 0 }
+ end
+
+ def self.records
+ Thread.current["rack.bug.active_records"] ||= Hash.new { 0 }
+ end
+
+ def self.total
+ records.inject(0) do |memo, (key, value)|
+ memo + value
+ end
+ end
+
+ def name
+ "active_record"
+ end
+
+ def heading
+ "#{self.class.total} AR Objects"
+ end
+
+ def content
+ records = self.class.records.to_a.sort_by { |key, value| value }.reverse
+ result = render_template "panels/active_record", :records => records
+ self.class.reset
+ result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb
new file mode 100644
index 0000000..6256a1c
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb
@@ -0,0 +1,18 @@
+if defined?(ActiveRecord)
+ ActiveRecord::Base.class_eval do
+
+ if instance_methods.include?("after_initialize")
+ def after_initialize_with_rack_bug
+ Rack::Bug::ActiveRecordPanel.record(self.class.base_class.name)
+ after_initialize_without_rack_bug
+ end
+
+ alias_method_chain :after_initialize, :rack_bug
+ else
+ def after_initialize
+ Rack::Bug::ActiveRecordPanel.record(self.class.base_class.name)
+ end
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel.rb
new file mode 100644
index 0000000..fc96457
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel.rb
@@ -0,0 +1,51 @@
+require "rack/bug/panels/cache_panel/memcache_extension"
+
+module Rack
+ module Bug
+
+ class CachePanel < Panel
+
+ require "rack/bug/panels/cache_panel/stats"
+ require "rack/bug/panels/cache_panel/panel_app"
+
+ def self.record(method, *keys, &block)
+ return block.call unless Rack::Bug.enabled?
+
+ start_time = Time.now
+ result = block.call
+ total_time = Time.now - start_time
+ hit = result.nil? ? false : true
+ stats.record_call(method, total_time * 1_000, hit, *keys)
+ return result
+ end
+
+ def self.reset
+ Thread.current["rack.bug.cache"] = Stats.new
+ end
+
+ def self.stats
+ Thread.current["rack.bug.cache"] ||= Stats.new
+ end
+
+ def panel_app
+ PanelApp.new
+ end
+
+ def name
+ "cache"
+ end
+
+ def heading
+ "Cache: %.2fms (#{self.class.stats.queries.size} calls)" % self.class.stats.time
+ end
+
+ def content
+ result = render_template "panels/cache", :stats => self.class.stats
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/memcache_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/memcache_extension.rb
new file mode 100644
index 0000000..4a78377
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/memcache_extension.rb
@@ -0,0 +1,129 @@
+if defined?(Memcached)
+ Memcached.class_eval do
+
+ def set_with_rack_bug(key, value, timeout=0, marshal=true)
+ Rack::Bug::CachePanel.record(:set, key) do
+ set_without_rack_bug(key, value, timeout, marshal)
+ end
+ end
+
+ def add_with_rack_bug(key, value, timeout=0, marshal=true)
+ Rack::Bug::CachePanel.record(:add, key) do
+ add_without_rack_bug(key, value, timeout, marshal)
+ end
+ end
+
+ def increment_with_rack_bug(key, offset=1)
+ Rack::Bug::CachePanel.record(:incr, key) do
+ increment_without_rack_bug(key, offset)
+ end
+ end
+
+ def decrement_with_rack_bug(key, offset=1)
+ Rack::Bug::CachePanel.record(:decr, key) do
+ decrement_without_rack_bug(key, offset)
+ end
+ end
+
+ def replace_with_rack_bug(key, value, timeout=0, marshal=true)
+ Rack::Bug::CachePanel.record(:replace, key) do
+ replace_without_rack_bug(key, value, timeout, marshal)
+ end
+ end
+
+ def append_with_rack_bug(key, value)
+ Rack::Bug::CachePanel.record(:append, key) do
+ append_without_rack_bug(key, value)
+ end
+ end
+
+ def prepend_with_rack_bug(key, value)
+ Rack::Bug::CachePanel.record(:prepend, key) do
+ prepend_without_rack_bug(key, value)
+ end
+ end
+
+ def delete_with_rack_bug(key)
+ Rack::Bug::CachePanel.record(:delete, key) do
+ delete_without_rack_bug(key)
+ end
+ end
+
+ def get_with_rack_bug(keys, marshal=true)
+ if keys.is_a? Array
+ Rack::Bug::CachePanel.record(:get_multi, *keys) do
+ get_without_rack_bug(keys, marshal)
+ end
+ else
+ Rack::Bug::CachePanel.record(:get, keys) do
+ get_without_rack_bug(keys, marshal)
+ end
+ end
+ end
+
+ alias_method_chain :decrement, :rack_bug
+ alias_method_chain :get, :rack_bug
+ alias_method_chain :increment, :rack_bug
+ alias_method_chain :set, :rack_bug
+ alias_method_chain :add, :rack_bug
+ alias_method_chain :replace, :rack_bug
+ alias_method_chain :delete, :rack_bug
+ alias_method_chain :prepend, :rack_bug
+ alias_method_chain :append, :rack_bug
+ end
+end
+
+if defined?(MemCache)
+ MemCache.class_eval do
+
+ def decr_with_rack_bug(key, amount = 1)
+ Rack::Bug::CachePanel.record(:decr, key) do
+ decr_without_rack_bug(key, amount)
+ end
+ end
+
+ def get_with_rack_bug(key, raw = false)
+ Rack::Bug::CachePanel.record(:get, key) do
+ get_without_rack_bug(key, raw)
+ end
+ end
+
+ def get_multi_with_rack_bug(*keys)
+ Rack::Bug::CachePanel.record(:get_multi, *keys) do
+ get_multi_without_rack_bug(*keys)
+ end
+ end
+
+ def incr_with_rack_bug(key, amount = 1)
+ Rack::Bug::CachePanel.record(:incr, key) do
+ incr_without_rack_bug(key, amount)
+ end
+ end
+
+ def set_with_rack_bug(key, value, expiry = 0, raw = false)
+ Rack::Bug::CachePanel.record(:set, key) do
+ set_without_rack_bug(key, value, expiry, raw)
+ end
+ end
+
+ def add_with_rack_bug(key, value, expiry = 0, raw = false)
+ Rack::Bug::CachePanel.record(:add, key) do
+ add_without_rack_bug(key, value, expiry, raw)
+ end
+ end
+
+ def delete_with_rack_bug(key, expiry = 0)
+ Rack::Bug::CachePanel.record(:delete, key) do
+ delete_without_rack_bug(key, expiry)
+ end
+ end
+
+ alias_method_chain :decr, :rack_bug
+ alias_method_chain :get, :rack_bug
+ alias_method_chain :get_multi, :rack_bug
+ alias_method_chain :incr, :rack_bug
+ alias_method_chain :set, :rack_bug
+ alias_method_chain :add, :rack_bug
+ alias_method_chain :delete, :rack_bug
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/panel_app.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/panel_app.rb
new file mode 100644
index 0000000..1f767fd
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/panel_app.rb
@@ -0,0 +1,50 @@
+require "rack/bug/panel_app"
+
+module Rack
+ module Bug
+ class CachePanel
+
+ class PanelApp < ::Rack::Bug::PanelApp
+
+ def dispatch
+ case request.path_info
+ when "/__rack_bug__/view_cache" then view_cache
+ when "/__rack_bug__/delete_cache" then delete_cache
+ when "/__rack_bug__/delete_cache_list" then delete_cache_list
+ else not_found
+ end
+ end
+
+ def ok
+ Rack::Response.new(["OK"]).to_a
+ end
+
+ def view_cache
+ validate_params
+ render_template "panels/view_cache", :key => params["key"], :value => Rails.cache.read(params["key"])
+ end
+
+ def delete_cache
+ validate_params
+ raise "Rails not found... can't delete key" unless defined?(Rails)
+ Rails.cache.delete(params["key"])
+ ok
+ end
+
+ def delete_cache_list
+ validate_params
+ raise "Rails not found... can't delete key" unless defined?(Rails)
+
+ params.each do |key, value|
+ next unless key =~ /^keys_/
+ Rails.cache.delete(value)
+ end
+
+ ok
+ end
+
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/stats.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/stats.rb
new file mode 100644
index 0000000..769f7d5
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/stats.rb
@@ -0,0 +1,97 @@
+module Rack
+ module Bug
+ class CachePanel
+
+ class Stats
+ class Query
+ attr_reader :method, :time, :hit, :keys
+
+ def initialize(method, time, hit, keys)
+ @method = method
+ @time = time
+ @hit = hit
+ @keys = keys
+ end
+
+ def display_time
+ "%.2fms" % time
+ end
+
+ def display_keys
+ if keys.size == 1
+ keys.first
+ else
+ keys.join(", ")
+ end
+ end
+ end
+
+ attr_reader :calls
+ attr_reader :keys
+ attr_reader :queries
+
+ def initialize
+ @queries = []
+ @misses =
+ @calls = 0
+ @time = 0.0
+ @keys = []
+ end
+
+ def record_call(method, time, hit, *keys)
+ @queries << Query.new(method, time, hit, keys)
+ @calls += 1
+ @time += time
+ @keys += keys
+ end
+
+ def display_time
+ "%.2fms" % time
+ end
+
+ def time
+ @queries.inject(0) do |memo, query|
+ memo + query.time
+ end
+ end
+
+ def gets
+ count_queries(:get)
+ end
+
+ def sets
+ count_queries(:set)
+ end
+
+ def deletes
+ count_queries(:delete)
+ end
+
+ def get_multis
+ count_queries(:get_multi)
+ end
+
+ def hits
+ @queries.select { |q| [:get, :get_multi].include?(q.method) && q.hit }.size
+ end
+
+ def misses
+ @queries.select { |q| [:get, :get_multi].include?(q.method) && !q.hit }.size
+ end
+
+ def count_queries(method)
+ @queries.select { |q| q.method == method }.size
+ end
+
+ def queries_to_param
+ params = {}
+ @queries.each_with_index do |query, index|
+ params["keys_#{index}"] = query.keys.first
+ end
+ params
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/env_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/env_panel.rb
new file mode 100644
index 0000000..0945e44
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/env_panel.rb
@@ -0,0 +1,25 @@
+module Rack
+ module Bug
+
+ class EnvPanel < Panel
+
+ def name
+ "env"
+ end
+
+ def before(env)
+ @env = env
+ end
+
+ def heading
+ "Rack Env"
+ end
+
+ def content
+ render_template "panels/env", :env => @env
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel.rb
new file mode 100644
index 0000000..a143373
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel.rb
@@ -0,0 +1,39 @@
+require "rack/bug/panels/log_panel/rails_extension"
+
+module Rack
+ module Bug
+
+ class LogPanel < Panel
+
+ def self.record(message)
+ return unless Rack::Bug.enabled?
+ return unless message
+ logs << message.to_s
+ end
+
+ def self.reset
+ Thread.current["rack.bug.logs"] = []
+ end
+
+ def self.logs
+ Thread.current["rack.bug.logs"] ||= []
+ end
+
+ def name
+ "log"
+ end
+
+ def heading
+ "Log"
+ end
+
+ def content
+ result = render_template "panels/log", :logs => self.class.logs
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel/rails_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel/rails_extension.rb
new file mode 100644
index 0000000..1f7c5a6
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel/rails_extension.rb
@@ -0,0 +1,11 @@
+if defined?(Rails) && Rails.logger
+ module LoggingExtensions
+ def add(*args, &block)
+ logged_message = super
+ Rack::Bug::LogPanel.record(logged_message)
+ return logged_message
+ end
+ end
+
+ Rails.logger.extend LoggingExtensions
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/memory_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/memory_panel.rb
new file mode 100644
index 0000000..2fa70f4
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/memory_panel.rb
@@ -0,0 +1,27 @@
+#
+module Rack
+ module Bug
+
+ class MemoryPanel < Panel
+
+ def before(env)
+ @original_memory = `ps -o rss= -p #{$$}`.to_i
+ end
+
+ def after(env, status, headers, body)
+ @total_memory = `ps -o rss= -p #{$$}`.to_i
+ @memory_increase = @total_memory - @original_memory
+ end
+
+ def heading
+ "#{@memory_increase} KB Δ, #{@total_memory} KB total"
+ end
+
+ def has_content?
+ false
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/rails_info_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/rails_info_panel.rb
new file mode 100644
index 0000000..fb1eae7
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/rails_info_panel.rb
@@ -0,0 +1,23 @@
+module Rack
+ module Bug
+
+ class RailsInfoPanel < Panel
+
+ def name
+ "rails_info"
+ end
+
+ def heading
+ return unless defined?(Rails)
+ "Rails #{Rails.version}"
+ end
+
+ def content
+ return unless defined?(Rails)
+ render_template "panels/rails_info"
+ end
+
+ end
+
+ end
+end
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/request_variables_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/request_variables_panel.rb
new file mode 100644
index 0000000..df3338e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/request_variables_panel.rb
@@ -0,0 +1,25 @@
+module Rack
+ module Bug
+
+ class RequestVariablesPanel < Panel
+
+ def name
+ "request_variables"
+ end
+
+ def before(env)
+ @env = env
+ end
+
+ def heading
+ "Request Vars"
+ end
+
+ def content
+ render_template "panels/request_variables", :request => @request
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel.rb
new file mode 100644
index 0000000..114a747
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel.rb
@@ -0,0 +1,55 @@
+require "digest"
+
+module Rack
+ module Bug
+
+ class SQLPanel < Panel
+
+ require "rack/bug/panels/sql_panel/sql_extension"
+ require "rack/bug/panels/sql_panel/query"
+ require "rack/bug/panels/sql_panel/panel_app"
+
+ def panel_app
+ PanelApp.new
+ end
+
+ def self.record(sql, backtrace = [], &block)
+ return block.call unless Rack::Bug.enabled?
+
+ start_time = Time.now
+ result = block.call
+ queries << Query.new(sql, Time.now - start_time, backtrace)
+
+ return result
+ end
+
+ def self.reset
+ Thread.current["rack.test.queries"] = []
+ end
+
+ def self.queries
+ Thread.current["rack.test.queries"] ||= []
+ end
+
+ def self.total_time
+ (queries.inject(0) { |memo, query| memo + query.time}) * 1_000
+ end
+
+ def name
+ "sql"
+ end
+
+ def heading
+ "#{self.class.queries.size} Queries (%.2fms)" % self.class.total_time
+ end
+
+ def content
+ result = render_template "panels/sql", :queries => self.class.queries
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/panel_app.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/panel_app.rb
new file mode 100644
index 0000000..019206d
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/panel_app.rb
@@ -0,0 +1,39 @@
+require "rack/bug/panel_app"
+
+module Rack
+ module Bug
+ class SQLPanel
+
+ class PanelApp < ::Rack::Bug::PanelApp
+
+ def dispatch
+ case request.path_info
+ when "/__rack_bug__/explain_sql" then explain_sql
+ when "/__rack_bug__/profile_sql" then profile_sql
+ when "/__rack_bug__/execute_sql" then execute_sql
+ else not_found
+ end
+ end
+
+ def explain_sql
+ validate_params
+ query = Query.new(params["query"], params["time"].to_f)
+ render_template "panels/explain_sql", :result => query.explain, :query => query.sql, :time => query.time
+ end
+
+ def profile_sql
+ validate_params
+ query = Query.new(params["query"], params["time"].to_f)
+ render_template "panels/profile_sql", :result => query.profile, :query => query.sql, :time => query.time
+ end
+
+ def execute_sql
+ validate_params
+ query = Query.new(params["query"], params["time"].to_f)
+ render_template "panels/execute_sql", :result => query.execute, :query => query.sql, :time => query.time
+ end
+
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/query.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/query.rb
new file mode 100644
index 0000000..9648880
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/query.rb
@@ -0,0 +1,95 @@
+module Rack
+ module Bug
+ class SQLPanel
+
+ class Query
+ attr_reader :sql
+ attr_reader :time
+ attr_reader :backtrace
+
+ def initialize(sql, time, backtrace = [])
+ @sql = sql
+ @time = time
+ @backtrace = backtrace
+ end
+
+ def human_time
+ "%.2fms" % (@time * 1_000)
+ end
+
+ def inspectable?
+ sql.strip =~ /^SELECT /i
+ end
+
+ def with_profiling
+ self.class.execute("SET PROFILING=1")
+ result = yield
+ self.class.execute("SET PROFILING=0")
+ return result
+ end
+
+ def explain
+ self.class.execute "EXPLAIN #{@sql}"
+ end
+
+ def profile
+ with_profiling do
+ execute
+ self.class.execute <<-SQL
+ SELECT *
+ FROM information_schema.profiling
+ WHERE query_id = (SELECT query_id FROM information_schema.profiling ORDER BY query_id DESC LIMIT 1)
+ SQL
+ end
+ end
+
+ def execute
+ self.class.execute(@sql)
+ end
+
+ def valid_hash?(secret_key, possible_hash)
+ hash = Digest::SHA1.hexdigest [secret_key, @sql].join(":")
+ possible_hash == hash
+ end
+
+ def self.execute(sql)
+ ActiveRecord::Base.connection.execute(sql)
+ end
+
+ def self.adapter
+ klass = ActiveRecord::Base.connection.class.to_s
+ parts = klass.split '::'
+ if parts and parts.any?
+ adapter = parts.last.gsub('Adapter', '').downcase.to_sym
+ else
+ :unknown
+ end
+ end
+
+ def adapter
+ self.class.adapter
+ end
+
+ def self.mysql?
+ adapter == :mysql
+ end
+
+ def mysql?
+ self.class.mysql?
+ end
+
+ def has_backtrace?
+ filtered_backtrace.any?
+ end
+
+ def filtered_backtrace
+ @filtered_backtrace ||= @backtrace.map { |l| l.to_s.strip }.select do |line|
+ line.starts_with?(Rails.root) &&
+ !line.starts_with?(Rails.root.join("vendor"))
+ end
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/sql_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/sql_extension.rb
new file mode 100644
index 0000000..387d080
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/sql_extension.rb
@@ -0,0 +1,11 @@
+if defined?(ActiveRecord)
+ ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+ def log_with_rack_bug(sql, name, &block)
+ Rack::Bug::SQLPanel.record(sql, Kernel.caller) do
+ log_without_rack_bug(sql, name, &block)
+ end
+ end
+
+ alias_method_chain :log, :rack_bug
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel.rb
new file mode 100644
index 0000000..1bdd792
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel.rb
@@ -0,0 +1,44 @@
+module Rack
+ module Bug
+
+ class TemplatesPanel < Panel
+
+ require "rack/bug/panels/templates_panel/actionview_extension"
+ require "rack/bug/panels/templates_panel/trace"
+ require "rack/bug/panels/templates_panel/rendering"
+
+ def self.record(template, &block)
+ return block.call unless Rack::Bug.enabled?
+
+ template_trace.start(template)
+ result = block.call
+ template_trace.finished(template)
+ return result
+ end
+
+ def self.reset
+ Thread.current["rack.bug.template_trace"] = Trace.new
+ end
+
+ def self.template_trace
+ Thread.current["rack.bug.template_trace"] ||= Trace.new
+ end
+
+ def name
+ "templates"
+ end
+
+ def heading
+ "Templates: %.2fms" % (self.class.template_trace.total_time * 1_000)
+ end
+
+ def content
+ result = render_template "panels/templates", :template_trace => self.class.template_trace
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/actionview_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/actionview_extension.rb
new file mode 100644
index 0000000..f2e1238
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/actionview_extension.rb
@@ -0,0 +1,12 @@
+if defined?(ActionView) && defined?(ActionView::Template)
+ ActionView::Template.class_eval do
+
+ def render_template_with_rack_bug(*args, &block)
+ Rack::Bug::TemplatesPanel.record(path_without_format_and_extension) do
+ render_template_without_rack_bug(*args, &block)
+ end
+ end
+
+ alias_method_chain :render_template, :rack_bug
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/rendering.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/rendering.rb
new file mode 100644
index 0000000..561c5e6
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/rendering.rb
@@ -0,0 +1,67 @@
+module Rack
+ module Bug
+ class TemplatesPanel
+
+ class Rendering
+ attr_accessor :name
+ attr_accessor :start_time
+ attr_accessor :end_time
+ attr_accessor :parent
+ attr_reader :children
+
+
+ def initialize(name)
+ @name = name
+ @children = []
+ end
+
+ def add(rendering)
+ @children << rendering
+ rendering.parent = self
+ end
+
+ def time
+ @end_time - @start_time
+ end
+
+ def exclusive_time
+ time - child_time
+ end
+
+ def child_time
+ children.inject(0.0) { |memo, c| memo + c.time }
+ end
+
+ def time_summary
+ if children.any?
+ "%.2fms, %.2f exclusive" % [time * 1_000, exclusive_time * 1_000]
+ else
+ "%.2fms" % (time * 1_000)
+ end
+ end
+ def html
+ <<-HTML
+ <li>
+ <p>#{name} (#{time_summary})</p>
+
+ #{children_html}
+ </li>
+ HTML
+ end
+
+ def children_html
+ return "" unless children.any?
+
+ <<-HTML
+ <ul>#{joined_children_html}</ul>
+ HTML
+ end
+
+ def joined_children_html
+ children.map { |c| c.html }.join
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/trace.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/trace.rb
new file mode 100644
index 0000000..52740b9
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/trace.rb
@@ -0,0 +1,34 @@
+module Rack
+ module Bug
+ class TemplatesPanel
+
+ class Trace
+
+ def start(template_name)
+ rendering = Rendering.new(template_name)
+ rendering.start_time = Time.now
+ @current.add(rendering)
+ @current = rendering
+ end
+
+ def finished(template_name)
+ @current.end_time = Time.now
+ @current = @current.parent
+ end
+
+ def initialize
+ @current = root
+ end
+
+ def total_time
+ root.child_time
+ end
+
+ def root
+ @root ||= Rendering.new("root")
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/timer_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/timer_panel.rb
new file mode 100644
index 0000000..99a1918
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/timer_panel.rb
@@ -0,0 +1,41 @@
+require "rack/bug/panel"
+require "benchmark"
+
+module Rack
+ module Bug
+
+ class TimerPanel < Panel
+
+ def name
+ "timer"
+ end
+
+ def call(env)
+ status, headers, body = nil
+ @times = Benchmark.measure do
+ status, headers, body = @app.call(env)
+ end
+
+ @measurements = [
+ ["User CPU time", "%.2fms" % (@times.utime * 1_000)],
+ ["System CPU time", "%.2fms" % (@times.stime * 1_000)],
+ ["Total CPU time", "%.2fms" % (@times.total * 1_000)],
+ ["Elapsed time", "%.2fms" % (@times.real * 1_000)]
+ ]
+
+ env["rack-bug.panels"] << self
+ return [status, headers, body]
+ end
+
+ def heading
+ "%.2fms" % (@times.real * 1_000)
+ end
+
+ def content
+ render_template "panels/timer", :measurements => @measurements
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/params_signature.rb b/vendor/plugins/rack-bug/lib/rack/bug/params_signature.rb
new file mode 100644
index 0000000..89ad80c
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/params_signature.rb
@@ -0,0 +1,65 @@
+require "digest"
+
+module Rack
+ module Bug
+
+ class ParamsSignature
+ extend ERB::Util
+
+ def self.sign(request, hash)
+ parts = []
+
+ hash.keys.sort.each do |key|
+ parts << "#{key}=#{u(hash[key])}"
+ end
+
+ signature = new(request).signature(hash)
+ parts << "hash=#{u(signature)}"
+
+ parts.join("&")
+ end
+
+ attr_reader :request
+
+ def initialize(request)
+ @request = request
+ end
+
+ def secret_key
+ @request.env['rack-bug.secret_key']
+ end
+
+ def secret_key_blank?
+ secret_key.nil? || secret_key == ""
+ end
+
+ def validate!
+ if secret_key_blank?
+ raise SecurityError.new("Missing secret key")
+ end
+
+ if secret_key_blank? || request.params["hash"] != signature(request.params)
+ raise SecurityError.new("Invalid query hash.")
+ end
+ end
+
+ def signature(params)
+ Digest::SHA1.hexdigest(signature_base(params))
+ end
+
+ def signature_base(params)
+ signature = []
+ signature << secret_key
+
+ params.keys.sort.each do |key|
+ next if key == "hash"
+ signature << params[key].to_s
+ end
+
+ signature.join(":")
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.html b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.html
new file mode 100644
index 0000000..aca6ad3
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.html
@@ -0,0 +1,10 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <br/><br/><br/>
+ <a href="javascript: (function(){var script=document.createElement('script'); script.src='/__rack_bug__/bookmarklet.js'; document.getElementsByTagName('head')[0].appendChild(script);})()">
+ Toggle Rack::Bug
+ </a>
+ </body>
+</html>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
new file mode 100644
index 0000000..3f93392
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
@@ -0,0 +1,215 @@
+/**
+*
+* Secure Hash Algorithm (SHA1)
+* http://www.webtoolkit.info/
+*
+**/
+
+document.SHA1 = function(msg) {
+ function rotate_left(n,s) {
+ var t4 = ( n<<s ) | (n>>>(32-s));
+ return t4;
+ };
+
+ function lsb_hex(val) {
+ var str="";
+ var i;
+ var vh;
+ var vl;
+
+ for( i=0; i<=6; i+=2 ) {
+ vh = (val>>>(i*4+4))&0x0f;
+ vl = (val>>>(i*4))&0x0f;
+ str += vh.toString(16) + vl.toString(16);
+ }
+ return str;
+ };
+
+ function cvt_hex(val) {
+ var str="";
+ var i;
+ var v;
+
+ for( i=7; i>=0; i-- ) {
+ v = (val>>>(i*4))&0x0f;
+ str += v.toString(16);
+ }
+ return str;
+ };
+
+
+ function Utf8Encode(string) {
+ string = string.replace(/\r\n/g,"\n");
+ var utftext = "";
+
+ for (var n = 0; n < string.length; n++) {
+
+ var c = string.charCodeAt(n);
+
+ if (c < 128) {
+ utftext += String.fromCharCode(c);
+ }
+ else if((c > 127) && (c < 2048)) {
+ utftext += String.fromCharCode((c >> 6) | 192);
+ utftext += String.fromCharCode((c & 63) | 128);
+ }
+ else {
+ utftext += String.fromCharCode((c >> 12) | 224);
+ utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+ utftext += String.fromCharCode((c & 63) | 128);
+ }
+
+ }
+
+ return utftext;
+ };
+
+ var blockstart;
+ var i, j;
+ var W = new Array(80);
+ var H0 = 0x67452301;
+ var H1 = 0xEFCDAB89;
+ var H2 = 0x98BADCFE;
+ var H3 = 0x10325476;
+ var H4 = 0xC3D2E1F0;
+ var A, B, C, D, E;
+ var temp;
+
+ msg = Utf8Encode(msg);
+
+ var msg_len = msg.length;
+
+ var word_array = new Array();
+ for( i=0; i<msg_len-3; i+=4 ) {
+ j = msg.charCodeAt(i)<<24 | msg.charCodeAt(i+1)<<16 |
+ msg.charCodeAt(i+2)<<8 | msg.charCodeAt(i+3);
+ word_array.push( j );
+ }
+
+ switch( msg_len % 4 ) {
+ case 0:
+ i = 0x080000000;
+ break;
+ case 1:
+ i = msg.charCodeAt(msg_len-1)<<24 | 0x0800000;
+ break;
+
+ case 2:
+ i = msg.charCodeAt(msg_len-2)<<24 | msg.charCodeAt(msg_len-1)<<16 | 0x08000;
+ break;
+
+ case 3:
+ i = msg.charCodeAt(msg_len-3)<<24 | msg.charCodeAt(msg_len-2)<<16 | msg.charCodeAt(msg_len-1)<<8 | 0x80;
+ break;
+ }
+
+ word_array.push( i );
+
+ while( (word_array.length % 16) != 14 ) word_array.push( 0 );
+
+ word_array.push( msg_len>>>29 );
+ word_array.push( (msg_len<<3)&0x0ffffffff );
+
+
+ for ( blockstart=0; blockstart<word_array.length; blockstart+=16 ) {
+
+ for( i=0; i<16; i++ ) W[i] = word_array[blockstart+i];
+ for( i=16; i<=79; i++ ) W[i] = rotate_left(W[i-3] ^ W[i-8] ^ W[i-14] ^ W[i-16], 1);
+
+ A = H0;
+ B = H1;
+ C = H2;
+ D = H3;
+ E = H4;
+
+ for( i= 0; i<=19; i++ ) {
+ temp = (rotate_left(A,5) + ((B&C) | (~B&D)) + E + W[i] + 0x5A827999) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ for( i=20; i<=39; i++ ) {
+ temp = (rotate_left(A,5) + (B ^ C ^ D) + E + W[i] + 0x6ED9EBA1) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ for( i=40; i<=59; i++ ) {
+ temp = (rotate_left(A,5) + ((B&C) | (B&D) | (C&D)) + E + W[i] + 0x8F1BBCDC) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ for( i=60; i<=79; i++ ) {
+ temp = (rotate_left(A,5) + (B ^ C ^ D) + E + W[i] + 0xCA62C1D6) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ H0 = (H0 + A) & 0x0ffffffff;
+ H1 = (H1 + B) & 0x0ffffffff;
+ H2 = (H2 + C) & 0x0ffffffff;
+ H3 = (H3 + D) & 0x0ffffffff;
+ H4 = (H4 + E) & 0x0ffffffff;
+
+ }
+
+ var temp = cvt_hex(H0) + cvt_hex(H1) + cvt_hex(H2) + cvt_hex(H3) + cvt_hex(H4);
+
+ return temp.toLowerCase();
+}
+
+document.createCookie = function(name,value,days) {
+ if (days) {
+ var date = new Date();
+ date.setTime(date.getTime()+(days*24*60*60*1000));
+ var expires = "; expires="+date.toGMTString();
+ }
+ else
+ var expires = "";
+ document.cookie = name+"="+value+expires+"; path=/";
+}
+
+document.readCookie = function(name) {
+ var nameEQ = name + "=";
+ var ca = document.cookie.split(';');
+ for(var i=0;i < ca.length;i++) {
+ var c = ca[i];
+ while (c.charAt(0)==' ')
+ c = c.substring(1,c.length);
+ if (c.indexOf(nameEQ) == 0)
+ return c.substring(nameEQ.length,c.length);
+ }
+ return null;
+}
+
+document.eraseCookie = function(name) {
+ document.createCookie(name,"",-1);
+}
+
+document.rackBugBookmarklet = function() {
+ if (document.readCookie('rack_bug_password')) {
+ document.eraseCookie('rack_bug_password');
+ document.eraseCookie('rack_bug_enabled');
+ alert('Rack::Bug Disabled');
+ } else {
+ var password = prompt("Rack::Bug password:", "")
+ document.createCookie('rack_bug_password', document.SHA1('rack_bug:'+password));
+ document.createCookie('rack_bug_enabled', "1");
+ alert('Rack::Bug Enabled');
+ }
+}
+
+document.rackBugBookmarklet();
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.css b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.css
new file mode 100644
index 0000000..cc62ea2
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.css
@@ -0,0 +1,186 @@
+#rack_bug {
+ color: #000;
+ float: none;
+ margin: 0;
+ padding: 0;
+ position: static;
+}
+
+#rack_bug a {
+ color: #f7c757;
+}
+#rack_bug a:hover {
+ color: #aaa;
+}
+
+#rack_bug_toolbar {
+ background: #326342;
+ height: 30px;
+ z-index: 100000000;
+ border-bottom: 2px solid #234f32;
+ position:absolute;
+ top:0;
+ left:0;
+ right:0;
+}
+
+.rack_bug_error #rack_bug_toolbar {
+ background: #ff0000;
+ color: #fff;
+ border: none;
+}
+
+.rack_bug_error #rack_bug_toolbar p {
+ margin-top: 6px;
+ margin-left: 15px;
+ font-weight: bold;
+ color: #fff;
+}
+
+#rack_bug_toolbar ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+#rack_bug_toolbar li {
+ color: #fff;
+ display: inline;
+ font-size: 11px;
+ font-weight: bold;
+ float: none;
+ height: 20px;
+ margin: 0;
+ padding: 0;
+ line-height: 30px;
+ position: relative;
+ width: auto;
+}
+#rack_bug_toolbar li a {
+ border-left: 1px solid #487858;
+ padding: 8px 9px 9px;
+}
+
+#rack_bug_toolbar li a:hover {
+ background: #487858;
+ color: #fff;
+}
+
+#rack_bug_toolbar li:last-child {
+ border-right: 1px solid #487858;
+}
+
+#rack_bug_toolbar #rb_debug_button {
+ color: #92ef3f;
+ padding-left: 20px;
+}
+
+#rack_bug .panel_content {
+ background: #2a5738;
+ border-bottom: 2px solid #234f32;
+ border-top: 2px solid #487858;
+ display: none;
+ position: absolute;
+ margin: 0;
+ padding: 10px;
+ top: 32px;
+ width: auto;
+ left: 0px;
+ right: 0px;
+ bottom: 5px;
+ color: black;
+ z-index: 1000000;
+ overflow: auto;
+}
+
+#rack_bug .panel_content p a,
+#rack_bug .panel_content dl a {
+ color: #40684c;
+}
+
+#rack_bug .panel_content p a:hover,
+#rack_bug .panel_content dl a:hover {
+ color: #92EF3F;
+}
+
+#rack_bug .panel_content h3 {
+ border-bottom: 1px solid #40684c;
+ color: #92ef3f;
+ padding: 0 0 5px;
+}
+
+#rack_bug .panel_content p {
+ padding: 0 5px;
+}
+
+#rack_bug .panel_content p,
+#rack_bug .panel_content table,
+#rack_bug .panel_content ol,
+#rack_bug .panel_content dl {
+ margin: 5px 0 15px;
+ background-color: #fff;
+}
+
+#rack_bug .panel_content ul {
+ padding: 10px 30px 10px 30px;
+ background-color: #fff;
+}
+
+#rack_bug .panel_content ul ul {
+ padding: 0;
+}
+
+#rack_bug .panel_content table {
+ width: 100%;
+ clear: both;
+}
+
+#rack_bug .panel_content table a {
+ color: #40684C;
+}
+
+#rack_bug .panel_content table th {
+ background-color: #9dcc49;
+ font-weight: bold;
+ color: #000;
+ font-size: 11px;
+ padding: 3px 7px 3px;
+ text-align: left;
+ cursor: pointer;
+ border-right: 1px solid #b9d977;
+}
+
+#rack_bug .panel_content table td {
+ padding: 5px 10px;
+ font-size: 11px;
+ background: #fff;
+ color: #000;
+ vertical-align: top;
+}
+#rack_bug .panel_content table tr.odd td {
+ background: #eee;
+}
+
+#rack_bug .panel_content .rack_bug_close {
+ float: right;
+ font-weight: bold;
+}
+
+#rack_bug .panel_content dt, #rack_bug .panel_content dd {
+ display: block;
+}
+
+#rack_bug .panel_content dd {
+ margin-left: 10px;
+}
+
+#rack_bug .panel_content table tr.odd td.rack_bug_spinner,
+#rack_bug .panel_content table tr.even td.rack_bug_spinner,
+#rack_bug .panel_content table td.rack_bug_spinner,
+#rack_bug .rack_bug_spinner {
+ background-image: url(/__rack_bug__/spinner.gif);
+ background-repeat: no-repeat;
+ background-position: center center;
+ text-indent: -3000px;
+ color: transparent;
+}
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.js
new file mode 100644
index 0000000..53cd8cf
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.js
@@ -0,0 +1,69 @@
+var _$ = window.$;
+jQuery.noConflict();
+jQuery(function($) {
+ $.rackBug = function(data, klass) {
+ $.rackBug.init();
+ }
+ $.extend($.rackBug, {
+ init: function() {
+ var current = null;
+ $('#rack_bug ul.panels li a').click(function() {
+ current = $('#rack_bug #' + this.className);
+
+ if (current.is(':visible')) {
+ $(document).trigger('close.rackBug');
+ } else {
+ $('#rack_bug .panel_content').hide();
+ current.show();
+ $.rackBug.open();
+ }
+ return false;
+ });
+ $('#rack_bug a.remote_call').click(function() {
+ $('#rack_bug_debug_window').load(this.href, null, function() {
+ $('#rack_bug_debug_window a.back').click(function() {
+ $(this).parent().hide();
+ return false;
+ });
+ });
+ $('#rack_bug_debug_window').show();
+ return false;
+ });
+ $('#rack_bug a.reveal_backtrace').click(function() {
+ $(this).parents("tr").next().toggle();
+ return false;
+ });
+ $('#rack_bug a.rack_bug_close').click(function() {
+ $(document).trigger('close.rackBug');
+ return false;
+ });
+ },
+ open: function() {
+ $(document).bind('keydown.rackBug', function(e) {
+ if (e.keyCode == 27) {
+ $.rackBug.close();
+ }
+ });
+ },
+ toggle_content: function(elem) {
+ if (elem.is(':visible')) {
+ elem.hide();
+ } else {
+ elem.show();
+ }
+ },
+ close: function() {
+ $(document).trigger('close.rackBug');
+ return false;
+ }
+ });
+ $(document).bind('close.rackBug', function() {
+ $(document).unbind('keydown.rackBug');
+ $('.panel_content').hide();
+ });
+});
+
+jQuery(function() {
+ jQuery.rackBug();
+});
+$ = _$;
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js
new file mode 100644
index 0000000..9263574
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js
@@ -0,0 +1,4376 @@
+/*!
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){
+
+var
+ // Will speed up references to window, and allows munging its name.
+ window = this,
+ // Will speed up references to undefined, and allows munging its name.
+ undefined,
+ // Map over jQuery in case of overwrite
+ _jQuery = window.jQuery,
+ // Map over the $ in case of overwrite
+ _$ = window.$,
+
+ jQuery = window.jQuery = window.$ = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ return new jQuery.fn.init( selector, context );
+ },
+
+ // A simple way to check for HTML strings or ID strings
+ // (both of which we optimize for)
+ quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
+ // Is it a simple selector
+ isSimple = /^.[^:#\[\.,]*$/;
+
+jQuery.fn = jQuery.prototype = {
+ init: function( selector, context ) {
+ // Make sure that a selection was provided
+ selector = selector || document;
+
+ // Handle $(DOMElement)
+ if ( selector.nodeType ) {
+ this[0] = selector;
+ this.length = 1;
+ this.context = selector;
+ return this;
+ }
+ // Handle HTML strings
+ if ( typeof selector === "string" ) {
+ // Are we dealing with HTML string or an ID?
+ var match = quickExpr.exec( selector );
+
+ // Verify a match, and that no context was specified for #id
+ if ( match && (match[1] || !context) ) {
+
+ // HANDLE: $(html) -> $(array)
+ if ( match[1] )
+ selector = jQuery.clean( [ match[1] ], context );
+
+ // HANDLE: $("#id")
+ else {
+ var elem = document.getElementById( match[3] );
+
+ // Handle the case where IE and Opera return items
+ // by name instead of ID
+ if ( elem && elem.id != match[3] )
+ return jQuery().find( selector );
+
+ // Otherwise, we inject the element directly into the jQuery object
+ var ret = jQuery( elem || [] );
+ ret.context = document;
+ ret.selector = selector;
+ return ret;
+ }
+
+ // HANDLE: $(expr, [context])
+ // (which is just equivalent to: $(content).find(expr)
+ } else
+ return jQuery( context ).find( selector );
+
+ // HANDLE: $(function)
+ // Shortcut for document ready
+ } else if ( jQuery.isFunction( selector ) )
+ return jQuery( document ).ready( selector );
+
+ // Make sure that old selector state is passed along
+ if ( selector.selector && selector.context ) {
+ this.selector = selector.selector;
+ this.context = selector.context;
+ }
+
+ return this.setArray(jQuery.isArray( selector ) ?
+ selector :
+ jQuery.makeArray(selector));
+ },
+
+ // Start with an empty selector
+ selector: "",
+
+ // The current version of jQuery being used
+ jquery: "1.3.2",
+
+ // The number of elements contained in the matched element set
+ size: function() {
+ return this.length;
+ },
+
+ // Get the Nth element in the matched element set OR
+ // Get the whole matched element set as a clean array
+ get: function( num ) {
+ return num === undefined ?
+
+ // Return a 'clean' array
+ Array.prototype.slice.call( this ) :
+
+ // Return just the object
+ this[ num ];
+ },
+
+ // Take an array of elements and push it onto the stack
+ // (returning the new matched element set)
+ pushStack: function( elems, name, selector ) {
+ // Build a new jQuery matched element set
+ var ret = jQuery( elems );
+
+ // Add the old object onto the stack (as a reference)
+ ret.prevObject = this;
+
+ ret.context = this.context;
+
+ if ( name === "find" )
+ ret.selector = this.selector + (this.selector ? " " : "") + selector;
+ else if ( name )
+ ret.selector = this.selector + "." + name + "(" + selector + ")";
+
+ // Return the newly-formed element set
+ return ret;
+ },
+
+ // Force the current matched set of elements to become
+ // the specified array of elements (destroying the stack in the process)
+ // You should use pushStack() in order to do this, but maintain the stack
+ setArray: function( elems ) {
+ // Resetting the length to 0, then using the native Array push
+ // is a super-fast way to populate an object with array-like properties
+ this.length = 0;
+ Array.prototype.push.apply( this, elems );
+
+ return this;
+ },
+
+ // Execute a callback for every element in the matched set.
+ // (You can seed the arguments with an array of args, but this is
+ // only used internally.)
+ each: function( callback, args ) {
+ return jQuery.each( this, callback, args );
+ },
+
+ // Determine the position of an element within
+ // the matched set of elements
+ index: function( elem ) {
+ // Locate the position of the desired element
+ return jQuery.inArray(
+ // If it receives a jQuery object, the first element is used
+ elem && elem.jquery ? elem[0] : elem
+ , this );
+ },
+
+ attr: function( name, value, type ) {
+ var options = name;
+
+ // Look for the case where we're accessing a style value
+ if ( typeof name === "string" )
+ if ( value === undefined )
+ return this[0] && jQuery[ type || "attr" ]( this[0], name );
+
+ else {
+ options = {};
+ options[ name ] = value;
+ }
+
+ // Check to see if we're setting style values
+ return this.each(function(i){
+ // Set all the styles
+ for ( name in options )
+ jQuery.attr(
+ type ?
+ this.style :
+ this,
+ name, jQuery.prop( this, options[ name ], type, i, name )
+ );
+ });
+ },
+
+ css: function( key, value ) {
+ // ignore negative width and height values
+ if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+ value = undefined;
+ return this.attr( key, value, "curCSS" );
+ },
+
+ text: function( text ) {
+ if ( typeof text !== "object" && text != null )
+ return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+
+ var ret = "";
+
+ jQuery.each( text || this, function(){
+ jQuery.each( this.childNodes, function(){
+ if ( this.nodeType != 8 )
+ ret += this.nodeType != 1 ?
+ this.nodeValue :
+ jQuery.fn.text( [ this ] );
+ });
+ });
+
+ return ret;
+ },
+
+ wrapAll: function( html ) {
+ if ( this[0] ) {
+ // The elements to wrap the target around
+ var wrap = jQuery( html, this[0].ownerDocument ).clone();
+
+ if ( this[0].parentNode )
+ wrap.insertBefore( this[0] );
+
+ wrap.map(function(){
+ var elem = this;
+
+ while ( elem.firstChild )
+ elem = elem.firstChild;
+
+ return elem;
+ }).append(this);
+ }
+
+ return this;
+ },
+
+ wrapInner: function( html ) {
+ return this.each(function(){
+ jQuery( this ).contents().wrapAll( html );
+ });
+ },
+
+ wrap: function( html ) {
+ return this.each(function(){
+ jQuery( this ).wrapAll( html );
+ });
+ },
+
+ append: function() {
+ return this.domManip(arguments, true, function(elem){
+ if (this.nodeType == 1)
+ this.appendChild( elem );
+ });
+ },
+
+ prepend: function() {
+ return this.domManip(arguments, true, function(elem){
+ if (this.nodeType == 1)
+ this.insertBefore( elem, this.firstChild );
+ });
+ },
+
+ before: function() {
+ return this.domManip(arguments, false, function(elem){
+ this.parentNode.insertBefore( elem, this );
+ });
+ },
+
+ after: function() {
+ return this.domManip(arguments, false, function(elem){
+ this.parentNode.insertBefore( elem, this.nextSibling );
+ });
+ },
+
+ end: function() {
+ return this.prevObject || jQuery( [] );
+ },
+
+ // For internal use only.
+ // Behaves like an Array's method, not like a jQuery method.
+ push: [].push,
+ sort: [].sort,
+ splice: [].splice,
+
+ find: function( selector ) {
+ if ( this.length === 1 ) {
+ var ret = this.pushStack( [], "find", selector );
+ ret.length = 0;
+ jQuery.find( selector, this[0], ret );
+ return ret;
+ } else {
+ return this.pushStack( jQuery.unique(jQuery.map(this, function(elem){
+ return jQuery.find( selector, elem );
+ })), "find", selector );
+ }
+ },
+
+ clone: function( events ) {
+ // Do the clone
+ var ret = this.map(function(){
+ if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+ // IE copies events bound via attachEvent when
+ // using cloneNode. Calling detachEvent on the
+ // clone will also remove the events from the orignal
+ // In order to get around this, we use innerHTML.
+ // Unfortunately, this means some modifications to
+ // attributes in IE that are actually only stored
+ // as properties will not be copied (such as the
+ // the name attribute on an input).
+ var html = this.outerHTML;
+ if ( !html ) {
+ var div = this.ownerDocument.createElement("div");
+ div.appendChild( this.cloneNode(true) );
+ html = div.innerHTML;
+ }
+
+ return jQuery.clean([html.replace(/ jQuery\d+="(?:\d+|null)"/g, "").replace(/^\s*/, "")])[0];
+ } else
+ return this.cloneNode(true);
+ });
+
+ // Copy the events from the original to the clone
+ if ( events === true ) {
+ var orig = this.find("*").andSelf(), i = 0;
+
+ ret.find("*").andSelf().each(function(){
+ if ( this.nodeName !== orig[i].nodeName )
+ return;
+
+ var events = jQuery.data( orig[i], "events" );
+
+ for ( var type in events ) {
+ for ( var handler in events[ type ] ) {
+ jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+ }
+ }
+
+ i++;
+ });
+ }
+
+ // Return the cloned set
+ return ret;
+ },
+
+ filter: function( selector ) {
+ return this.pushStack(
+ jQuery.isFunction( selector ) &&
+ jQuery.grep(this, function(elem, i){
+ return selector.call( elem, i );
+ }) ||
+
+ jQuery.multiFilter( selector, jQuery.grep(this, function(elem){
+ return elem.nodeType === 1;
+ }) ), "filter", selector );
+ },
+
+ closest: function( selector ) {
+ var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
+ closer = 0;
+
+ return this.map(function(){
+ var cur = this;
+ while ( cur && cur.ownerDocument ) {
+ if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
+ jQuery.data(cur, "closest", closer);
+ return cur;
+ }
+ cur = cur.parentNode;
+ closer++;
+ }
+ });
+ },
+
+ not: function( selector ) {
+ if ( typeof selector === "string" )
+ // test special case where just one selector is passed in
+ if ( isSimple.test( selector ) )
+ return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector );
+ else
+ selector = jQuery.multiFilter( selector, this );
+
+ var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
+ return this.filter(function() {
+ return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
+ });
+ },
+
+ add: function( selector ) {
+ return this.pushStack( jQuery.unique( jQuery.merge(
+ this.get(),
+ typeof selector === "string" ?
+ jQuery( selector ) :
+ jQuery.makeArray( selector )
+ )));
+ },
+
+ is: function( selector ) {
+ return !!selector && jQuery.multiFilter( selector, this ).length > 0;
+ },
+
+ hasClass: function( selector ) {
+ return !!selector && this.is( "." + selector );
+ },
+
+ val: function( value ) {
+ if ( value === undefined ) {
+ var elem = this[0];
+
+ if ( elem ) {
+ if( jQuery.nodeName( elem, 'option' ) )
+ return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+
+ // We need to handle select boxes special
+ if ( jQuery.nodeName( elem, "select" ) ) {
+ var index = elem.selectedIndex,
+ values = [],
+ options = elem.options,
+ one = elem.type == "select-one";
+
+ // Nothing was selected
+ if ( index < 0 )
+ return null;
+
+ // Loop through all the selected options
+ for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+ var option = options[ i ];
+
+ if ( option.selected ) {
+ // Get the specifc value for the option
+ value = jQuery(option).val();
+
+ // We don't need an array for one selects
+ if ( one )
+ return value;
+
+ // Multi-Selects return an array
+ values.push( value );
+ }
+ }
+
+ return values;
+ }
+
+ // Everything else, we just grab the value
+ return (elem.value || "").replace(/\r/g, "");
+
+ }
+
+ return undefined;
+ }
+
+ if ( typeof value === "number" )
+ value += '';
+
+ return this.each(function(){
+ if ( this.nodeType != 1 )
+ return;
+
+ if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
+ this.checked = (jQuery.inArray(this.value, value) >= 0 ||
+ jQuery.inArray(this.name, value) >= 0);
+
+ else if ( jQuery.nodeName( this, "select" ) ) {
+ var values = jQuery.makeArray(value);
+
+ jQuery( "option", this ).each(function(){
+ this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
+ jQuery.inArray( this.text, values ) >= 0);
+ });
+
+ if ( !values.length )
+ this.selectedIndex = -1;
+
+ } else
+ this.value = value;
+ });
+ },
+
+ html: function( value ) {
+ return value === undefined ?
+ (this[0] ?
+ this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g, "") :
+ null) :
+ this.empty().append( value );
+ },
+
+ replaceWith: function( value ) {
+ return this.after( value ).remove();
+ },
+
+ eq: function( i ) {
+ return this.slice( i, +i + 1 );
+ },
+
+ slice: function() {
+ return this.pushStack( Array.prototype.slice.apply( this, arguments ),
+ "slice", Array.prototype.slice.call(arguments).join(",") );
+ },
+
+ map: function( callback ) {
+ return this.pushStack( jQuery.map(this, function(elem, i){
+ return callback.call( elem, i, elem );
+ }));
+ },
+
+ andSelf: function() {
+ return this.add( this.prevObject );
+ },
+
+ domManip: function( args, table, callback ) {
+ if ( this[0] ) {
+ var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(),
+ scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ),
+ first = fragment.firstChild;
+
+ if ( first )
+ for ( var i = 0, l = this.length; i < l; i++ )
+ callback.call( root(this[i], first), this.length > 1 || i > 0 ?
+ fragment.cloneNode(true) : fragment );
+
+ if ( scripts )
+ jQuery.each( scripts, evalScript );
+ }
+
+ return this;
+
+ function root( elem, cur ) {
+ return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ?
+ (elem.getElementsByTagName("tbody")[0] ||
+ elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+ elem;
+ }
+ }
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+function evalScript( i, elem ) {
+ if ( elem.src )
+ jQuery.ajax({
+ url: elem.src,
+ async: false,
+ dataType: "script"
+ });
+
+ else
+ jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+
+ if ( elem.parentNode )
+ elem.parentNode.removeChild( elem );
+}
+
+function now(){
+ return +new Date;
+}
+
+jQuery.extend = jQuery.fn.extend = function() {
+ // copy reference to target object
+ var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
+
+ // Handle a deep copy situation
+ if ( typeof target === "boolean" ) {
+ deep = target;
+ target = arguments[1] || {};
+ // skip the boolean and the target
+ i = 2;
+ }
+
+ // Handle case when target is a string or something (possible in deep copy)
+ if ( typeof target !== "object" && !jQuery.isFunction(target) )
+ target = {};
+
+ // extend jQuery itself if only one argument is passed
+ if ( length == i ) {
+ target = this;
+ --i;
+ }
+
+ for ( ; i < length; i++ )
+ // Only deal with non-null/undefined values
+ if ( (options = arguments[ i ]) != null )
+ // Extend the base object
+ for ( var name in options ) {
+ var src = target[ name ], copy = options[ name ];
+
+ // Prevent never-ending loop
+ if ( target === copy )
+ continue;
+
+ // Recurse if we're merging object values
+ if ( deep && copy && typeof copy === "object" && !copy.nodeType )
+ target[ name ] = jQuery.extend( deep,
+ // Never move original objects, clone them
+ src || ( copy.length != null ? [ ] : { } )
+ , copy );
+
+ // Don't bring in undefined values
+ else if ( copy !== undefined )
+ target[ name ] = copy;
+
+ }
+
+ // Return the modified object
+ return target;
+};
+
+// exclude the following css properties to add px
+var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+ // cache defaultView
+ defaultView = document.defaultView || {},
+ toString = Object.prototype.toString;
+
+jQuery.extend({
+ noConflict: function( deep ) {
+ window.$ = _$;
+
+ if ( deep )
+ window.jQuery = _jQuery;
+
+ return jQuery;
+ },
+
+ // See test/unit/core.js for details concerning isFunction.
+ // Since version 1.3, DOM methods and functions like alert
+ // aren't supported. They return false on IE (#2968).
+ isFunction: function( obj ) {
+ return toString.call(obj) === "[object Function]";
+ },
+
+ isArray: function( obj ) {
+ return toString.call(obj) === "[object Array]";
+ },
+
+ // check if an element is in a (or is an) XML document
+ isXMLDoc: function( elem ) {
+ return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+ !!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument );
+ },
+
+ // Evalulates a script in a global context
+ globalEval: function( data ) {
+ if ( data && /\S/.test(data) ) {
+ // Inspired by code by Andrea Giammarchi
+ // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+ var head = document.getElementsByTagName("head")[0] || document.documentElement,
+ script = document.createElement("script");
+
+ script.type = "text/javascript";
+ if ( jQuery.support.scriptEval )
+ script.appendChild( document.createTextNode( data ) );
+ else
+ script.text = data;
+
+ // Use insertBefore instead of appendChild to circumvent an IE6 bug.
+ // This arises when a base node is used (#2709).
+ head.insertBefore( script, head.firstChild );
+ head.removeChild( script );
+ }
+ },
+
+ nodeName: function( elem, name ) {
+ return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+ },
+
+ // args is for internal usage only
+ each: function( object, callback, args ) {
+ var name, i = 0, length = object.length;
+
+ if ( args ) {
+ if ( length === undefined ) {
+ for ( name in object )
+ if ( callback.apply( object[ name ], args ) === false )
+ break;
+ } else
+ for ( ; i < length; )
+ if ( callback.apply( object[ i++ ], args ) === false )
+ break;
+
+ // A special, fast, case for the most common use of each
+ } else {
+ if ( length === undefined ) {
+ for ( name in object )
+ if ( callback.call( object[ name ], name, object[ name ] ) === false )
+ break;
+ } else
+ for ( var value = object[0];
+ i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
+ }
+
+ return object;
+ },
+
+ prop: function( elem, value, type, i, name ) {
+ // Handle executable functions
+ if ( jQuery.isFunction( value ) )
+ value = value.call( elem, i );
+
+ // Handle passing in a number to a CSS property
+ return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
+ value + "px" :
+ value;
+ },
+
+ className: {
+ // internal only, use addClass("class")
+ add: function( elem, classNames ) {
+ jQuery.each((classNames || "").split(/\s+/), function(i, className){
+ if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
+ elem.className += (elem.className ? " " : "") + className;
+ });
+ },
+
+ // internal only, use removeClass("class")
+ remove: function( elem, classNames ) {
+ if (elem.nodeType == 1)
+ elem.className = classNames !== undefined ?
+ jQuery.grep(elem.className.split(/\s+/), function(className){
+ return !jQuery.className.has( classNames, className );
+ }).join(" ") :
+ "";
+ },
+
+ // internal only, use hasClass("class")
+ has: function( elem, className ) {
+ return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+ }
+ },
+
+ // A method for quickly swapping in/out CSS properties to get correct calculations
+ swap: function( elem, options, callback ) {
+ var old = {};
+ // Remember the old values, and insert the new ones
+ for ( var name in options ) {
+ old[ name ] = elem.style[ name ];
+ elem.style[ name ] = options[ name ];
+ }
+
+ callback.call( elem );
+
+ // Revert the old values
+ for ( var name in options )
+ elem.style[ name ] = old[ name ];
+ },
+
+ css: function( elem, name, force, extra ) {
+ if ( name == "width" || name == "height" ) {
+ var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
+
+ function getWH() {
+ val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
+
+ if ( extra === "border" )
+ return;
+
+ jQuery.each( which, function() {
+ if ( !extra )
+ val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+ if ( extra === "margin" )
+ val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+ else
+ val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+ });
+ }
+
+ if ( elem.offsetWidth !== 0 )
+ getWH();
+ else
+ jQuery.swap( elem, props, getWH );
+
+ return Math.max(0, Math.round(val));
+ }
+
+ return jQuery.curCSS( elem, name, force );
+ },
+
+ curCSS: function( elem, name, force ) {
+ var ret, style = elem.style;
+
+ // We need to handle opacity special in IE
+ if ( name == "opacity" && !jQuery.support.opacity ) {
+ ret = jQuery.attr( style, "opacity" );
+
+ return ret == "" ?
+ "1" :
+ ret;
+ }
+
+ // Make sure we're using the right name for getting the float value
+ if ( name.match( /float/i ) )
+ name = styleFloat;
+
+ if ( !force && style && style[ name ] )
+ ret = style[ name ];
+
+ else if ( defaultView.getComputedStyle ) {
+
+ // Only "float" is needed here
+ if ( name.match( /float/i ) )
+ name = "float";
+
+ name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
+
+ var computedStyle = defaultView.getComputedStyle( elem, null );
+
+ if ( computedStyle )
+ ret = computedStyle.getPropertyValue( name );
+
+ // We should always get a number back from opacity
+ if ( name == "opacity" && ret == "" )
+ ret = "1";
+
+ } else if ( elem.currentStyle ) {
+ var camelCase = name.replace(/\-(\w)/g, function(all, letter){
+ return letter.toUpperCase();
+ });
+
+ ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+
+ // From the awesome hack by Dean Edwards
+ // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+ // If we're not dealing with a regular pixel number
+ // but a number that has a weird ending, we need to convert it to pixels
+ if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+ // Remember the original values
+ var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+ // Put in the new values to get a computed value out
+ elem.runtimeStyle.left = elem.currentStyle.left;
+ style.left = ret || 0;
+ ret = style.pixelLeft + "px";
+
+ // Revert the changed values
+ style.left = left;
+ elem.runtimeStyle.left = rsLeft;
+ }
+ }
+
+ return ret;
+ },
+
+ clean: function( elems, context, fragment ) {
+ context = context || document;
+
+ // !context.createElement fails in IE with an error but returns typeof 'object'
+ if ( typeof context.createElement === "undefined" )
+ context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+
+ // If a single string is passed in and it's a single tag
+ // just do a createElement and skip the rest
+ if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) {
+ var match = /^<(\w+)\s*\/?>$/.exec(elems[0]);
+ if ( match )
+ return [ context.createElement( match[1] ) ];
+ }
+
+ var ret = [], scripts = [], div = context.createElement("div");
+
+ jQuery.each(elems, function(i, elem){
+ if ( typeof elem === "number" )
+ elem += '';
+
+ if ( !elem )
+ return;
+
+ // Convert html string into DOM nodes
+ if ( typeof elem === "string" ) {
+ // Fix "XHTML"-style tags in all browsers
+ elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
+ return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
+ all :
+ front + "></" + tag + ">";
+ });
+
+ // Trim whitespace, otherwise indexOf won't work as expected
+ var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase();
+
+ var wrap =
+ // option or optgroup
+ !tags.indexOf("<opt") &&
+ [ 1, "<select multiple='multiple'>", "</select>" ] ||
+
+ !tags.indexOf("<leg") &&
+ [ 1, "<fieldset>", "</fieldset>" ] ||
+
+ tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+ [ 1, "<table>", "</table>" ] ||
+
+ !tags.indexOf("<tr") &&
+ [ 2, "<table><tbody>", "</tbody></table>" ] ||
+
+ // <thead> matched above
+ (!tags.indexOf("<td") || !tags.indexOf("<th")) &&
+ [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
+
+ !tags.indexOf("<col") &&
+ [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
+
+ // IE can't serialize <link> and <script> tags normally
+ !jQuery.support.htmlSerialize &&
+ [ 1, "div<div>", "</div>" ] ||
+
+ [ 0, "", "" ];
+
+ // Go to html and back, then peel off extra wrappers
+ div.innerHTML = wrap[1] + elem + wrap[2];
+
+ // Move to the right depth
+ while ( wrap[0]-- )
+ div = div.lastChild;
+
+ // Remove IE's autoinserted <tbody> from table fragments
+ if ( !jQuery.support.tbody ) {
+
+ // String was a <table>, *may* have spurious <tbody>
+ var hasBody = /<tbody/i.test(elem),
+ tbody = !tags.indexOf("<table") && !hasBody ?
+ div.firstChild && div.firstChild.childNodes :
+
+ // String was a bare <thead> or <tfoot>
+ wrap[1] == "<table>" && !hasBody ?
+ div.childNodes :
+ [];
+
+ for ( var j = tbody.length - 1; j >= 0 ; --j )
+ if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
+ tbody[ j ].parentNode.removeChild( tbody[ j ] );
+
+ }
+
+ // IE completely kills leading whitespace when innerHTML is used
+ if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) )
+ div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
+
+ elem = jQuery.makeArray( div.childNodes );
+ }
+
+ if ( elem.nodeType )
+ ret.push( elem );
+ else
+ ret = jQuery.merge( ret, elem );
+
+ });
+
+ if ( fragment ) {
+ for ( var i = 0; ret[i]; i++ ) {
+ if ( jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+ scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+ } else {
+ if ( ret[i].nodeType === 1 )
+ ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+ fragment.appendChild( ret[i] );
+ }
+ }
+
+ return scripts;
+ }
+
+ return ret;
+ },
+
+ attr: function( elem, name, value ) {
+ // don't set attributes on text and comment nodes
+ if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+ return undefined;
+
+ var notxml = !jQuery.isXMLDoc( elem ),
+ // Whether we are setting (or getting)
+ set = value !== undefined;
+
+ // Try to normalize/fix the name
+ name = notxml && jQuery.props[ name ] || name;
+
+ // Only do all the following if this is a node (faster for style)
+ // IE elem.getAttribute passes even for style
+ if ( elem.tagName ) {
+
+ // These attributes require special treatment
+ var special = /href|src|style/.test( name );
+
+ // Safari mis-reports the default selected property of a hidden option
+ // Accessing the parent's selectedIndex property fixes it
+ if ( name == "selected" && elem.parentNode )
+ elem.parentNode.selectedIndex;
+
+ // If applicable, access the attribute via the DOM 0 way
+ if ( name in elem && notxml && !special ) {
+ if ( set ){
+ // We can't allow the type property to be changed (since it causes problems in IE)
+ if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
+ throw "type property can't be changed";
+
+ elem[ name ] = value;
+ }
+
+ // browsers index elements by id/name on forms, give priority to attributes.
+ if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
+ return elem.getAttributeNode( name ).nodeValue;
+
+ // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+ // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+ if ( name == "tabIndex" ) {
+ var attributeNode = elem.getAttributeNode( "tabIndex" );
+ return attributeNode && attributeNode.specified
+ ? attributeNode.value
+ : elem.nodeName.match(/(button|input|object|select|textarea)/i)
+ ? 0
+ : elem.nodeName.match(/^(a|area)$/i) && elem.href
+ ? 0
+ : undefined;
+ }
+
+ return elem[ name ];
+ }
+
+ if ( !jQuery.support.style && notxml && name == "style" )
+ return jQuery.attr( elem.style, "cssText", value );
+
+ if ( set )
+ // convert the value to a string (all browsers do this but IE) see #1070
+ elem.setAttribute( name, "" + value );
+
+ var attr = !jQuery.support.hrefNormalized && notxml && special
+ // Some attributes require a special call on IE
+ ? elem.getAttribute( name, 2 )
+ : elem.getAttribute( name );
+
+ // Non-existent attributes return null, we normalize to undefined
+ return attr === null ? undefined : attr;
+ }
+
+ // elem is actually elem.style ... set the style
+
+ // IE uses filters for opacity
+ if ( !jQuery.support.opacity && name == "opacity" ) {
+ if ( set ) {
+ // IE has trouble with opacity if it does not have layout
+ // Force it by setting the zoom level
+ elem.zoom = 1;
+
+ // Set the alpha filter to set the opacity
+ elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
+ (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+ }
+
+ return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
+ (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ "";
+ }
+
+ name = name.replace(/-([a-z])/ig, function(all, letter){
+ return letter.toUpperCase();
+ });
+
+ if ( set )
+ elem[ name ] = value;
+
+ return elem[ name ];
+ },
+
+ trim: function( text ) {
+ return (text || "").replace( /^\s+|\s+$/g, "" );
+ },
+
+ makeArray: function( array ) {
+ var ret = [];
+
+ if( array != null ){
+ var i = array.length;
+ // The window, strings (and functions) also have 'length'
+ if( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval )
+ ret[0] = array;
+ else
+ while( i )
+ ret[--i] = array[i];
+ }
+
+ return ret;
+ },
+
+ inArray: function( elem, array ) {
+ for ( var i = 0, length = array.length; i < length; i++ )
+ // Use === because on IE, window == document
+ if ( array[ i ] === elem )
+ return i;
+
+ return -1;
+ },
+
+ merge: function( first, second ) {
+ // We have to loop this way because IE & Opera overwrite the length
+ // expando of getElementsByTagName
+ var i = 0, elem, pos = first.length;
+ // Also, we need to make sure that the correct elements are being returned
+ // (IE returns comment nodes in a '*' query)
+ if ( !jQuery.support.getAll ) {
+ while ( (elem = second[ i++ ]) != null )
+ if ( elem.nodeType != 8 )
+ first[ pos++ ] = elem;
+
+ } else
+ while ( (elem = second[ i++ ]) != null )
+ first[ pos++ ] = elem;
+
+ return first;
+ },
+
+ unique: function( array ) {
+ var ret = [], done = {};
+
+ try {
+
+ for ( var i = 0, length = array.length; i < length; i++ ) {
+ var id = jQuery.data( array[ i ] );
+
+ if ( !done[ id ] ) {
+ done[ id ] = true;
+ ret.push( array[ i ] );
+ }
+ }
+
+ } catch( e ) {
+ ret = array;
+ }
+
+ return ret;
+ },
+
+ grep: function( elems, callback, inv ) {
+ var ret = [];
+
+ // Go through the array, only saving the items
+ // that pass the validator function
+ for ( var i = 0, length = elems.length; i < length; i++ )
+ if ( !inv != !callback( elems[ i ], i ) )
+ ret.push( elems[ i ] );
+
+ return ret;
+ },
+
+ map: function( elems, callback ) {
+ var ret = [];
+
+ // Go through the array, translating each of the items to their
+ // new value (or values).
+ for ( var i = 0, length = elems.length; i < length; i++ ) {
+ var value = callback( elems[ i ], i );
+
+ if ( value != null )
+ ret[ ret.length ] = value;
+ }
+
+ return ret.concat.apply( [], ret );
+ }
+});
+
+// Use of jQuery.browser is deprecated.
+// It's included for backwards compatibility and plugins,
+// although they should work to migrate away.
+
+var userAgent = navigator.userAgent.toLowerCase();
+
+// Figure out what browser is being used
+jQuery.browser = {
+ version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
+ safari: /webkit/.test( userAgent ),
+ opera: /opera/.test( userAgent ),
+ msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
+ mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
+};
+
+jQuery.each({
+ parent: function(elem){return elem.parentNode;},
+ parents: function(elem){return jQuery.dir(elem,"parentNode");},
+ next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
+ prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
+ nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
+ prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
+ siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
+ children: function(elem){return jQuery.sibling(elem.firstChild);},
+ contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
+}, function(name, fn){
+ jQuery.fn[ name ] = function( selector ) {
+ var ret = jQuery.map( this, fn );
+
+ if ( selector && typeof selector == "string" )
+ ret = jQuery.multiFilter( selector, ret );
+
+ return this.pushStack( jQuery.unique( ret ), name, selector );
+ };
+});
+
+jQuery.each({
+ appendTo: "append",
+ prependTo: "prepend",
+ insertBefore: "before",
+ insertAfter: "after",
+ replaceAll: "replaceWith"
+}, function(name, original){
+ jQuery.fn[ name ] = function( selector ) {
+ var ret = [], insert = jQuery( selector );
+
+ for ( var i = 0, l = insert.length; i < l; i++ ) {
+ var elems = (i > 0 ? this.clone(true) : this).get();
+ jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+ ret = ret.concat( elems );
+ }
+
+ return this.pushStack( ret, name, selector );
+ };
+});
+
+jQuery.each({
+ removeAttr: function( name ) {
+ jQuery.attr( this, name, "" );
+ if (this.nodeType == 1)
+ this.removeAttribute( name );
+ },
+
+ addClass: function( classNames ) {
+ jQuery.className.add( this, classNames );
+ },
+
+ removeClass: function( classNames ) {
+ jQuery.className.remove( this, classNames );
+ },
+
+ toggleClass: function( classNames, state ) {
+ if( typeof state !== "boolean" )
+ state = !jQuery.className.has( this, classNames );
+ jQuery.className[ state ? "add" : "remove" ]( this, classNames );
+ },
+
+ remove: function( selector ) {
+ if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
+ // Prevent memory leaks
+ jQuery( "*", this ).add([this]).each(function(){
+ jQuery.event.remove(this);
+ jQuery.removeData(this);
+ });
+ if (this.parentNode)
+ this.parentNode.removeChild( this );
+ }
+ },
+
+ empty: function() {
+ // Remove element nodes and prevent memory leaks
+ jQuery(this).children().remove();
+
+ // Remove any remaining nodes
+ while ( this.firstChild )
+ this.removeChild( this.firstChild );
+ }
+}, function(name, fn){
+ jQuery.fn[ name ] = function(){
+ return this.each( fn, arguments );
+ };
+});
+
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+ return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}
+var expando = "jQuery" + now(), uuid = 0, windowData = {};
+
+jQuery.extend({
+ cache: {},
+
+ data: function( elem, name, data ) {
+ elem = elem == window ?
+ windowData :
+ elem;
+
+ var id = elem[ expando ];
+
+ // Compute a unique ID for the element
+ if ( !id )
+ id = elem[ expando ] = ++uuid;
+
+ // Only generate the data cache if we're
+ // trying to access or manipulate it
+ if ( name && !jQuery.cache[ id ] )
+ jQuery.cache[ id ] = {};
+
+ // Prevent overriding the named cache with undefined values
+ if ( data !== undefined )
+ jQuery.cache[ id ][ name ] = data;
+
+ // Return the named cache data, or the ID for the element
+ return name ?
+ jQuery.cache[ id ][ name ] :
+ id;
+ },
+
+ removeData: function( elem, name ) {
+ elem = elem == window ?
+ windowData :
+ elem;
+
+ var id = elem[ expando ];
+
+ // If we want to remove a specific section of the element's data
+ if ( name ) {
+ if ( jQuery.cache[ id ] ) {
+ // Remove the section of cache data
+ delete jQuery.cache[ id ][ name ];
+
+ // If we've removed all the data, remove the element's cache
+ name = "";
+
+ for ( name in jQuery.cache[ id ] )
+ break;
+
+ if ( !name )
+ jQuery.removeData( elem );
+ }
+
+ // Otherwise, we want to remove all of the element's data
+ } else {
+ // Clean up the element expando
+ try {
+ delete elem[ expando ];
+ } catch(e){
+ // IE has trouble directly removing the expando
+ // but it's ok with using removeAttribute
+ if ( elem.removeAttribute )
+ elem.removeAttribute( expando );
+ }
+
+ // Completely remove the data cache
+ delete jQuery.cache[ id ];
+ }
+ },
+ queue: function( elem, type, data ) {
+ if ( elem ){
+
+ type = (type || "fx") + "queue";
+
+ var q = jQuery.data( elem, type );
+
+ if ( !q || jQuery.isArray(data) )
+ q = jQuery.data( elem, type, jQuery.makeArray(data) );
+ else if( data )
+ q.push( data );
+
+ }
+ return q;
+ },
+
+ dequeue: function( elem, type ){
+ var queue = jQuery.queue( elem, type ),
+ fn = queue.shift();
+
+ if( !type || type === "fx" )
+ fn = queue[0];
+
+ if( fn !== undefined )
+ fn.call(elem);
+ }
+});
+
+jQuery.fn.extend({
+ data: function( key, value ){
+ var parts = key.split(".");
+ parts[1] = parts[1] ? "." + parts[1] : "";
+
+ if ( value === undefined ) {
+ var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+ if ( data === undefined && this.length )
+ data = jQuery.data( this[0], key );
+
+ return data === undefined && parts[1] ?
+ this.data( parts[0] ) :
+ data;
+ } else
+ return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+ jQuery.data( this, key, value );
+ });
+ },
+
+ removeData: function( key ){
+ return this.each(function(){
+ jQuery.removeData( this, key );
+ });
+ },
+ queue: function(type, data){
+ if ( typeof type !== "string" ) {
+ data = type;
+ type = "fx";
+ }
+
+ if ( data === undefined )
+ return jQuery.queue( this[0], type );
+
+ return this.each(function(){
+ var queue = jQuery.queue( this, type, data );
+
+ if( type == "fx" && queue.length == 1 )
+ queue[0].call(this);
+ });
+ },
+ dequeue: function(type){
+ return this.each(function(){
+ jQuery.dequeue( this, type );
+ });
+ }
+});/*!
+ * Sizzle CSS Selector Engine - v0.9.3
+ * Copyright 2009, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ * More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,
+ done = 0,
+ toString = Object.prototype.toString;
+
+var Sizzle = function(selector, context, results, seed) {
+ results = results || [];
+ context = context || document;
+
+ if ( context.nodeType !== 1 && context.nodeType !== 9 )
+ return [];
+
+ if ( !selector || typeof selector !== "string" ) {
+ return results;
+ }
+
+ var parts = [], m, set, checkSet, check, mode, extra, prune = true;
+
+ // Reset the position of the chunker regexp (start from head)
+ chunker.lastIndex = 0;
+
+ while ( (m = chunker.exec(selector)) !== null ) {
+ parts.push( m[1] );
+
+ if ( m[2] ) {
+ extra = RegExp.rightContext;
+ break;
+ }
+ }
+
+ if ( parts.length > 1 && origPOS.exec( selector ) ) {
+ if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+ set = posProcess( parts[0] + parts[1], context );
+ } else {
+ set = Expr.relative[ parts[0] ] ?
+ [ context ] :
+ Sizzle( parts.shift(), context );
+
+ while ( parts.length ) {
+ selector = parts.shift();
+
+ if ( Expr.relative[ selector ] )
+ selector += parts.shift();
+
+ set = posProcess( selector, set );
+ }
+ }
+ } else {
+ var ret = seed ?
+ { expr: parts.pop(), set: makeArray(seed) } :
+ Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, isXML(context) );
+ set = Sizzle.filter( ret.expr, ret.set );
+
+ if ( parts.length > 0 ) {
+ checkSet = makeArray(set);
+ } else {
+ prune = false;
+ }
+
+ while ( parts.length ) {
+ var cur = parts.pop(), pop = cur;
+
+ if ( !Expr.relative[ cur ] ) {
+ cur = "";
+ } else {
+ pop = parts.pop();
+ }
+
+ if ( pop == null ) {
+ pop = context;
+ }
+
+ Expr.relative[ cur ]( checkSet, pop, isXML(context) );
+ }
+ }
+
+ if ( !checkSet ) {
+ checkSet = set;
+ }
+
+ if ( !checkSet ) {
+ throw "Syntax error, unrecognized expression: " + (cur || selector);
+ }
+
+ if ( toString.call(checkSet) === "[object Array]" ) {
+ if ( !prune ) {
+ results.push.apply( results, checkSet );
+ } else if ( context.nodeType === 1 ) {
+ for ( var i = 0; checkSet[i] != null; i++ ) {
+ if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+ results.push( set[i] );
+ }
+ }
+ } else {
+ for ( var i = 0; checkSet[i] != null; i++ ) {
+ if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+ results.push( set[i] );
+ }
+ }
+ }
+ } else {
+ makeArray( checkSet, results );
+ }
+
+ if ( extra ) {
+ Sizzle( extra, context, results, seed );
+
+ if ( sortOrder ) {
+ hasDuplicate = false;
+ results.sort(sortOrder);
+
+ if ( hasDuplicate ) {
+ for ( var i = 1; i < results.length; i++ ) {
+ if ( results[i] === results[i-1] ) {
+ results.splice(i--, 1);
+ }
+ }
+ }
+ }
+ }
+
+ return results;
+};
+
+Sizzle.matches = function(expr, set){
+ return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+ var set, match;
+
+ if ( !expr ) {
+ return [];
+ }
+
+ for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+ var type = Expr.order[i], match;
+
+ if ( (match = Expr.match[ type ].exec( expr )) ) {
+ var left = RegExp.leftContext;
+
+ if ( left.substr( left.length - 1 ) !== "\\" ) {
+ match[1] = (match[1] || "").replace(/\\/g, "");
+ set = Expr.find[ type ]( match, context, isXML );
+ if ( set != null ) {
+ expr = expr.replace( Expr.match[ type ], "" );
+ break;
+ }
+ }
+ }
+ }
+
+ if ( !set ) {
+ set = context.getElementsByTagName("*");
+ }
+
+ return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+ var old = expr, result = [], curLoop = set, match, anyFound,
+ isXMLFilter = set && set[0] && isXML(set[0]);
+
+ while ( expr && set.length ) {
+ for ( var type in Expr.filter ) {
+ if ( (match = Expr.match[ type ].exec( expr )) != null ) {
+ var filter = Expr.filter[ type ], found, item;
+ anyFound = false;
+
+ if ( curLoop == result ) {
+ result = [];
+ }
+
+ if ( Expr.preFilter[ type ] ) {
+ match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+ if ( !match ) {
+ anyFound = found = true;
+ } else if ( match === true ) {
+ continue;
+ }
+ }
+
+ if ( match ) {
+ for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+ if ( item ) {
+ found = filter( item, match, i, curLoop );
+ var pass = not ^ !!found;
+
+ if ( inplace && found != null ) {
+ if ( pass ) {
+ anyFound = true;
+ } else {
+ curLoop[i] = false;
+ }
+ } else if ( pass ) {
+ result.push( item );
+ anyFound = true;
+ }
+ }
+ }
+ }
+
+ if ( found !== undefined ) {
+ if ( !inplace ) {
+ curLoop = result;
+ }
+
+ expr = expr.replace( Expr.match[ type ], "" );
+
+ if ( !anyFound ) {
+ return [];
+ }
+
+ break;
+ }
+ }
+ }
+
+ // Improper expression
+ if ( expr == old ) {
+ if ( anyFound == null ) {
+ throw "Syntax error, unrecognized expression: " + expr;
+ } else {
+ break;
+ }
+ }
+
+ old = expr;
+ }
+
+ return curLoop;
+};
+
+var Expr = Sizzle.selectors = {
+ order: [ "ID", "NAME", "TAG" ],
+ match: {
+ ID: /#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+ CLASS: /\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+ NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,
+ ATTR: /\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+ TAG: /^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,
+ CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+ POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+ PSEUDO: /:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
+ },
+ attrMap: {
+ "class": "className",
+ "for": "htmlFor"
+ },
+ attrHandle: {
+ href: function(elem){
+ return elem.getAttribute("href");
+ }
+ },
+ relative: {
+ "+": function(checkSet, part, isXML){
+ var isPartStr = typeof part === "string",
+ isTag = isPartStr && !/\W/.test(part),
+ isPartStrNotTag = isPartStr && !isTag;
+
+ if ( isTag && !isXML ) {
+ part = part.toUpperCase();
+ }
+
+ for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+ if ( (elem = checkSet[i]) ) {
+ while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+ checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ?
+ elem || false :
+ elem === part;
+ }
+ }
+
+ if ( isPartStrNotTag ) {
+ Sizzle.filter( part, checkSet, true );
+ }
+ },
+ ">": function(checkSet, part, isXML){
+ var isPartStr = typeof part === "string";
+
+ if ( isPartStr && !/\W/.test(part) ) {
+ part = isXML ? part : part.toUpperCase();
+
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ var parent = elem.parentNode;
+ checkSet[i] = parent.nodeName === part ? parent : false;
+ }
+ }
+ } else {
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ checkSet[i] = isPartStr ?
+ elem.parentNode :
+ elem.parentNode === part;
+ }
+ }
+
+ if ( isPartStr ) {
+ Sizzle.filter( part, checkSet, true );
+ }
+ }
+ },
+ "": function(checkSet, part, isXML){
+ var doneName = done++, checkFn = dirCheck;
+
+ if ( !part.match(/\W/) ) {
+ var nodeCheck = part = isXML ? part : part.toUpperCase();
+ checkFn = dirNodeCheck;
+ }
+
+ checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+ },
+ "~": function(checkSet, part, isXML){
+ var doneName = done++, checkFn = dirCheck;
+
+ if ( typeof part === "string" && !part.match(/\W/) ) {
+ var nodeCheck = part = isXML ? part : part.toUpperCase();
+ checkFn = dirNodeCheck;
+ }
+
+ checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+ }
+ },
+ find: {
+ ID: function(match, context, isXML){
+ if ( typeof context.getElementById !== "undefined" && !isXML ) {
+ var m = context.getElementById(match[1]);
+ return m ? [m] : [];
+ }
+ },
+ NAME: function(match, context, isXML){
+ if ( typeof context.getElementsByName !== "undefined" ) {
+ var ret = [], results = context.getElementsByName(match[1]);
+
+ for ( var i = 0, l = results.length; i < l; i++ ) {
+ if ( results[i].getAttribute("name") === match[1] ) {
+ ret.push( results[i] );
+ }
+ }
+
+ return ret.length === 0 ? null : ret;
+ }
+ },
+ TAG: function(match, context){
+ return context.getElementsByTagName(match[1]);
+ }
+ },
+ preFilter: {
+ CLASS: function(match, curLoop, inplace, result, not, isXML){
+ match = " " + match[1].replace(/\\/g, "") + " ";
+
+ if ( isXML ) {
+ return match;
+ }
+
+ for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+ if ( elem ) {
+ if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {
+ if ( !inplace )
+ result.push( elem );
+ } else if ( inplace ) {
+ curLoop[i] = false;
+ }
+ }
+ }
+
+ return false;
+ },
+ ID: function(match){
+ return match[1].replace(/\\/g, "");
+ },
+ TAG: function(match, curLoop){
+ for ( var i = 0; curLoop[i] === false; i++ ){}
+ return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
+ },
+ CHILD: function(match){
+ if ( match[1] == "nth" ) {
+ // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+ var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+ match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||
+ !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+ // calculate the numbers (first)n+(last) including if they are negative
+ match[2] = (test[1] + (test[2] || 1)) - 0;
+ match[3] = test[3] - 0;
+ }
+
+ // TODO: Move to normal caching system
+ match[0] = done++;
+
+ return match;
+ },
+ ATTR: function(match, curLoop, inplace, result, not, isXML){
+ var name = match[1].replace(/\\/g, "");
+
+ if ( !isXML && Expr.attrMap[name] ) {
+ match[1] = Expr.attrMap[name];
+ }
+
+ if ( match[2] === "~=" ) {
+ match[4] = " " + match[4] + " ";
+ }
+
+ return match;
+ },
+ PSEUDO: function(match, curLoop, inplace, result, not){
+ if ( match[1] === "not" ) {
+ // If we're dealing with a complex expression, or a simple one
+ if ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) {
+ match[3] = Sizzle(match[3], null, null, curLoop);
+ } else {
+ var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+ if ( !inplace ) {
+ result.push.apply( result, ret );
+ }
+ return false;
+ }
+ } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+ return true;
+ }
+
+ return match;
+ },
+ POS: function(match){
+ match.unshift( true );
+ return match;
+ }
+ },
+ filters: {
+ enabled: function(elem){
+ return elem.disabled === false && elem.type !== "hidden";
+ },
+ disabled: function(elem){
+ return elem.disabled === true;
+ },
+ checked: function(elem){
+ return elem.checked === true;
+ },
+ selected: function(elem){
+ // Accessing this property makes selected-by-default
+ // options in Safari work properly
+ elem.parentNode.selectedIndex;
+ return elem.selected === true;
+ },
+ parent: function(elem){
+ return !!elem.firstChild;
+ },
+ empty: function(elem){
+ return !elem.firstChild;
+ },
+ has: function(elem, i, match){
+ return !!Sizzle( match[3], elem ).length;
+ },
+ header: function(elem){
+ return /h\d/i.test( elem.nodeName );
+ },
+ text: function(elem){
+ return "text" === elem.type;
+ },
+ radio: function(elem){
+ return "radio" === elem.type;
+ },
+ checkbox: function(elem){
+ return "checkbox" === elem.type;
+ },
+ file: function(elem){
+ return "file" === elem.type;
+ },
+ password: function(elem){
+ return "password" === elem.type;
+ },
+ submit: function(elem){
+ return "submit" === elem.type;
+ },
+ image: function(elem){
+ return "image" === elem.type;
+ },
+ reset: function(elem){
+ return "reset" === elem.type;
+ },
+ button: function(elem){
+ return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";
+ },
+ input: function(elem){
+ return /input|select|textarea|button/i.test(elem.nodeName);
+ }
+ },
+ setFilters: {
+ first: function(elem, i){
+ return i === 0;
+ },
+ last: function(elem, i, match, array){
+ return i === array.length - 1;
+ },
+ even: function(elem, i){
+ return i % 2 === 0;
+ },
+ odd: function(elem, i){
+ return i % 2 === 1;
+ },
+ lt: function(elem, i, match){
+ return i < match[3] - 0;
+ },
+ gt: function(elem, i, match){
+ return i > match[3] - 0;
+ },
+ nth: function(elem, i, match){
+ return match[3] - 0 == i;
+ },
+ eq: function(elem, i, match){
+ return match[3] - 0 == i;
+ }
+ },
+ filter: {
+ PSEUDO: function(elem, match, i, array){
+ var name = match[1], filter = Expr.filters[ name ];
+
+ if ( filter ) {
+ return filter( elem, i, match, array );
+ } else if ( name === "contains" ) {
+ return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;
+ } else if ( name === "not" ) {
+ var not = match[3];
+
+ for ( var i = 0, l = not.length; i < l; i++ ) {
+ if ( not[i] === elem ) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+ },
+ CHILD: function(elem, match){
+ var type = match[1], node = elem;
+ switch (type) {
+ case 'only':
+ case 'first':
+ while (node = node.previousSibling) {
+ if ( node.nodeType === 1 ) return false;
+ }
+ if ( type == 'first') return true;
+ node = elem;
+ case 'last':
+ while (node = node.nextSibling) {
+ if ( node.nodeType === 1 ) return false;
+ }
+ return true;
+ case 'nth':
+ var first = match[2], last = match[3];
+
+ if ( first == 1 && last == 0 ) {
+ return true;
+ }
+
+ var doneName = match[0],
+ parent = elem.parentNode;
+
+ if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+ var count = 0;
+ for ( node = parent.firstChild; node; node = node.nextSibling ) {
+ if ( node.nodeType === 1 ) {
+ node.nodeIndex = ++count;
+ }
+ }
+ parent.sizcache = doneName;
+ }
+
+ var diff = elem.nodeIndex - last;
+ if ( first == 0 ) {
+ return diff == 0;
+ } else {
+ return ( diff % first == 0 && diff / first >= 0 );
+ }
+ }
+ },
+ ID: function(elem, match){
+ return elem.nodeType === 1 && elem.getAttribute("id") === match;
+ },
+ TAG: function(elem, match){
+ return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;
+ },
+ CLASS: function(elem, match){
+ return (" " + (elem.className || elem.getAttribute("class")) + " ")
+ .indexOf( match ) > -1;
+ },
+ ATTR: function(elem, match){
+ var name = match[1],
+ result = Expr.attrHandle[ name ] ?
+ Expr.attrHandle[ name ]( elem ) :
+ elem[ name ] != null ?
+ elem[ name ] :
+ elem.getAttribute( name ),
+ value = result + "",
+ type = match[2],
+ check = match[4];
+
+ return result == null ?
+ type === "!=" :
+ type === "=" ?
+ value === check :
+ type === "*=" ?
+ value.indexOf(check) >= 0 :
+ type === "~=" ?
+ (" " + value + " ").indexOf(check) >= 0 :
+ !check ?
+ value && result !== false :
+ type === "!=" ?
+ value != check :
+ type === "^=" ?
+ value.indexOf(check) === 0 :
+ type === "$=" ?
+ value.substr(value.length - check.length) === check :
+ type === "|=" ?
+ value === check || value.substr(0, check.length + 1) === check + "-" :
+ false;
+ },
+ POS: function(elem, match, i, array){
+ var name = match[2], filter = Expr.setFilters[ name ];
+
+ if ( filter ) {
+ return filter( elem, i, match, array );
+ }
+ }
+ }
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+ Expr.match[ type ] = RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+}
+
+var makeArray = function(array, results) {
+ array = Array.prototype.slice.call( array );
+
+ if ( results ) {
+ results.push.apply( results, array );
+ return results;
+ }
+
+ return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+try {
+ Array.prototype.slice.call( document.documentElement.childNodes );
+
+// Provide a fallback method if it does not work
+} catch(e){
+ makeArray = function(array, results) {
+ var ret = results || [];
+
+ if ( toString.call(array) === "[object Array]" ) {
+ Array.prototype.push.apply( ret, array );
+ } else {
+ if ( typeof array.length === "number" ) {
+ for ( var i = 0, l = array.length; i < l; i++ ) {
+ ret.push( array[i] );
+ }
+ } else {
+ for ( var i = 0; array[i]; i++ ) {
+ ret.push( array[i] );
+ }
+ }
+ }
+
+ return ret;
+ };
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+ sortOrder = function( a, b ) {
+ var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+ if ( ret === 0 ) {
+ hasDuplicate = true;
+ }
+ return ret;
+ };
+} else if ( "sourceIndex" in document.documentElement ) {
+ sortOrder = function( a, b ) {
+ var ret = a.sourceIndex - b.sourceIndex;
+ if ( ret === 0 ) {
+ hasDuplicate = true;
+ }
+ return ret;
+ };
+} else if ( document.createRange ) {
+ sortOrder = function( a, b ) {
+ var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+ aRange.selectNode(a);
+ aRange.collapse(true);
+ bRange.selectNode(b);
+ bRange.collapse(true);
+ var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+ if ( ret === 0 ) {
+ hasDuplicate = true;
+ }
+ return ret;
+ };
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+ // We're going to inject a fake input element with a specified name
+ var form = document.createElement("form"),
+ id = "script" + (new Date).getTime();
+ form.innerHTML = "<input name='" + id + "'/>";
+
+ // Inject it into the root element, check its status, and remove it quickly
+ var root = document.documentElement;
+ root.insertBefore( form, root.firstChild );
+
+ // The workaround has to do additional checks after a getElementById
+ // Which slows things down for other browsers (hence the branching)
+ if ( !!document.getElementById( id ) ) {
+ Expr.find.ID = function(match, context, isXML){
+ if ( typeof context.getElementById !== "undefined" && !isXML ) {
+ var m = context.getElementById(match[1]);
+ return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+ }
+ };
+
+ Expr.filter.ID = function(elem, match){
+ var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+ return elem.nodeType === 1 && node && node.nodeValue === match;
+ };
+ }
+
+ root.removeChild( form );
+})();
+
+(function(){
+ // Check to see if the browser returns only elements
+ // when doing getElementsByTagName("*")
+
+ // Create a fake element
+ var div = document.createElement("div");
+ div.appendChild( document.createComment("") );
+
+ // Make sure no comments are found
+ if ( div.getElementsByTagName("*").length > 0 ) {
+ Expr.find.TAG = function(match, context){
+ var results = context.getElementsByTagName(match[1]);
+
+ // Filter out possible comments
+ if ( match[1] === "*" ) {
+ var tmp = [];
+
+ for ( var i = 0; results[i]; i++ ) {
+ if ( results[i].nodeType === 1 ) {
+ tmp.push( results[i] );
+ }
+ }
+
+ results = tmp;
+ }
+
+ return results;
+ };
+ }
+
+ // Check to see if an attribute returns normalized href attributes
+ div.innerHTML = "<a href='#'></a>";
+ if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+ div.firstChild.getAttribute("href") !== "#" ) {
+ Expr.attrHandle.href = function(elem){
+ return elem.getAttribute("href", 2);
+ };
+ }
+})();
+
+if ( document.querySelectorAll ) (function(){
+ var oldSizzle = Sizzle, div = document.createElement("div");
+ div.innerHTML = "<p class='TEST'></p>";
+
+ // Safari can't handle uppercase or unicode characters when
+ // in quirks mode.
+ if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+ return;
+ }
+
+ Sizzle = function(query, context, extra, seed){
+ context = context || document;
+
+ // Only use querySelectorAll on non-XML documents
+ // (ID selectors don't work in non-HTML documents)
+ if ( !seed && context.nodeType === 9 && !isXML(context) ) {
+ try {
+ return makeArray( context.querySelectorAll(query), extra );
+ } catch(e){}
+ }
+
+ return oldSizzle(query, context, extra, seed);
+ };
+
+ Sizzle.find = oldSizzle.find;
+ Sizzle.filter = oldSizzle.filter;
+ Sizzle.selectors = oldSizzle.selectors;
+ Sizzle.matches = oldSizzle.matches;
+})();
+
+if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){
+ var div = document.createElement("div");
+ div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+ // Opera can't find a second classname (in 9.6)
+ if ( div.getElementsByClassName("e").length === 0 )
+ return;
+
+ // Safari caches class attributes, doesn't catch changes (in 3.2)
+ div.lastChild.className = "e";
+
+ if ( div.getElementsByClassName("e").length === 1 )
+ return;
+
+ Expr.order.splice(1, 0, "CLASS");
+ Expr.find.CLASS = function(match, context, isXML) {
+ if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+ return context.getElementsByClassName(match[1]);
+ }
+ };
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+ var sibDir = dir == "previousSibling" && !isXML;
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ if ( sibDir && elem.nodeType === 1 ){
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+ elem = elem[dir];
+ var match = false;
+
+ while ( elem ) {
+ if ( elem.sizcache === doneName ) {
+ match = checkSet[elem.sizset];
+ break;
+ }
+
+ if ( elem.nodeType === 1 && !isXML ){
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+
+ if ( elem.nodeName === cur ) {
+ match = elem;
+ break;
+ }
+
+ elem = elem[dir];
+ }
+
+ checkSet[i] = match;
+ }
+ }
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+ var sibDir = dir == "previousSibling" && !isXML;
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ if ( sibDir && elem.nodeType === 1 ) {
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+ elem = elem[dir];
+ var match = false;
+
+ while ( elem ) {
+ if ( elem.sizcache === doneName ) {
+ match = checkSet[elem.sizset];
+ break;
+ }
+
+ if ( elem.nodeType === 1 ) {
+ if ( !isXML ) {
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+ if ( typeof cur !== "string" ) {
+ if ( elem === cur ) {
+ match = true;
+ break;
+ }
+
+ } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+ match = elem;
+ break;
+ }
+ }
+
+ elem = elem[dir];
+ }
+
+ checkSet[i] = match;
+ }
+ }
+}
+
+var contains = document.compareDocumentPosition ? function(a, b){
+ return a.compareDocumentPosition(b) & 16;
+} : function(a, b){
+ return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+ return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+ !!elem.ownerDocument && isXML( elem.ownerDocument );
+};
+
+var posProcess = function(selector, context){
+ var tmpSet = [], later = "", match,
+ root = context.nodeType ? [context] : context;
+
+ // Position selectors must be done after the filter
+ // And so must :not(positional) so we move all PSEUDOs to the end
+ while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+ later += match[0];
+ selector = selector.replace( Expr.match.PSEUDO, "" );
+ }
+
+ selector = Expr.relative[selector] ? selector + "*" : selector;
+
+ for ( var i = 0, l = root.length; i < l; i++ ) {
+ Sizzle( selector, root[i], tmpSet );
+ }
+
+ return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.filter = Sizzle.filter;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+
+Sizzle.selectors.filters.hidden = function(elem){
+ return elem.offsetWidth === 0 || elem.offsetHeight === 0;
+};
+
+Sizzle.selectors.filters.visible = function(elem){
+ return elem.offsetWidth > 0 || elem.offsetHeight > 0;
+};
+
+Sizzle.selectors.filters.animated = function(elem){
+ return jQuery.grep(jQuery.timers, function(fn){
+ return elem === fn.elem;
+ }).length;
+};
+
+jQuery.multiFilter = function( expr, elems, not ) {
+ if ( not ) {
+ expr = ":not(" + expr + ")";
+ }
+
+ return Sizzle.matches(expr, elems);
+};
+
+jQuery.dir = function( elem, dir ){
+ var matched = [], cur = elem[dir];
+ while ( cur && cur != document ) {
+ if ( cur.nodeType == 1 )
+ matched.push( cur );
+ cur = cur[dir];
+ }
+ return matched;
+};
+
+jQuery.nth = function(cur, result, dir, elem){
+ result = result || 1;
+ var num = 0;
+
+ for ( ; cur; cur = cur[dir] )
+ if ( cur.nodeType == 1 && ++num == result )
+ break;
+
+ return cur;
+};
+
+jQuery.sibling = function(n, elem){
+ var r = [];
+
+ for ( ; n; n = n.nextSibling ) {
+ if ( n.nodeType == 1 && n != elem )
+ r.push( n );
+ }
+
+ return r;
+};
+
+return;
+
+window.Sizzle = Sizzle;
+
+})();
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+ // Bind an event to an element
+ // Original by Dean Edwards
+ add: function(elem, types, handler, data) {
+ if ( elem.nodeType == 3 || elem.nodeType == 8 )
+ return;
+
+ // For whatever reason, IE has trouble passing the window object
+ // around, causing it to be cloned in the process
+ if ( elem.setInterval && elem != window )
+ elem = window;
+
+ // Make sure that the function being executed has a unique ID
+ if ( !handler.guid )
+ handler.guid = this.guid++;
+
+ // if data is passed, bind to handler
+ if ( data !== undefined ) {
+ // Create temporary function pointer to original handler
+ var fn = handler;
+
+ // Create unique handler function, wrapped around original handler
+ handler = this.proxy( fn );
+
+ // Store data in unique handler
+ handler.data = data;
+ }
+
+ // Init the element's event structure
+ var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
+ handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
+ // Handle the second event of a trigger and when
+ // an event is called after a page has unloaded
+ return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+ jQuery.event.handle.apply(arguments.callee.elem, arguments) :
+ undefined;
+ });
+ // Add elem as a property of the handle function
+ // This is to prevent a memory leak with non-native
+ // event in IE.
+ handle.elem = elem;
+
+ // Handle multiple events separated by a space
+ // jQuery(...).bind("mouseover mouseout", fn);
+ jQuery.each(types.split(/\s+/), function(index, type) {
+ // Namespaced event handlers
+ var namespaces = type.split(".");
+ type = namespaces.shift();
+ handler.type = namespaces.slice().sort().join(".");
+
+ // Get the current list of functions bound to this event
+ var handlers = events[type];
+
+ if ( jQuery.event.specialAll[type] )
+ jQuery.event.specialAll[type].setup.call(elem, data, namespaces);
+
+ // Init the event handler queue
+ if (!handlers) {
+ handlers = events[type] = {};
+
+ // Check for a special event handler
+ // Only use addEventListener/attachEvent if the special
+ // events handler returns false
+ if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem, data, namespaces) === false ) {
+ // Bind the global event handler to the element
+ if (elem.addEventListener)
+ elem.addEventListener(type, handle, false);
+ else if (elem.attachEvent)
+ elem.attachEvent("on" + type, handle);
+ }
+ }
+
+ // Add the function to the element's handler list
+ handlers[handler.guid] = handler;
+
+ // Keep track of which events have been used, for global triggering
+ jQuery.event.global[type] = true;
+ });
+
+ // Nullify elem to prevent memory leaks in IE
+ elem = null;
+ },
+
+ guid: 1,
+ global: {},
+
+ // Detach an event or set of events from an element
+ remove: function(elem, types, handler) {
+ // don't do events on text and comment nodes
+ if ( elem.nodeType == 3 || elem.nodeType == 8 )
+ return;
+
+ var events = jQuery.data(elem, "events"), ret, index;
+
+ if ( events ) {
+ // Unbind all events for the element
+ if ( types === undefined || (typeof types === "string" && types.charAt(0) == ".") )
+ for ( var type in events )
+ this.remove( elem, type + (types || "") );
+ else {
+ // types is actually an event object here
+ if ( types.type ) {
+ handler = types.handler;
+ types = types.type;
+ }
+
+ // Handle multiple events seperated by a space
+ // jQuery(...).unbind("mouseover mouseout", fn);
+ jQuery.each(types.split(/\s+/), function(index, type){
+ // Namespaced event handlers
+ var namespaces = type.split(".");
+ type = namespaces.shift();
+ var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
+
+ if ( events[type] ) {
+ // remove the given handler for the given type
+ if ( handler )
+ delete events[type][handler.guid];
+
+ // remove all handlers for the given type
+ else
+ for ( var handle in events[type] )
+ // Handle the removal of namespaced events
+ if ( namespace.test(events[type][handle].type) )
+ delete events[type][handle];
+
+ if ( jQuery.event.specialAll[type] )
+ jQuery.event.specialAll[type].teardown.call(elem, namespaces);
+
+ // remove generic event handler if no more handlers exist
+ for ( ret in events[type] ) break;
+ if ( !ret ) {
+ if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem, namespaces) === false ) {
+ if (elem.removeEventListener)
+ elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
+ else if (elem.detachEvent)
+ elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
+ }
+ ret = null;
+ delete events[type];
+ }
+ }
+ });
+ }
+
+ // Remove the expando if it's no longer used
+ for ( ret in events ) break;
+ if ( !ret ) {
+ var handle = jQuery.data( elem, "handle" );
+ if ( handle ) handle.elem = null;
+ jQuery.removeData( elem, "events" );
+ jQuery.removeData( elem, "handle" );
+ }
+ }
+ },
+
+ // bubbling is internal
+ trigger: function( event, data, elem, bubbling ) {
+ // Event object or event type
+ var type = event.type || event;
+
+ if( !bubbling ){
+ event = typeof event === "object" ?
+ // jQuery.Event object
+ event[expando] ? event :
+ // Object literal
+ jQuery.extend( jQuery.Event(type), event ) :
+ // Just the event type (string)
+ jQuery.Event(type);
+
+ if ( type.indexOf("!") >= 0 ) {
+ event.type = type = type.slice(0, -1);
+ event.exclusive = true;
+ }
+
+ // Handle a global trigger
+ if ( !elem ) {
+ // Don't bubble custom events when global (to avoid too much overhead)
+ event.stopPropagation();
+ // Only trigger if we've ever bound an event for it
+ if ( this.global[type] )
+ jQuery.each( jQuery.cache, function(){
+ if ( this.events && this.events[type] )
+ jQuery.event.trigger( event, data, this.handle.elem );
+ });
+ }
+
+ // Handle triggering a single element
+
+ // don't do events on text and comment nodes
+ if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 )
+ return undefined;
+
+ // Clean up in case it is reused
+ event.result = undefined;
+ event.target = elem;
+
+ // Clone the incoming data, if any
+ data = jQuery.makeArray(data);
+ data.unshift( event );
+ }
+
+ event.currentTarget = elem;
+
+ // Trigger the event, it is assumed that "handle" is a function
+ var handle = jQuery.data(elem, "handle");
+ if ( handle )
+ handle.apply( elem, data );
+
+ // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+ if ( (!elem[type] || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+ event.result = false;
+
+ // Trigger the native events (except for clicks on links)
+ if ( !bubbling && elem[type] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
+ this.triggered = true;
+ try {
+ elem[ type ]();
+ // prevent IE from throwing an error for some hidden elements
+ } catch (e) {}
+ }
+
+ this.triggered = false;
+
+ if ( !event.isPropagationStopped() ) {
+ var parent = elem.parentNode || elem.ownerDocument;
+ if ( parent )
+ jQuery.event.trigger(event, data, parent, true);
+ }
+ },
+
+ handle: function(event) {
+ // returned undefined or false
+ var all, handlers;
+
+ event = arguments[0] = jQuery.event.fix( event || window.event );
+ event.currentTarget = this;
+
+ // Namespaced event handlers
+ var namespaces = event.type.split(".");
+ event.type = namespaces.shift();
+
+ // Cache this now, all = true means, any handler
+ all = !namespaces.length && !event.exclusive;
+
+ var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
+
+ handlers = ( jQuery.data(this, "events") || {} )[event.type];
+
+ for ( var j in handlers ) {
+ var handler = handlers[j];
+
+ // Filter the functions by class
+ if ( all || namespace.test(handler.type) ) {
+ // Pass in a reference to the handler function itself
+ // So that we can later remove it
+ event.handler = handler;
+ event.data = handler.data;
+
+ var ret = handler.apply(this, arguments);
+
+ if( ret !== undefined ){
+ event.result = ret;
+ if ( ret === false ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ }
+
+ if( event.isImmediatePropagationStopped() )
+ break;
+
+ }
+ }
+ },
+
+ props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+ fix: function(event) {
+ if ( event[expando] )
+ return event;
+
+ // store a copy of the original event object
+ // and "clone" to set read-only properties
+ var originalEvent = event;
+ event = jQuery.Event( originalEvent );
+
+ for ( var i = this.props.length, prop; i; ){
+ prop = this.props[ --i ];
+ event[ prop ] = originalEvent[ prop ];
+ }
+
+ // Fix target property, if necessary
+ if ( !event.target )
+ event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+
+ // check if target is a textnode (safari)
+ if ( event.target.nodeType == 3 )
+ event.target = event.target.parentNode;
+
+ // Add relatedTarget, if necessary
+ if ( !event.relatedTarget && event.fromElement )
+ event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
+
+ // Calculate pageX/Y if missing and clientX/Y available
+ if ( event.pageX == null && event.clientX != null ) {
+ var doc = document.documentElement, body = document.body;
+ event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
+ event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
+ }
+
+ // Add which for key events
+ if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
+ event.which = event.charCode || event.keyCode;
+
+ // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+ if ( !event.metaKey && event.ctrlKey )
+ event.metaKey = event.ctrlKey;
+
+ // Add which for click: 1 == left; 2 == middle; 3 == right
+ // Note: button is not normalized, so don't use it
+ if ( !event.which && event.button )
+ event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+
+ return event;
+ },
+
+ proxy: function( fn, proxy ){
+ proxy = proxy || function(){ return fn.apply(this, arguments); };
+ // Set the guid of unique handler to the same of original handler, so it can be removed
+ proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
+ // So proxy can be declared as an argument
+ return proxy;
+ },
+
+ special: {
+ ready: {
+ // Make sure the ready event is setup
+ setup: bindReady,
+ teardown: function() {}
+ }
+ },
+
+ specialAll: {
+ live: {
+ setup: function( selector, namespaces ){
+ jQuery.event.add( this, namespaces[0], liveHandler );
+ },
+ teardown: function( namespaces ){
+ if ( namespaces.length ) {
+ var remove = 0, name = RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)");
+
+ jQuery.each( (jQuery.data(this, "events").live || {}), function(){
+ if ( name.test(this.type) )
+ remove++;
+ });
+
+ if ( remove < 1 )
+ jQuery.event.remove( this, namespaces[0], liveHandler );
+ }
+ }
+ }
+ }
+};
+
+jQuery.Event = function( src ){
+ // Allow instantiation without the 'new' keyword
+ if( !this.preventDefault )
+ return new jQuery.Event(src);
+
+ // Event object
+ if( src && src.type ){
+ this.originalEvent = src;
+ this.type = src.type;
+ // Event type
+ }else
+ this.type = src;
+
+ // timeStamp is buggy for some events on Firefox(#3843)
+ // So we won't rely on the native value
+ this.timeStamp = now();
+
+ // Mark it as fixed
+ this[expando] = true;
+};
+
+function returnFalse(){
+ return false;
+}
+function returnTrue(){
+ return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+ preventDefault: function() {
+ this.isDefaultPrevented = returnTrue;
+
+ var e = this.originalEvent;
+ if( !e )
+ return;
+ // if preventDefault exists run it on the original event
+ if (e.preventDefault)
+ e.preventDefault();
+ // otherwise set the returnValue property of the original event to false (IE)
+ e.returnValue = false;
+ },
+ stopPropagation: function() {
+ this.isPropagationStopped = returnTrue;
+
+ var e = this.originalEvent;
+ if( !e )
+ return;
+ // if stopPropagation exists run it on the original event
+ if (e.stopPropagation)
+ e.stopPropagation();
+ // otherwise set the cancelBubble property of the original event to true (IE)
+ e.cancelBubble = true;
+ },
+ stopImmediatePropagation:function(){
+ this.isImmediatePropagationStopped = returnTrue;
+ this.stopPropagation();
+ },
+ isDefaultPrevented: returnFalse,
+ isPropagationStopped: returnFalse,
+ isImmediatePropagationStopped: returnFalse
+};
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function(event) {
+ // Check if mouse(over|out) are still within the same parent element
+ var parent = event.relatedTarget;
+ // Traverse up the tree
+ while ( parent && parent != this )
+ try { parent = parent.parentNode; }
+ catch(e) { parent = this; }
+
+ if( parent != this ){
+ // set the correct event type
+ event.type = event.data;
+ // handle event if we actually just moused on to a non sub-element
+ jQuery.event.handle.apply( this, arguments );
+ }
+};
+
+jQuery.each({
+ mouseover: 'mouseenter',
+ mouseout: 'mouseleave'
+}, function( orig, fix ){
+ jQuery.event.special[ fix ] = {
+ setup: function(){
+ jQuery.event.add( this, orig, withinElement, fix );
+ },
+ teardown: function(){
+ jQuery.event.remove( this, orig, withinElement );
+ }
+ };
+});
+
+jQuery.fn.extend({
+ bind: function( type, data, fn ) {
+ return type == "unload" ? this.one(type, data, fn) : this.each(function(){
+ jQuery.event.add( this, type, fn || data, fn && data );
+ });
+ },
+
+ one: function( type, data, fn ) {
+ var one = jQuery.event.proxy( fn || data, function(event) {
+ jQuery(this).unbind(event, one);
+ return (fn || data).apply( this, arguments );
+ });
+ return this.each(function(){
+ jQuery.event.add( this, type, one, fn && data);
+ });
+ },
+
+ unbind: function( type, fn ) {
+ return this.each(function(){
+ jQuery.event.remove( this, type, fn );
+ });
+ },
+
+ trigger: function( type, data ) {
+ return this.each(function(){
+ jQuery.event.trigger( type, data, this );
+ });
+ },
+
+ triggerHandler: function( type, data ) {
+ if( this[0] ){
+ var event = jQuery.Event(type);
+ event.preventDefault();
+ event.stopPropagation();
+ jQuery.event.trigger( event, data, this[0] );
+ return event.result;
+ }
+ },
+
+ toggle: function( fn ) {
+ // Save reference to arguments for access in closure
+ var args = arguments, i = 1;
+
+ // link all the functions, so any of them can unbind this click handler
+ while( i < args.length )
+ jQuery.event.proxy( fn, args[i++] );
+
+ return this.click( jQuery.event.proxy( fn, function(event) {
+ // Figure out which function to execute
+ this.lastToggle = ( this.lastToggle || 0 ) % i;
+
+ // Make sure that clicks stop
+ event.preventDefault();
+
+ // and execute the function
+ return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+ }));
+ },
+
+ hover: function(fnOver, fnOut) {
+ return this.mouseenter(fnOver).mouseleave(fnOut);
+ },
+
+ ready: function(fn) {
+ // Attach the listeners
+ bindReady();
+
+ // If the DOM is already ready
+ if ( jQuery.isReady )
+ // Execute the function immediately
+ fn.call( document, jQuery );
+
+ // Otherwise, remember the function for later
+ else
+ // Add the function to the wait list
+ jQuery.readyList.push( fn );
+
+ return this;
+ },
+
+ live: function( type, fn ){
+ var proxy = jQuery.event.proxy( fn );
+ proxy.guid += this.selector + type;
+
+ jQuery(document).bind( liveConvert(type, this.selector), this.selector, proxy );
+
+ return this;
+ },
+
+ die: function( type, fn ){
+ jQuery(document).unbind( liveConvert(type, this.selector), fn ? { guid: fn.guid + this.selector + type } : null );
+ return this;
+ }
+});
+
+function liveHandler( event ){
+ var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"),
+ stop = true,
+ elems = [];
+
+ jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){
+ if ( check.test(fn.type) ) {
+ var elem = jQuery(event.target).closest(fn.data)[0];
+ if ( elem )
+ elems.push({ elem: elem, fn: fn });
+ }
+ });
+
+ elems.sort(function(a,b) {
+ return jQuery.data(a.elem, "closest") - jQuery.data(b.elem, "closest");
+ });
+
+ jQuery.each(elems, function(){
+ if ( this.fn.call(this.elem, event, this.fn.data) === false )
+ return (stop = false);
+ });
+
+ return stop;
+}
+
+function liveConvert(type, selector){
+ return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "|")].join(".");
+}
+
+jQuery.extend({
+ isReady: false,
+ readyList: [],
+ // Handle when the DOM is ready
+ ready: function() {
+ // Make sure that the DOM is not already loaded
+ if ( !jQuery.isReady ) {
+ // Remember that the DOM is ready
+ jQuery.isReady = true;
+
+ // If there are functions bound, to execute
+ if ( jQuery.readyList ) {
+ // Execute all of them
+ jQuery.each( jQuery.readyList, function(){
+ this.call( document, jQuery );
+ });
+
+ // Reset the list of functions
+ jQuery.readyList = null;
+ }
+
+ // Trigger any bound ready events
+ jQuery(document).triggerHandler("ready");
+ }
+ }
+});
+
+var readyBound = false;
+
+function bindReady(){
+ if ( readyBound ) return;
+ readyBound = true;
+
+ // Mozilla, Opera and webkit nightlies currently support this event
+ if ( document.addEventListener ) {
+ // Use the handy event callback
+ document.addEventListener( "DOMContentLoaded", function(){
+ document.removeEventListener( "DOMContentLoaded", arguments.callee, false );
+ jQuery.ready();
+ }, false );
+
+ // If IE event model is used
+ } else if ( document.attachEvent ) {
+ // ensure firing before onload,
+ // maybe late but safe also for iframes
+ document.attachEvent("onreadystatechange", function(){
+ if ( document.readyState === "complete" ) {
+ document.detachEvent( "onreadystatechange", arguments.callee );
+ jQuery.ready();
+ }
+ });
+
+ // If IE and not an iframe
+ // continually check to see if the document is ready
+ if ( document.documentElement.doScroll && window == window.top ) (function(){
+ if ( jQuery.isReady ) return;
+
+ try {
+ // If IE is used, use the trick by Diego Perini
+ // http://javascript.nwbox.com/IEContentLoaded/
+ document.documentElement.doScroll("left");
+ } catch( error ) {
+ setTimeout( arguments.callee, 0 );
+ return;
+ }
+
+ // and execute any waiting functions
+ jQuery.ready();
+ })();
+ }
+
+ // A fallback to window.onload, that will always work
+ jQuery.event.add( window, "load", jQuery.ready );
+}
+
+jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+ "mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave," +
+ "change,select,submit,keydown,keypress,keyup,error").split(","), function(i, name){
+
+ // Handle event binding
+ jQuery.fn[name] = function(fn){
+ return fn ? this.bind(name, fn) : this.trigger(name);
+ };
+});
+
+// Prevent memory leaks in IE
+// And prevent errors on refresh with events like mouseover in other browsers
+// Window isn't included so as not to unbind existing unload events
+jQuery( window ).bind( 'unload', function(){
+ for ( var id in jQuery.cache )
+ // Skip the window
+ if ( id != 1 && jQuery.cache[ id ].handle )
+ jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+});
+(function(){
+
+ jQuery.support = {};
+
+ var root = document.documentElement,
+ script = document.createElement("script"),
+ div = document.createElement("div"),
+ id = "script" + (new Date).getTime();
+
+ div.style.display = "none";
+ div.innerHTML = ' <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';
+
+ var all = div.getElementsByTagName("*"),
+ a = div.getElementsByTagName("a")[0];
+
+ // Can't get basic test support
+ if ( !all || !all.length || !a ) {
+ return;
+ }
+
+ jQuery.support = {
+ // IE strips leading whitespace when .innerHTML is used
+ leadingWhitespace: div.firstChild.nodeType == 3,
+
+ // Make sure that tbody elements aren't automatically inserted
+ // IE will insert them into empty tables
+ tbody: !div.getElementsByTagName("tbody").length,
+
+ // Make sure that you can get all elements in an <object> element
+ // IE 7 always returns no results
+ objectAll: !!div.getElementsByTagName("object")[0]
+ .getElementsByTagName("*").length,
+
+ // Make sure that link elements get serialized correctly by innerHTML
+ // This requires a wrapper element in IE
+ htmlSerialize: !!div.getElementsByTagName("link").length,
+
+ // Get the style information from getAttribute
+ // (IE uses .cssText insted)
+ style: /red/.test( a.getAttribute("style") ),
+
+ // Make sure that URLs aren't manipulated
+ // (IE normalizes it by default)
+ hrefNormalized: a.getAttribute("href") === "/a",
+
+ // Make sure that element opacity exists
+ // (IE uses filter instead)
+ opacity: a.style.opacity === "0.5",
+
+ // Verify style float existence
+ // (IE uses styleFloat instead of cssFloat)
+ cssFloat: !!a.style.cssFloat,
+
+ // Will be defined later
+ scriptEval: false,
+ noCloneEvent: true,
+ boxModel: null
+ };
+
+ script.type = "text/javascript";
+ try {
+ script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+ } catch(e){}
+
+ root.insertBefore( script, root.firstChild );
+
+ // Make sure that the execution of code works by injecting a script
+ // tag with appendChild/createTextNode
+ // (IE doesn't support this, fails, and uses .text instead)
+ if ( window[ id ] ) {
+ jQuery.support.scriptEval = true;
+ delete window[ id ];
+ }
+
+ root.removeChild( script );
+
+ if ( div.attachEvent && div.fireEvent ) {
+ div.attachEvent("onclick", function(){
+ // Cloning a node shouldn't copy over any
+ // bound event handlers (IE does this)
+ jQuery.support.noCloneEvent = false;
+ div.detachEvent("onclick", arguments.callee);
+ });
+ div.cloneNode(true).fireEvent("onclick");
+ }
+
+ // Figure out if the W3C box model works as expected
+ // document.body must exist before we can do this
+ jQuery(function(){
+ var div = document.createElement("div");
+ div.style.width = div.style.paddingLeft = "1px";
+
+ document.body.appendChild( div );
+ jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+ document.body.removeChild( div ).style.display = 'none';
+ });
+})();
+
+var styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat";
+
+jQuery.props = {
+ "for": "htmlFor",
+ "class": "className",
+ "float": styleFloat,
+ cssFloat: styleFloat,
+ styleFloat: styleFloat,
+ readonly: "readOnly",
+ maxlength: "maxLength",
+ cellspacing: "cellSpacing",
+ rowspan: "rowSpan",
+ tabindex: "tabIndex"
+};
+jQuery.fn.extend({
+ // Keep a copy of the old load
+ _load: jQuery.fn.load,
+
+ load: function( url, params, callback ) {
+ if ( typeof url !== "string" )
+ return this._load( url );
+
+ var off = url.indexOf(" ");
+ if ( off >= 0 ) {
+ var selector = url.slice(off, url.length);
+ url = url.slice(0, off);
+ }
+
+ // Default to a GET request
+ var type = "GET";
+
+ // If the second parameter was provided
+ if ( params )
+ // If it's a function
+ if ( jQuery.isFunction( params ) ) {
+ // We assume that it's the callback
+ callback = params;
+ params = null;
+
+ // Otherwise, build a param string
+ } else if( typeof params === "object" ) {
+ params = jQuery.param( params );
+ type = "POST";
+ }
+
+ var self = this;
+
+ // Request the remote document
+ jQuery.ajax({
+ url: url,
+ type: type,
+ dataType: "html",
+ data: params,
+ complete: function(res, status){
+ // If successful, inject the HTML into all the matched elements
+ if ( status == "success" || status == "notmodified" )
+ // See if a selector was specified
+ self.html( selector ?
+ // Create a dummy div to hold the results
+ jQuery("<div/>")
+ // inject the contents of the document in, removing the scripts
+ // to avoid any 'Permission Denied' errors in IE
+ .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+
+ // Locate the specified elements
+ .find(selector) :
+
+ // If not, just inject the full result
+ res.responseText );
+
+ if( callback )
+ self.each( callback, [res.responseText, status, res] );
+ }
+ });
+ return this;
+ },
+
+ serialize: function() {
+ return jQuery.param(this.serializeArray());
+ },
+ serializeArray: function() {
+ return this.map(function(){
+ return this.elements ? jQuery.makeArray(this.elements) : this;
+ })
+ .filter(function(){
+ return this.name && !this.disabled &&
+ (this.checked || /select|textarea/i.test(this.nodeName) ||
+ /text|hidden|password|search/i.test(this.type));
+ })
+ .map(function(i, elem){
+ var val = jQuery(this).val();
+ return val == null ? null :
+ jQuery.isArray(val) ?
+ jQuery.map( val, function(val, i){
+ return {name: elem.name, value: val};
+ }) :
+ {name: elem.name, value: val};
+ }).get();
+ }
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+ jQuery.fn[o] = function(f){
+ return this.bind(o, f);
+ };
+});
+
+var jsc = now();
+
+jQuery.extend({
+
+ get: function( url, data, callback, type ) {
+ // shift arguments if data argument was ommited
+ if ( jQuery.isFunction( data ) ) {
+ callback = data;
+ data = null;
+ }
+
+ return jQuery.ajax({
+ type: "GET",
+ url: url,
+ data: data,
+ success: callback,
+ dataType: type
+ });
+ },
+
+ getScript: function( url, callback ) {
+ return jQuery.get(url, null, callback, "script");
+ },
+
+ getJSON: function( url, data, callback ) {
+ return jQuery.get(url, data, callback, "json");
+ },
+
+ post: function( url, data, callback, type ) {
+ if ( jQuery.isFunction( data ) ) {
+ callback = data;
+ data = {};
+ }
+
+ return jQuery.ajax({
+ type: "POST",
+ url: url,
+ data: data,
+ success: callback,
+ dataType: type
+ });
+ },
+
+ ajaxSetup: function( settings ) {
+ jQuery.extend( jQuery.ajaxSettings, settings );
+ },
+
+ ajaxSettings: {
+ url: location.href,
+ global: true,
+ type: "GET",
+ contentType: "application/x-www-form-urlencoded",
+ processData: true,
+ async: true,
+ /*
+ timeout: 0,
+ data: null,
+ username: null,
+ password: null,
+ */
+ // Create the request object; Microsoft failed to properly
+ // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+ // This function can be overriden by calling jQuery.ajaxSetup
+ xhr:function(){
+ return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+ },
+ accepts: {
+ xml: "application/xml, text/xml",
+ html: "text/html",
+ script: "text/javascript, application/javascript",
+ json: "application/json, text/javascript",
+ text: "text/plain",
+ _default: "*/*"
+ }
+ },
+
+ // Last-Modified header cache for next request
+ lastModified: {},
+
+ ajax: function( s ) {
+ // Extend the settings, but re-extend 's' so that it can be
+ // checked again later (in the test suite, specifically)
+ s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+
+ var jsonp, jsre = /=\?(&|$)/g, status, data,
+ type = s.type.toUpperCase();
+
+ // convert data if not already a string
+ if ( s.data && s.processData && typeof s.data !== "string" )
+ s.data = jQuery.param(s.data);
+
+ // Handle JSONP Parameter Callbacks
+ if ( s.dataType == "jsonp" ) {
+ if ( type == "GET" ) {
+ if ( !s.url.match(jsre) )
+ s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+ } else if ( !s.data || !s.data.match(jsre) )
+ s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+ s.dataType = "json";
+ }
+
+ // Build temporary JSONP function
+ if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
+ jsonp = "jsonp" + jsc++;
+
+ // Replace the =? sequence both in the query string and the data
+ if ( s.data )
+ s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+ s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+ // We need to make sure
+ // that a JSONP style response is executed properly
+ s.dataType = "script";
+
+ // Handle JSONP-style loading
+ window[ jsonp ] = function(tmp){
+ data = tmp;
+ success();
+ complete();
+ // Garbage collect
+ window[ jsonp ] = undefined;
+ try{ delete window[ jsonp ]; } catch(e){}
+ if ( head )
+ head.removeChild( script );
+ };
+ }
+
+ if ( s.dataType == "script" && s.cache == null )
+ s.cache = false;
+
+ if ( s.cache === false && type == "GET" ) {
+ var ts = now();
+ // try replacing _= if it is there
+ var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+ // if nothing was replaced, add timestamp to the end
+ s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+ }
+
+ // If data is available, append data to url for get requests
+ if ( s.data && type == "GET" ) {
+ s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
+
+ // IE likes to send both get and post data, prevent this
+ s.data = null;
+ }
+
+ // Watch for a new set of requests
+ if ( s.global && ! jQuery.active++ )
+ jQuery.event.trigger( "ajaxStart" );
+
+ // Matches an absolute URL, and saves the domain
+ var parts = /^(\w+:)?\/\/([^\/?#]+)/.exec( s.url );
+
+ // If we're requesting a remote document
+ // and trying to load JSON or Script with a GET
+ if ( s.dataType == "script" && type == "GET" && parts
+ && ( parts[1] && parts[1] != location.protocol || parts[2] != location.host )){
+
+ var head = document.getElementsByTagName("head")[0];
+ var script = document.createElement("script");
+ script.src = s.url;
+ if (s.scriptCharset)
+ script.charset = s.scriptCharset;
+
+ // Handle Script loading
+ if ( !jsonp ) {
+ var done = false;
+
+ // Attach handlers for all browsers
+ script.onload = script.onreadystatechange = function(){
+ if ( !done && (!this.readyState ||
+ this.readyState == "loaded" || this.readyState == "complete") ) {
+ done = true;
+ success();
+ complete();
+
+ // Handle memory leak in IE
+ script.onload = script.onreadystatechange = null;
+ head.removeChild( script );
+ }
+ };
+ }
+
+ head.appendChild(script);
+
+ // We handle everything using the script element injection
+ return undefined;
+ }
+
+ var requestDone = false;
+
+ // Create the request object
+ var xhr = s.xhr();
+
+ // Open the socket
+ // Passing null username, generates a login popup on Opera (#2865)
+ if( s.username )
+ xhr.open(type, s.url, s.async, s.username, s.password);
+ else
+ xhr.open(type, s.url, s.async);
+
+ // Need an extra try/catch for cross domain requests in Firefox 3
+ try {
+ // Set the correct header, if data is being sent
+ if ( s.data )
+ xhr.setRequestHeader("Content-Type", s.contentType);
+
+ // Set the If-Modified-Since header, if ifModified mode.
+ if ( s.ifModified )
+ xhr.setRequestHeader("If-Modified-Since",
+ jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+
+ // Set header so the called script knows that it's an XMLHttpRequest
+ xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+ // Set the Accepts header for the server, depending on the dataType
+ xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+ s.accepts[ s.dataType ] + ", */*" :
+ s.accepts._default );
+ } catch(e){}
+
+ // Allow custom headers/mimetypes and early abort
+ if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
+ // Handle the global AJAX counter
+ if ( s.global && ! --jQuery.active )
+ jQuery.event.trigger( "ajaxStop" );
+ // close opended socket
+ xhr.abort();
+ return false;
+ }
+
+ if ( s.global )
+ jQuery.event.trigger("ajaxSend", [xhr, s]);
+
+ // Wait for a response to come back
+ var onreadystatechange = function(isTimeout){
+ // The request was aborted, clear the interval and decrement jQuery.active
+ if (xhr.readyState == 0) {
+ if (ival) {
+ // clear poll interval
+ clearInterval(ival);
+ ival = null;
+ // Handle the global AJAX counter
+ if ( s.global && ! --jQuery.active )
+ jQuery.event.trigger( "ajaxStop" );
+ }
+ // The transfer is complete and the data is available, or the request timed out
+ } else if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
+ requestDone = true;
+
+ // clear poll interval
+ if (ival) {
+ clearInterval(ival);
+ ival = null;
+ }
+
+ status = isTimeout == "timeout" ? "timeout" :
+ !jQuery.httpSuccess( xhr ) ? "error" :
+ s.ifModified && jQuery.httpNotModified( xhr, s.url ) ? "notmodified" :
+ "success";
+
+ if ( status == "success" ) {
+ // Watch for, and catch, XML document parse errors
+ try {
+ // process the data (runs the xml through httpData regardless of callback)
+ data = jQuery.httpData( xhr, s.dataType, s );
+ } catch(e) {
+ status = "parsererror";
+ }
+ }
+
+ // Make sure that the request was successful or notmodified
+ if ( status == "success" ) {
+ // Cache Last-Modified header, if ifModified mode.
+ var modRes;
+ try {
+ modRes = xhr.getResponseHeader("Last-Modified");
+ } catch(e) {} // swallow exception thrown by FF if header is not available
+
+ if ( s.ifModified && modRes )
+ jQuery.lastModified[s.url] = modRes;
+
+ // JSONP handles its own success callback
+ if ( !jsonp )
+ success();
+ } else
+ jQuery.handleError(s, xhr, status);
+
+ // Fire the complete handlers
+ complete();
+
+ if ( isTimeout )
+ xhr.abort();
+
+ // Stop memory leaks
+ if ( s.async )
+ xhr = null;
+ }
+ };
+
+ if ( s.async ) {
+ // don't attach the handler to the request, just poll it instead
+ var ival = setInterval(onreadystatechange, 13);
+
+ // Timeout checker
+ if ( s.timeout > 0 )
+ setTimeout(function(){
+ // Check to see if the request is still happening
+ if ( xhr && !requestDone )
+ onreadystatechange( "timeout" );
+ }, s.timeout);
+ }
+
+ // Send the data
+ try {
+ xhr.send(s.data);
+ } catch(e) {
+ jQuery.handleError(s, xhr, null, e);
+ }
+
+ // firefox 1.5 doesn't fire statechange for sync requests
+ if ( !s.async )
+ onreadystatechange();
+
+ function success(){
+ // If a local callback was specified, fire it and pass it the data
+ if ( s.success )
+ s.success( data, status );
+
+ // Fire the global callback
+ if ( s.global )
+ jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
+ }
+
+ function complete(){
+ // Process result
+ if ( s.complete )
+ s.complete(xhr, status);
+
+ // The request was completed
+ if ( s.global )
+ jQuery.event.trigger( "ajaxComplete", [xhr, s] );
+
+ // Handle the global AJAX counter
+ if ( s.global && ! --jQuery.active )
+ jQuery.event.trigger( "ajaxStop" );
+ }
+
+ // return XMLHttpRequest to allow aborting the request etc.
+ return xhr;
+ },
+
+ handleError: function( s, xhr, status, e ) {
+ // If a local callback was specified, fire it
+ if ( s.error ) s.error( xhr, status, e );
+
+ // Fire the global callback
+ if ( s.global )
+ jQuery.event.trigger( "ajaxError", [xhr, s, e] );
+ },
+
+ // Counter for holding the number of active queries
+ active: 0,
+
+ // Determines if an XMLHttpRequest was successful or not
+ httpSuccess: function( xhr ) {
+ try {
+ // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+ return !xhr.status && location.protocol == "file:" ||
+ ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223;
+ } catch(e){}
+ return false;
+ },
+
+ // Determines if an XMLHttpRequest returns NotModified
+ httpNotModified: function( xhr, url ) {
+ try {
+ var xhrRes = xhr.getResponseHeader("Last-Modified");
+
+ // Firefox always returns 200. check Last-Modified date
+ return xhr.status == 304 || xhrRes == jQuery.lastModified[url];
+ } catch(e){}
+ return false;
+ },
+
+ httpData: function( xhr, type, s ) {
+ var ct = xhr.getResponseHeader("content-type"),
+ xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
+ data = xml ? xhr.responseXML : xhr.responseText;
+
+ if ( xml && data.documentElement.tagName == "parsererror" )
+ throw "parsererror";
+
+ // Allow a pre-filtering function to sanitize the response
+ // s != null is checked to keep backwards compatibility
+ if( s && s.dataFilter )
+ data = s.dataFilter( data, type );
+
+ // The filter can actually parse the response
+ if( typeof data === "string" ){
+
+ // If the type is "script", eval it in global context
+ if ( type == "script" )
+ jQuery.globalEval( data );
+
+ // Get the JavaScript object, if JSON is used.
+ if ( type == "json" )
+ data = window["eval"]("(" + data + ")");
+ }
+
+ return data;
+ },
+
+ // Serialize an array of form elements or a set of
+ // key/values into a query string
+ param: function( a ) {
+ var s = [ ];
+
+ function add( key, value ){
+ s[ s.length ] = encodeURIComponent(key) + '=' + encodeURIComponent(value);
+ };
+
+ // If an array was passed in, assume that it is an array
+ // of form elements
+ if ( jQuery.isArray(a) || a.jquery )
+ // Serialize the form elements
+ jQuery.each( a, function(){
+ add( this.name, this.value );
+ });
+
+ // Otherwise, assume that it's an object of key/value pairs
+ else
+ // Serialize the key/values
+ for ( var j in a )
+ // If the value is an array then the key names need to be repeated
+ if ( jQuery.isArray(a[j]) )
+ jQuery.each( a[j], function(){
+ add( j, this );
+ });
+ else
+ add( j, jQuery.isFunction(a[j]) ? a[j]() : a[j] );
+
+ // Return the resulting serialization
+ return s.join("&").replace(/%20/g, "+");
+ }
+
+});
+var elemdisplay = {},
+ timerId,
+ fxAttrs = [
+ // height animations
+ [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+ // width animations
+ [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+ // opacity animations
+ [ "opacity" ]
+ ];
+
+function genFx( type, num ){
+ var obj = {};
+ jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
+ obj[ this ] = type;
+ });
+ return obj;
+}
+
+jQuery.fn.extend({
+ show: function(speed,callback){
+ if ( speed ) {
+ return this.animate( genFx("show", 3), speed, callback);
+ } else {
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ var old = jQuery.data(this[i], "olddisplay");
+
+ this[i].style.display = old || "";
+
+ if ( jQuery.css(this[i], "display") === "none" ) {
+ var tagName = this[i].tagName, display;
+
+ if ( elemdisplay[ tagName ] ) {
+ display = elemdisplay[ tagName ];
+ } else {
+ var elem = jQuery("<" + tagName + " />").appendTo("body");
+
+ display = elem.css("display");
+ if ( display === "none" )
+ display = "block";
+
+ elem.remove();
+
+ elemdisplay[ tagName ] = display;
+ }
+
+ jQuery.data(this[i], "olddisplay", display);
+ }
+ }
+
+ // Set the display of the elements in a second loop
+ // to avoid the constant reflow
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
+ }
+
+ return this;
+ }
+ },
+
+ hide: function(speed,callback){
+ if ( speed ) {
+ return this.animate( genFx("hide", 3), speed, callback);
+ } else {
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ var old = jQuery.data(this[i], "olddisplay");
+ if ( !old && old !== "none" )
+ jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+ }
+
+ // Set the display of the elements in a second loop
+ // to avoid the constant reflow
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ this[i].style.display = "none";
+ }
+
+ return this;
+ }
+ },
+
+ // Save the old toggle function
+ _toggle: jQuery.fn.toggle,
+
+ toggle: function( fn, fn2 ){
+ var bool = typeof fn === "boolean";
+
+ return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+ this._toggle.apply( this, arguments ) :
+ fn == null || bool ?
+ this.each(function(){
+ var state = bool ? fn : jQuery(this).is(":hidden");
+ jQuery(this)[ state ? "show" : "hide" ]();
+ }) :
+ this.animate(genFx("toggle", 3), fn, fn2);
+ },
+
+ fadeTo: function(speed,to,callback){
+ return this.animate({opacity: to}, speed, callback);
+ },
+
+ animate: function( prop, speed, easing, callback ) {
+ var optall = jQuery.speed(speed, easing, callback);
+
+ return this[ optall.queue === false ? "each" : "queue" ](function(){
+
+ var opt = jQuery.extend({}, optall), p,
+ hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
+ self = this;
+
+ for ( p in prop ) {
+ if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+ return opt.complete.call(this);
+
+ if ( ( p == "height" || p == "width" ) && this.style ) {
+ // Store display property
+ opt.display = jQuery.css(this, "display");
+
+ // Make sure that nothing sneaks out
+ opt.overflow = this.style.overflow;
+ }
+ }
+
+ if ( opt.overflow != null )
+ this.style.overflow = "hidden";
+
+ opt.curAnim = jQuery.extend({}, prop);
+
+ jQuery.each( prop, function(name, val){
+ var e = new jQuery.fx( self, opt, name );
+
+ if ( /toggle|show|hide/.test(val) )
+ e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+ else {
+ var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
+ start = e.cur(true) || 0;
+
+ if ( parts ) {
+ var end = parseFloat(parts[2]),
+ unit = parts[3] || "px";
+
+ // We need to compute starting value
+ if ( unit != "px" ) {
+ self.style[ name ] = (end || 1) + unit;
+ start = ((end || 1) / e.cur(true)) * start;
+ self.style[ name ] = start + unit;
+ }
+
+ // If a +=/-= token was provided, we're doing a relative animation
+ if ( parts[1] )
+ end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
+
+ e.custom( start, end, unit );
+ } else
+ e.custom( start, val, "" );
+ }
+ });
+
+ // For JS strict compliance
+ return true;
+ });
+ },
+
+ stop: function(clearQueue, gotoEnd){
+ var timers = jQuery.timers;
+
+ if (clearQueue)
+ this.queue([]);
+
+ this.each(function(){
+ // go in reverse order so anything added to the queue during the loop is ignored
+ for ( var i = timers.length - 1; i >= 0; i-- )
+ if ( timers[i].elem == this ) {
+ if (gotoEnd)
+ // force the next step to be the last
+ timers[i](true);
+ timers.splice(i, 1);
+ }
+ });
+
+ // start the next in the queue if the last step wasn't forced
+ if (!gotoEnd)
+ this.dequeue();
+
+ return this;
+ }
+
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+ slideDown: genFx("show", 1),
+ slideUp: genFx("hide", 1),
+ slideToggle: genFx("toggle", 1),
+ fadeIn: { opacity: "show" },
+ fadeOut: { opacity: "hide" }
+}, function( name, props ){
+ jQuery.fn[ name ] = function( speed, callback ){
+ return this.animate( props, speed, callback );
+ };
+});
+
+jQuery.extend({
+
+ speed: function(speed, easing, fn) {
+ var opt = typeof speed === "object" ? speed : {
+ complete: fn || !fn && easing ||
+ jQuery.isFunction( speed ) && speed,
+ duration: speed,
+ easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+ };
+
+ opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+ jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+
+ // Queueing
+ opt.old = opt.complete;
+ opt.complete = function(){
+ if ( opt.queue !== false )
+ jQuery(this).dequeue();
+ if ( jQuery.isFunction( opt.old ) )
+ opt.old.call( this );
+ };
+
+ return opt;
+ },
+
+ easing: {
+ linear: function( p, n, firstNum, diff ) {
+ return firstNum + diff * p;
+ },
+ swing: function( p, n, firstNum, diff ) {
+ return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+ }
+ },
+
+ timers: [],
+
+ fx: function( elem, options, prop ){
+ this.options = options;
+ this.elem = elem;
+ this.prop = prop;
+
+ if ( !options.orig )
+ options.orig = {};
+ }
+
+});
+
+jQuery.fx.prototype = {
+
+ // Simple function for setting a style value
+ update: function(){
+ if ( this.options.step )
+ this.options.step.call( this.elem, this.now, this );
+
+ (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+ // Set display property to block for height/width animations
+ if ( ( this.prop == "height" || this.prop == "width" ) && this.elem.style )
+ this.elem.style.display = "block";
+ },
+
+ // Get the current size
+ cur: function(force){
+ if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) )
+ return this.elem[ this.prop ];
+
+ var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+ return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+ },
+
+ // Start an animation from one number to another
+ custom: function(from, to, unit){
+ this.startTime = now();
+ this.start = from;
+ this.end = to;
+ this.unit = unit || this.unit || "px";
+ this.now = this.start;
+ this.pos = this.state = 0;
+
+ var self = this;
+ function t(gotoEnd){
+ return self.step(gotoEnd);
+ }
+
+ t.elem = this.elem;
+
+ if ( t() && jQuery.timers.push(t) && !timerId ) {
+ timerId = setInterval(function(){
+ var timers = jQuery.timers;
+
+ for ( var i = 0; i < timers.length; i++ )
+ if ( !timers[i]() )
+ timers.splice(i--, 1);
+
+ if ( !timers.length ) {
+ clearInterval( timerId );
+ timerId = undefined;
+ }
+ }, 13);
+ }
+ },
+
+ // Simple 'show' function
+ show: function(){
+ // Remember where we started, so that we can go back to it later
+ this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+ this.options.show = true;
+
+ // Begin the animation
+ // Make sure that we start at a small width/height to avoid any
+ // flash of content
+ this.custom(this.prop == "width" || this.prop == "height" ? 1 : 0, this.cur());
+
+ // Start by showing the element
+ jQuery(this.elem).show();
+ },
+
+ // Simple 'hide' function
+ hide: function(){
+ // Remember where we started, so that we can go back to it later
+ this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+ this.options.hide = true;
+
+ // Begin the animation
+ this.custom(this.cur(), 0);
+ },
+
+ // Each step of an animation
+ step: function(gotoEnd){
+ var t = now();
+
+ if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+ this.now = this.end;
+ this.pos = this.state = 1;
+ this.update();
+
+ this.options.curAnim[ this.prop ] = true;
+
+ var done = true;
+ for ( var i in this.options.curAnim )
+ if ( this.options.curAnim[i] !== true )
+ done = false;
+
+ if ( done ) {
+ if ( this.options.display != null ) {
+ // Reset the overflow
+ this.elem.style.overflow = this.options.overflow;
+
+ // Reset the display
+ this.elem.style.display = this.options.display;
+ if ( jQuery.css(this.elem, "display") == "none" )
+ this.elem.style.display = "block";
+ }
+
+ // Hide the element if the "hide" operation was done
+ if ( this.options.hide )
+ jQuery(this.elem).hide();
+
+ // Reset the properties, if the item has been hidden or shown
+ if ( this.options.hide || this.options.show )
+ for ( var p in this.options.curAnim )
+ jQuery.attr(this.elem.style, p, this.options.orig[p]);
+
+ // Execute the complete function
+ this.options.complete.call( this.elem );
+ }
+
+ return false;
+ } else {
+ var n = t - this.startTime;
+ this.state = n / this.options.duration;
+
+ // Perform the easing function, defaults to swing
+ this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
+ this.now = this.start + ((this.end - this.start) * this.pos);
+
+ // Perform the next step of the animation
+ this.update();
+ }
+
+ return true;
+ }
+
+};
+
+jQuery.extend( jQuery.fx, {
+ speeds:{
+ slow: 600,
+ fast: 200,
+ // Default speed
+ _default: 400
+ },
+ step: {
+
+ opacity: function(fx){
+ jQuery.attr(fx.elem.style, "opacity", fx.now);
+ },
+
+ _default: function(fx){
+ if ( fx.elem.style && fx.elem.style[ fx.prop ] != null )
+ fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+ else
+ fx.elem[ fx.prop ] = fx.now;
+ }
+ }
+});
+if ( document.documentElement["getBoundingClientRect"] )
+ jQuery.fn.offset = function() {
+ if ( !this[0] ) return { top: 0, left: 0 };
+ if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );
+ var box = this[0].getBoundingClientRect(), doc = this[0].ownerDocument, body = doc.body, docElem = doc.documentElement,
+ clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
+ top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
+ left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+ return { top: top, left: left };
+ };
+else
+ jQuery.fn.offset = function() {
+ if ( !this[0] ) return { top: 0, left: 0 };
+ if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );
+ jQuery.offset.initialized || jQuery.offset.initialize();
+
+ var elem = this[0], offsetParent = elem.offsetParent, prevOffsetParent = elem,
+ doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
+ body = doc.body, defaultView = doc.defaultView,
+ prevComputedStyle = defaultView.getComputedStyle(elem, null),
+ top = elem.offsetTop, left = elem.offsetLeft;
+
+ while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+ computedStyle = defaultView.getComputedStyle(elem, null);
+ top -= elem.scrollTop, left -= elem.scrollLeft;
+ if ( elem === offsetParent ) {
+ top += elem.offsetTop, left += elem.offsetLeft;
+ if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) )
+ top += parseInt( computedStyle.borderTopWidth, 10) || 0,
+ left += parseInt( computedStyle.borderLeftWidth, 10) || 0;
+ prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
+ }
+ if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" )
+ top += parseInt( computedStyle.borderTopWidth, 10) || 0,
+ left += parseInt( computedStyle.borderLeftWidth, 10) || 0;
+ prevComputedStyle = computedStyle;
+ }
+
+ if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" )
+ top += body.offsetTop,
+ left += body.offsetLeft;
+
+ if ( prevComputedStyle.position === "fixed" )
+ top += Math.max(docElem.scrollTop, body.scrollTop),
+ left += Math.max(docElem.scrollLeft, body.scrollLeft);
+
+ return { top: top, left: left };
+ };
+
+jQuery.offset = {
+ initialize: function() {
+ if ( this.initialized ) return;
+ var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, rules, prop, bodyMarginTop = body.style.marginTop,
+ html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';
+
+ rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' };
+ for ( prop in rules ) container.style[prop] = rules[prop];
+
+ container.innerHTML = html;
+ body.insertBefore(container, body.firstChild);
+ innerDiv = container.firstChild, checkDiv = innerDiv.firstChild, td = innerDiv.nextSibling.firstChild.firstChild;
+
+ this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+ this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+ innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
+ this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+ body.style.marginTop = '1px';
+ this.doesNotIncludeMarginInBodyOffset = (body.offsetTop === 0);
+ body.style.marginTop = bodyMarginTop;
+
+ body.removeChild(container);
+ this.initialized = true;
+ },
+
+ bodyOffset: function(body) {
+ jQuery.offset.initialized || jQuery.offset.initialize();
+ var top = body.offsetTop, left = body.offsetLeft;
+ if ( jQuery.offset.doesNotIncludeMarginInBodyOffset )
+ top += parseInt( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0,
+ left += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0;
+ return { top: top, left: left };
+ }
+};
+
+
+jQuery.fn.extend({
+ position: function() {
+ var left = 0, top = 0, results;
+
+ if ( this[0] ) {
+ // Get *real* offsetParent
+ var offsetParent = this.offsetParent(),
+
+ // Get correct offsets
+ offset = this.offset(),
+ parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+ // Subtract element margins
+ // note: when an element has margin: auto the offsetLeft and marginLeft
+ // are the same in Safari causing offset.left to incorrectly be 0
+ offset.top -= num( this, 'marginTop' );
+ offset.left -= num( this, 'marginLeft' );
+
+ // Add offsetParent borders
+ parentOffset.top += num( offsetParent, 'borderTopWidth' );
+ parentOffset.left += num( offsetParent, 'borderLeftWidth' );
+
+ // Subtract the two offsets
+ results = {
+ top: offset.top - parentOffset.top,
+ left: offset.left - parentOffset.left
+ };
+ }
+
+ return results;
+ },
+
+ offsetParent: function() {
+ var offsetParent = this[0].offsetParent || document.body;
+ while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+ offsetParent = offsetParent.offsetParent;
+ return jQuery(offsetParent);
+ }
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ['Left', 'Top'], function(i, name) {
+ var method = 'scroll' + name;
+
+ jQuery.fn[ method ] = function(val) {
+ if (!this[0]) return null;
+
+ return val !== undefined ?
+
+ // Set the scroll offset
+ this.each(function() {
+ this == window || this == document ?
+ window.scrollTo(
+ !i ? val : jQuery(window).scrollLeft(),
+ i ? val : jQuery(window).scrollTop()
+ ) :
+ this[ method ] = val;
+ }) :
+
+ // Return the scroll offset
+ this[0] == window || this[0] == document ?
+ self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+ jQuery.boxModel && document.documentElement[ method ] ||
+ document.body[ method ] :
+ this[0][ method ];
+ };
+});
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function(i, name){
+
+ var tl = i ? "Left" : "Top", // top or left
+ br = i ? "Right" : "Bottom", // bottom or right
+ lower = name.toLowerCase();
+
+ // innerHeight and innerWidth
+ jQuery.fn["inner" + name] = function(){
+ return this[0] ?
+ jQuery.css( this[0], lower, false, "padding" ) :
+ null;
+ };
+
+ // outerHeight and outerWidth
+ jQuery.fn["outer" + name] = function(margin) {
+ return this[0] ?
+ jQuery.css( this[0], lower, false, margin ? "margin" : "border" ) :
+ null;
+ };
+
+ var type = name.toLowerCase();
+
+ jQuery.fn[ type ] = function( size ) {
+ // Get window width or height
+ return this[0] == window ?
+ // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+ document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] ||
+ document.body[ "client" + name ] :
+
+ // Get document width or height
+ this[0] == document ?
+ // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+ Math.max(
+ document.documentElement["client" + name],
+ document.body["scroll" + name], document.documentElement["scroll" + name],
+ document.body["offset" + name], document.documentElement["offset" + name]
+ ) :
+
+ // Get or set width or height on the element
+ size === undefined ?
+ // Get width or height on the element
+ (this.length ? jQuery.css( this[0], type ) : null) :
+
+ // Set the width or height on the element (default to pixels if value is unitless)
+ this.css( type, typeof size === "string" ? size : size + "px" );
+ };
+
+});
+})();
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/spinner.gif b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/spinner.gif
new file mode 100644
index 0000000..26800bf
Binary files /dev/null and b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/spinner.gif differ
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/render.rb b/vendor/plugins/rack-bug/lib/rack/bug/render.rb
new file mode 100644
index 0000000..89e7a1e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/render.rb
@@ -0,0 +1,67 @@
+require "erb"
+
+module Rack
+ module Bug
+
+ module Render
+ include ERB::Util
+
+ def signed_params(hash)
+ # require "rubygems"; require "ruby-debug"; Debugger.start; debugger
+ ParamsSignature.sign(request, hash)
+ end
+
+ module CompiledTemplates
+ end
+ include CompiledTemplates
+
+ def render_template(filename, local_assigns = {})
+ compile(filename, local_assigns)
+ render_symbol = method_name(filename, local_assigns)
+ send(render_symbol, local_assigns)
+ end
+
+ def compile(filename, local_assigns)
+ render_symbol = method_name(filename, local_assigns)
+
+ if !CompiledTemplates.instance_methods.include?(render_symbol.to_s)
+ compile!(filename, local_assigns)
+ end
+ end
+
+ def compile!(filename, local_assigns)
+ render_symbol = method_name(filename, local_assigns)
+ locals_code = local_assigns.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
+
+ source = <<-end_src
+ def #{render_symbol}(local_assigns)
+ #{locals_code}
+ #{compiled_source(filename)}
+ end
+ end_src
+
+ CompiledTemplates.module_eval(source, filename, 0)
+ end
+
+ def compiled_source(filename)
+ ::ERB.new(::File.read(::File.dirname(__FILE__) + "/../bug/views/#{filename}.html.erb"), nil, "-").src
+ end
+
+ def method_name(filename, local_assigns)
+ if local_assigns && local_assigns.any?
+ method_name = method_name_without_locals(filename).dup
+ method_name << "_locals_#{local_assigns.keys.map { |k| k.to_s }.sort.join('_')}"
+ else
+ method_name = method_name_without_locals(filename)
+ end
+ method_name.to_sym
+ end
+
+ def method_name_without_locals(filename)
+ filename.split("/").join("_")
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/toolbar.rb b/vendor/plugins/rack-bug/lib/rack/bug/toolbar.rb
new file mode 100644
index 0000000..2c13c87
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/toolbar.rb
@@ -0,0 +1,145 @@
+require "ipaddr"
+require "digest"
+
+require "rack/bug/options"
+require "rack/bug/render"
+
+Dir[File.dirname(__FILE__) + "/panels/*.rb"].each do |panel_name|
+ require "rack/bug/panels/" + File.basename(panel_name)
+end
+
+module Rack
+ module Bug
+
+ class RackStaticBugAvoider
+ def initialize(app, static_app)
+ @app = app
+ @static_app = static_app
+ end
+
+ def call(env)
+ if env["PATH_INFO"]
+ @static_app.call(env)
+ else
+ @app.call(env)
+ end
+ end
+ end
+
+ class Toolbar
+ include Options
+ include Render
+
+ MIME_TYPES = ["text/html", "application/xhtml+xml"]
+
+ def initialize(app, options = {})
+ @app = asset_server(app)
+ initialize_options options
+ instance_eval(&block) if block_given?
+ end
+
+ def asset_server(app)
+ RackStaticBugAvoider.new(app, Rack::Static.new(app, :urls => ["/__rack_bug__"], :root => public_path))
+ end
+
+ def public_path
+ ::File.expand_path(::File.dirname(__FILE__) + "/../bug/public")
+ end
+
+ def call(env)
+ env.replace @default_options.merge(env)
+ @env = env
+ @original_request = Request.new(@env)
+
+ if toolbar_requested? && ip_authorized? && password_authorized?
+ dispatch
+ else
+ pass
+ end
+ end
+
+ def pass
+ @app.call(@env)
+ end
+
+ def dispatch
+ @env["rack-bug.panels"] = []
+
+ Rack::Bug.enable
+ status, headers, body = builder.call(@env)
+ Rack::Bug.disable
+
+ @response = Rack::Response.new(body, status, headers)
+
+ if @response.redirect? && options["rack-bug.intercept_redirects"]
+ intercept_redirect
+ elsif modify?
+ inject_toolbar
+ end
+
+ return @response.to_a
+ end
+
+ def intercept_redirect
+ redirect_to = @response.location
+ new_body = render_template("redirect", :redirect_to => @response.location)
+ new_response = Rack::Response.new(new_body, 200, { "Content-Type" => "text/html" })
+ new_response["Content-Length"] = new_body.size.to_s
+ @response = new_response
+ end
+
+ def toolbar_requested?
+ @original_request.cookies["rack_bug_enabled"]
+ end
+
+ def ip_authorized?
+ return true unless options["rack-bug.ip_masks"]
+
+ options["rack-bug.ip_masks"].any? do |ip_mask|
+ ip_mask.include?(IPAddr.new(@original_request.ip))
+ end
+ end
+
+ def password_authorized?
+ return true unless options["rack-bug.password"]
+
+ expected_sha = Digest::SHA1.hexdigest ["rack_bug", options["rack-bug.password"]].join(":")
+ actual_sha = @original_request.cookies["rack_bug_password"]
+
+ actual_sha == expected_sha
+ end
+
+ def modify?
+ @response.ok? &&
+ @env["X-Requested-With"] != "XMLHttpRequest" &&
+ MIME_TYPES.include?(@response.content_type.split(";").first)
+ end
+
+ def builder
+ builder = Rack::Builder.new
+
+ options["rack-bug.panel_classes"].each do |panel_class|
+ builder.use panel_class
+ end
+
+ builder.run @app
+
+ return builder
+ end
+
+ def inject_toolbar
+ full_body = @response.body.join
+ full_body.sub! /<\/body>/, render + "</body>"
+
+ @response["Content-Length"] = full_body.size.to_s
+ @response.body = [full_body]
+ end
+
+ def render
+ render_template("toolbar", :panels => @env["rack-bug.panels"].reverse)
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/error.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/error.html.erb
new file mode 100644
index 0000000..1433962
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/error.html.erb
@@ -0,0 +1,16 @@
+<script type="text/javascript" charset="utf-8">
+ if (typeof jQuery == 'undefined') {
+ var jquery_url = '/__rack_bug__/jquery-1.3.2.js';
+ document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
+ }
+</script>
+<script type="text/javascript" src="/__rack_bug__/bug.js"></script>
+<style type="text/css" media="screen">
+ @import url(/__rack_bug__/bug.css);
+</style>
+
+<div id="rack_bug" class="rack_bug_error">
+ <div id="rack_bug_toolbar">
+ <p>There was an error within Rack::Bug!</p>
+ </div>
+</div>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/active_record.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/active_record.html.erb
new file mode 100644
index 0000000..97eed4f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/active_record.html.erb
@@ -0,0 +1,17 @@
+<h3>ActiveRecord Objects</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Count</th>
+ <th>Class</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% records.each do |class_name, count| %>
+ <tr>
+ <td><%= count %></td>
+ <td><%= class_name %></td>
+ </tr>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/cache.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/cache.html.erb
new file mode 100644
index 0000000..fd8888e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/cache.html.erb
@@ -0,0 +1,93 @@
+<h3>Cache Usage</h3>
+<table id="cache_usage">
+ <colgroup>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ </colgroup>
+ <tr>
+ <th>Total Calls</th>
+ <td><%= stats.calls %></td>
+
+ <th>Total Time</th>
+ <td><%= stats.display_time %></td>
+
+ <th>Hits</th>
+ <td><%= stats.hits %></td>
+
+ <th>Misses</th>
+ <td><%= stats.misses %></td>
+ </tr>
+ <tr>
+ <th>gets</th>
+ <td><%= stats.gets %></td>
+
+ <th>sets</th>
+ <td><%= stats.sets %></td>
+
+ <th>deletes</th>
+ <td><%= stats.deletes %></td>
+
+ <th>get_multis</th>
+ <td><%= stats.get_multis %></td>
+ </tr>
+</table>
+
+<% if stats.queries.any? %>
+ <h3>Breakdown</h3>
+ <table id="cache_breakdown">
+ <thead>
+ <tr>
+ <th>Time (ms)</th>
+ <th>Type</th>
+ <th>Parameters</th>
+ <th>Function</th>
+ <th>
+ <a href="/__rack_bug__/delete_cache_list?<%= signed_params(stats.queries_to_param) %>" class="rb_delete_cache">
+ Delete All
+ </a>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% stats.queries.each do |query| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%= query.display_time %></td>
+ <td><%= query.method %></td>
+ <td><%= query.display_keys %></td>
+ <td></td>
+ <td>
+ <a href="/__rack_bug__/view_cache?<%= signed_params("key" => query.keys.first) %>" class="remote_call">View</a> |
+ <a href="/__rack_bug__/delete_cache?<%= signed_params("key" => query.keys.first) %>" class="rb_delete_cache">Delete</a>
+ </td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<script type="text/javascript" charset="utf-8">
+ jQuery(function () {
+ jQuery("#rack_bug .rb_delete_cache").click(function (evt) {
+ jQuery.ajax({
+ url: this.href,
+ beforeSend: function() {
+ jQuery(evt.target).parent("td, th").addClass("rack_bug_spinner");
+ },
+ success: function () {
+ jQuery(evt.target).parent("td, th").removeClass("rack_bug_spinner");
+ jQuery(evt.target).replaceWith("Deleted");
+ }
+ });
+
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/env.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/env.html.erb
new file mode 100644
index 0000000..8cba869
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/env.html.erb
@@ -0,0 +1,19 @@
+<h3>Rack ENV</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% env.sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/execute_sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/execute_sql.html.erb
new file mode 100644
index 0000000..7a3d56a
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/execute_sql.html.erb
@@ -0,0 +1,32 @@
+<a class="back" href="">« Back</a>
+
+<h3>SQL Results</h3>
+
+<dl>
+ <dt>Executed SQL</dt>
+ <dd><pre><%=h query %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (time * 1_000) %>ms</dd>
+</dl>
+
+<table>
+ <thead>
+ <tr>
+ <% result.fetch_fields.each do |field| %>
+ <th><%= field.name.upcase %></th>
+ <% end %>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% result.each do |row| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <% row.each do |value| %>
+ <td><%= value %></td>
+ <% end %>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/explain_sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/explain_sql.html.erb
new file mode 100644
index 0000000..d6f1d7c
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/explain_sql.html.erb
@@ -0,0 +1,32 @@
+<a class="back" href="">« Back</a>
+
+<h3>SQL Explained</h3>
+
+<dl>
+ <dt>Executed SQL</dt>
+ <dd><pre><%=h query %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (time * 1_000) %>ms</dd>
+</dl>
+
+<table>
+ <thead>
+ <tr>
+ <% result.fetch_fields.each do |field| %>
+ <th><%= field.name.upcase %></th>
+ <% end %>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% result.each do |row| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <% row.each do |value| %>
+ <td><%= value %></td>
+ <% end %>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/log.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/log.html.erb
new file mode 100644
index 0000000..add0f5f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/log.html.erb
@@ -0,0 +1,23 @@
+<h3>Log Messages</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Level</th>
+ <th>Time</th>
+ <th>Message</th>
+ <th>Location</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% logs.each do |log| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td></td>
+ <td></td>
+ <td><%= log.to_s.gsub(/\e\[[;\d]+m/, "") %></td>
+ <td></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/profile_sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/profile_sql.html.erb
new file mode 100644
index 0000000..2135e04
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/profile_sql.html.erb
@@ -0,0 +1,32 @@
+<a class="back" href="">« Back</a>
+
+<h3>SQL Profiled</h3>
+
+<dl>
+ <dt>Executed SQL</dt>
+ <dd><pre><%=h query %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (time * 1_000) %>ms</dd>
+</dl>
+
+<table>
+ <thead>
+ <tr>
+ <% result.fetch_fields.each do |field| %>
+ <th><%= field.name.upcase %></th>
+ <% end %>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% result.each do |row| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <% row.each do |value| %>
+ <td><%= value %></td>
+ <% end %>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/rails_info.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/rails_info.html.erb
new file mode 100644
index 0000000..a54c313
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/rails_info.html.erb
@@ -0,0 +1,19 @@
+<h3>Rails Environment</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% Rails::Info.properties.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/request_variables.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/request_variables.html.erb
new file mode 100644
index 0000000..865e2d9
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/request_variables.html.erb
@@ -0,0 +1,87 @@
+<% if request.GET.any? %>
+ <h3>GET</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.GET.sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<% if request.POST.any? %>
+ <h3>POST</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.POST.sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<% if request.env["rack.session"] && request.env["rack.session"].any? %>
+ <h3>Session</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.env["rack.session"].sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<% if request.env["rack.request.cookie_hash"] && request.env["rack.request.cookie_hash"].any? %>
+ <h3>Cookies</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.env["rack.request.cookie_hash"].sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/sql.html.erb
new file mode 100644
index 0000000..a11e825
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/sql.html.erb
@@ -0,0 +1,43 @@
+<h3>SQL Queries</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Time (ms)</th>
+ <th>Query</th>
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% queries.each do |query| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%= query.human_time %></td>
+ <td class="syntax"><%= query.sql %></td>
+ <td>
+ <% if query.has_backtrace? %>
+ <a href="#" class="reveal_backtrace">Show Backtrace</a>
+ <% end %>
+ </td>
+ <td>
+ <% if query.inspectable? and query.mysql? %>
+ <a href="/__rack_bug__/execute_sql?<%= signed_params("query" => query.sql, "time" => query.time) %>" class="remote_call">SELECT</a> |
+ <a href="/__rack_bug__/explain_sql?<%= signed_params("query" => query.sql, "time" => query.time) %>" class="remote_call">EXPLAIN</a> |
+ <a href="/__rack_bug__/profile_sql?<%= signed_params("query" => query.sql, "time" => query.time) %>" class="remote_call">Profile</a>
+ <% end %>
+ </td>
+ </tr>
+ <tr style="display:none">
+ <td></td>
+ <td colspan="3">
+ <ul>
+ <% query.filtered_backtrace.each do |line| %>
+ <li><%=h line %></li>
+ <% end %>
+ </ul>
+ </td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/templates.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/templates.html.erb
new file mode 100644
index 0000000..724c11f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/templates.html.erb
@@ -0,0 +1,7 @@
+<h3>Templates</h3>
+
+<ul>
+ <% template_trace.root.children.each do |child| %>
+ <%= child.html %>
+ <% end %>
+</ul>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/timer.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/timer.html.erb
new file mode 100644
index 0000000..6cf7420
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/timer.html.erb
@@ -0,0 +1,19 @@
+<h3>Resource Usage</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Key</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% measurements.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td><%=h val %></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/view_cache.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/view_cache.html.erb
new file mode 100644
index 0000000..251700d
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/view_cache.html.erb
@@ -0,0 +1,19 @@
+<a class="back" href="">« Back</a>
+
+<h3>Cache Read</h3>
+
+<dl>
+ <dt>Key</dt>
+ <dd><pre><%=h key %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (0.0 * 1_000) %>ms</dd>
+</dl>
+
+<p>
+ <% if value.is_a?(String )%>
+ <%=h value %>
+ <% else %>
+ <%=h value.inspect %>
+ <% end %>
+</p>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/redirect.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/redirect.html.erb
new file mode 100644
index 0000000..de9add8
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/redirect.html.erb
@@ -0,0 +1,16 @@
+<html>
+<head>
+</head>
+<body>
+ <h1>Redirect</h1>
+
+ <p>Location: <a href="<%= redirect_to %>"><%= redirect_to %></a></p>
+
+ <p class="notice">
+ Rack::Bug has intercepted a redirect to the above URL for debug viewing
+ purposes. You can click the above link to continue with the redirect as
+ normal. If you'd like to disable this feature, set the Rack::Bug
+ <code>internal_redirects</code> option to <code>false</code>.
+ </p>
+</body>
+</html>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/toolbar.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/toolbar.html.erb
new file mode 100644
index 0000000..a8bfc3e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/toolbar.html.erb
@@ -0,0 +1,41 @@
+<script type="text/javascript" charset="utf-8">
+ if (typeof jQuery == 'undefined') {
+ var jquery_url = '/__rack_bug__/jquery-1.3.2.js';
+ document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
+ }
+</script>
+<script type="text/javascript" src="/__rack_bug__/bug.js"></script>
+<style type="text/css" media="screen">
+ @import url(/__rack_bug__/bug.css);
+</style>
+
+<div id="rack_bug">
+ <div id="rack_bug_toolbar">
+ <ul class="panels">
+ <li id="rb_debug_button">Rack::Bug</li>
+
+ <% panels.each do |panel| %>
+ <li>
+ <% if panel.has_content? %>
+ <a href="#" class="<%= panel.name %>">
+ <%= panel.heading %>
+ </a>
+ <% else %>
+ <%= panel.heading %>
+ <% end %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+
+ <% panels.each do |panel| %>
+ <% if panel.has_content? %>
+ <div class="panel_content" id="<%= panel.name %>">
+ <a href="" class="rack_bug_close">Close</a>
+ <%= panel.content %>
+ </div>
+ <% end %>
+ <% end %>
+
+ <div id="rack_bug_debug_window" class="panel_content"></div>
+</div>
diff --git a/vendor/plugins/rack-bug/spec/fixtures/config.ru b/vendor/plugins/rack-bug/spec/fixtures/config.ru
new file mode 100644
index 0000000..32118e6
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/fixtures/config.ru
@@ -0,0 +1,8 @@
+require "rubygems"
+require "sample_app"
+
+$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__)) + '/../../lib'
+require "rack/bug"
+
+use Rack::Bug, :password => "secret"
+run SampleApp
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/fixtures/dummy_panel.rb b/vendor/plugins/rack-bug/spec/fixtures/dummy_panel.rb
new file mode 100644
index 0000000..93e20d4
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/fixtures/dummy_panel.rb
@@ -0,0 +1,2 @@
+class DummyPanel < Rack::Bug::Panel
+end
diff --git a/vendor/plugins/rack-bug/spec/fixtures/sample_app.rb b/vendor/plugins/rack-bug/spec/fixtures/sample_app.rb
new file mode 100644
index 0000000..3e1b068
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/fixtures/sample_app.rb
@@ -0,0 +1,29 @@
+require "sinatra/base"
+
+class SampleApp < Sinatra::Default
+
+ get "/redirect" do
+ redirect "/"
+ end
+
+ get "/error" do
+ raise "Error!"
+ end
+
+ get "/" do
+ if params[:content_type]
+ headers["Content-Type"] = params[:content_type]
+ end
+
+ <<-HTML
+ <html>
+ <head>
+ </head>
+ <body>
+ <p>Hello</p>
+ </body>
+ </html>
+ HTML
+ end
+
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/active_record_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/active_record_panel_spec.rb
new file mode 100644
index 0000000..5a58885
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/active_record_panel_spec.rb
@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe ActiveRecordPanel do
+ before do
+ ActiveRecordPanel.reset
+ header "rack-bug.panel_classes", [ActiveRecordPanel]
+ end
+
+ describe "heading" do
+ it "displays the total number of instantiated AR objects" do
+ ActiveRecordPanel.record("User")
+ ActiveRecordPanel.record("Group")
+ response = get "/"
+ response.should have_heading("2 AR Objects")
+ end
+ end
+
+ describe "content" do
+ it "displays the count of instantiated objects for each class" do
+ ActiveRecordPanel.record("User")
+ ActiveRecordPanel.record("User")
+ ActiveRecordPanel.record("Group")
+ response = get "/"
+ response.should have_row("#active_record", "User", "2")
+ response.should have_row("#active_record", "Group", "1")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/cache_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/cache_panel_spec.rb
new file mode 100644
index 0000000..7becf26
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/cache_panel_spec.rb
@@ -0,0 +1,159 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe CachePanel do
+ before do
+ CachePanel.reset
+ header "rack-bug.panel_classes", [CachePanel]
+ end
+
+ describe "heading" do
+ it "displays the total memcache time" do
+ response = get "/"
+ response.should have_heading("Cache: 0.00ms")
+ end
+ end
+
+ describe "content" do
+ describe "usage table" do
+ it "displays the total number of memcache calls" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+
+ # This causes a bus error:
+ # response.should have_selector("th:content('Total Calls') + td", :content => "1")
+
+ response.should have_row("#cache_usage", "Total Calls", "1")
+ end
+
+ it "displays the total memcache time" do
+ response = get "/"
+ response.should have_row("#cache_usage", "Total Time", "0.00ms")
+ end
+
+ it "dispays the number of memcache hits" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "Hits", "0")
+ end
+
+ it "displays the number of memcache misses" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "Misses", "1")
+ end
+
+ it "displays the number of memcache gets" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "gets", "1")
+ end
+
+ it "displays the number of memcache sets" do
+ CachePanel.record(:set, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "sets", "1")
+ end
+
+ it "displays the number of memcache deletes" do
+ CachePanel.record(:delete, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "deletes", "1")
+ end
+
+ it "displays the number of memcache get_multis" do
+ CachePanel.record(:get_multi, "user:1", "user:2") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "get_multis", "1")
+ end
+ end
+
+ describe "breakdown" do
+ it "displays each memcache operation" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_breakdown", "get")
+ end
+
+ it "displays the time for each memcache call" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_breakdown", "user:1", TIME_MS_REGEXP)
+ end
+
+ it "displays the keys for each memcache call" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_breakdown", "user:1", "get")
+ end
+ end
+ end
+
+ describe "expire_all" do
+ before do
+ header "rack-bug.secret_key", 'abc'
+ end
+
+ it "expires the cache keys" do
+ Rails.stub!(:cache => mock("cache"))
+ Rails.cache.should_receive(:delete).with("user:1")
+ Rails.cache.should_receive(:delete).with("user:2")
+ Rails.cache.should_receive(:delete).with("user:3")
+ Rails.cache.should_receive(:delete).with("user:4")
+
+ get "/__rack_bug__/delete_cache_list",
+ :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
+ :hash => "c367b76e0199c308862a3afd8fba32b8715e7976"
+ end
+
+ it "returns OK" do
+ Rails.stub!(:cache => mock("cache", :delete => nil))
+ response = get "/__rack_bug__/delete_cache_list",
+ :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
+ :hash => "c367b76e0199c308862a3afd8fba32b8715e7976"
+ response.should contain("OK")
+ end
+ end
+
+ describe "expire" do
+ before do
+ header "rack-bug.secret_key", 'abc'
+ end
+
+ it "expires the cache key" do
+ Rails.stub!(:cache => mock("cache"))
+ Rails.cache.should_receive(:delete).with("user:1")
+ get "/__rack_bug__/delete_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ end
+
+ it "returns OK" do
+ Rails.stub!(:cache => mock("cache", :delete => nil))
+ response = get "/__rack_bug__/delete_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ response.should contain("OK")
+ end
+ end
+
+ describe "view_cache" do
+ before do
+ header "rack-bug.secret_key", 'abc'
+ end
+
+ it "renders the cache key" do
+ Rails.stub!(:cache => mock("cache", :read => "cache body"))
+ response = get "/__rack_bug__/view_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ response.should contain("cache body")
+ end
+
+ it "renders non-String cache values properly" do
+ Rails.stub!(:cache => mock("cache", :read => [1, 2]))
+ response = get "/__rack_bug__/view_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ response.should contain("[1, 2]")
+ end
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/env_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/env_panel_spec.rb
new file mode 100644
index 0000000..93f97ee
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/env_panel_spec.rb
@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe EnvPanel do
+ before do
+ header "rack-bug.panel_classes", [EnvPanel]
+ end
+
+ describe "heading" do
+ it "displays 'Rack Env'" do
+ response = get "/"
+ response.should have_heading("Rack Env")
+ end
+ end
+
+ describe "content" do
+ it "displays the Rack environment" do
+ response = get "/"
+ response.should have_row("#env", "PATH_INFO", "/")
+ response.should have_row("#env", "REMOTE_ADDR", "127.0.0.1")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/log_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/log_panel_spec.rb
new file mode 100644
index 0000000..dff2564
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/log_panel_spec.rb
@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe LogPanel do
+ before do
+ LogPanel.reset
+ header "rack-bug.panel_classes", [LogPanel]
+ end
+
+ describe "heading" do
+ it "displays 'Log'" do
+ response = get "/"
+ response.should have_heading("Log")
+ end
+ end
+
+ describe "content" do
+ it "displays recorded log lines" do
+ LogPanel.record("This is a logged message")
+ response = get "/"
+ response.should contain("This is a logged message")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/memory_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/memory_panel_spec.rb
new file mode 100644
index 0000000..65f57cc
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/memory_panel_spec.rb
@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe MemoryPanel do
+ before do
+ header "rack-bug.panel_classes", [MemoryPanel]
+ end
+
+ describe "heading" do
+ it "displays the total memory" do
+ response = get "/"
+ response.should have_heading(/\d+ KB total/)
+ end
+
+ it "displays the memory change during the request" do
+ response = get "/"
+ response.should have_heading(/\d+ KB Î/)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/rails_info_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/rails_info_panel_spec.rb
new file mode 100644
index 0000000..c66b36f
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/rails_info_panel_spec.rb
@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe RailsInfoPanel do
+ before do
+ header "rack-bug.panel_classes", [RailsInfoPanel]
+ end
+
+ describe "heading" do
+ it "displays the Rails version" do
+ Rails.stub!(:version => "v2.3.0")
+ response = get "/"
+ response.should have_heading("Rails v2.3.0")
+ end
+ end
+
+ describe "content" do
+ it "displays the Rails::Info properties" do
+ Rails::Info.stub!(:properties => [["Name", "Value"]])
+ response = get "/"
+ response.should have_row("#rails_info", "Name", "Value")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/sql_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/sql_panel_spec.rb
new file mode 100644
index 0000000..0ba3699
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/sql_panel_spec.rb
@@ -0,0 +1,136 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe SQLPanel do
+ before do
+ SQLPanel.reset
+ header "rack-bug.panel_classes", [SQLPanel]
+ end
+
+ describe "heading" do
+ it "displays the total SQL query count" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_heading("1 Queries")
+ end
+
+ it "displays the total SQL time" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_heading(/Queries \(\d+\.\d{2}ms\)/)
+ end
+ end
+
+ describe "content" do
+ it "displays each executed SQL query" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_row("#sql", "SELECT NOW();")
+ end
+
+ it "displays the time of each executed SQL query" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_row("#sql", "SELECT NOW();", TIME_MS_REGEXP)
+ end
+ end
+
+ def stub_result(results = [[]])
+ columns = results.first
+ fields = columns.map { |c| stub("field", :name => c) }
+ rows = results[1..-1]
+
+ result = stub("result", :fetch_fields => fields)
+ result.stub!(:each).and_yield(*rows)
+ return result
+ end
+
+ def expect_query(sql, results)
+ conn = stub("connection")
+ ActiveRecord::Base.stub!(:connection => conn)
+ conn.should_receive(:execute).with(sql).and_return(stub_result(results))
+ end
+
+ describe "execute_sql" do
+ it "displays the query results" do
+ header "rack-bug.secret_key", "abc"
+ expect_query "SELECT username FROM users",
+ [["username"],
+ ["bryan"]]
+
+ response = get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ response.should contain("SELECT username FROM users")
+ response.should be_ok
+ end
+
+ it "is forbidden when the hash is missing or wrong" do
+ header "rack-bug.secret_key", 'abc'
+
+ lambda {
+ get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "foobar"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is nil" do
+ header "rack-bug.secret_key", nil
+
+ lambda {
+ get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is an empty string" do
+ header "rack-bug.secret_key", ""
+
+ lambda {
+ get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+ end
+
+ describe "explain_sql" do
+ it "displays the query explain plan" do
+ header "rack-bug.secret_key", "abc"
+ expect_query "EXPLAIN SELECT username FROM users",
+ [["table"],
+ ["users"]]
+
+ response = get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ response.should contain("SELECT username FROM users")
+ response.should be_ok
+ end
+
+ it "is forbidden when the hash is missing or wrong" do
+ header "rack-bug.secret_key", 'abc'
+
+ lambda {
+ get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "foobar"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is nil" do
+ header "rack-bug.secret_key", nil
+
+ lambda {
+ get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is an empty string" do
+ header "rack-bug.secret_key", ""
+
+ lambda {
+ get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/templates_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/templates_panel_spec.rb
new file mode 100644
index 0000000..916c196
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/templates_panel_spec.rb
@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe TemplatesPanel do
+ before do
+ TemplatesPanel.reset
+ header "rack-bug.panel_classes", [TemplatesPanel]
+ end
+
+ describe "heading" do
+ it "displays the total rendering time" do
+ response = get "/"
+ response.should have_heading("Templates: 0.00ms")
+ end
+ end
+
+ describe "content" do
+ it "displays the template paths" do
+ TemplatesPanel.record("users/show") { }
+ response = get "/"
+ response.should contain("users/show")
+ end
+
+ it "displays the template children" do
+ TemplatesPanel.record("users/show") do
+ TemplatesPanel.record("users/toolbar") { }
+ end
+
+ response = get "/"
+ response.should have_selector("li", :content => "users/show") do |li|
+ li.should contain("users/toolbar")
+ end
+ end
+
+ context "for templates that rendered templates" do
+ it "displays the total time" do
+ TemplatesPanel.record("users/show") do
+ TemplatesPanel.record("users/toolbar") { }
+ end
+
+ response = get "/"
+ response.should have_selector("li", :content => "users/show") do |li|
+ li.should contain(TIME_MS_REGEXP)
+ end
+ end
+
+ it "displays the exclusive time" do
+ TemplatesPanel.record("users/show") do
+ TemplatesPanel.record("users/toolbar") { }
+ end
+
+ response = get "/"
+ response.should have_selector("li", :content => "users/show") do |li|
+ li.should contain(/\d\.\d{2} exclusive/)
+ end
+ end
+ end
+
+ context "for leaf templates" do
+ it "does not display the exclusive time" do
+ TemplatesPanel.record("users/show") { }
+
+ response = get "/"
+ response.should contain("users/show") do |li|
+ li.should_not contain("exclusive")
+ end
+ end
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/timer_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/timer_panel_spec.rb
new file mode 100644
index 0000000..014b243
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/timer_panel_spec.rb
@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe TimerPanel do
+ before do
+ header "rack-bug.panel_classes", [TimerPanel]
+ end
+
+ describe "heading" do
+ it "displays the elapsed time" do
+ response = get "/"
+ response.should have_heading(TIME_MS_REGEXP)
+ end
+ end
+
+ describe "content" do
+ it "displays the user CPU time" do
+ response = get "/"
+ response.should have_row("#timer", "User CPU time", TIME_MS_REGEXP)
+ end
+
+ it "displays the system CPU time" do
+ response = get "/"
+ response.should have_row("#timer", "System CPU time", TIME_MS_REGEXP)
+ end
+
+ it "displays the total CPU time" do
+ response = get "/"
+ response.should have_row("#timer", "Total CPU time", TIME_MS_REGEXP)
+ end
+
+ it "displays the elapsed time" do
+ response = get "/"
+ response.should have_row("#timer", "Elapsed time", TIME_MS_REGEXP)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/toolbar_spec.rb b/vendor/plugins/rack-bug/spec/rack/toolbar_spec.rb
new file mode 100644
index 0000000..153258c
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/toolbar_spec.rb
@@ -0,0 +1,100 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Rack::Bug do
+ it "inserts the Rack::Bug toolbar" do
+ response = get "/"
+ response.should contain("Rack::Bug")
+ end
+
+ it "updates the Content-Length" do
+ response = get "/"
+ response["Content-Length"].should == response.body.size.to_s
+ end
+
+ it "serves the Rack::Bug assets under /__rack_bug__/" do
+ response = get "/__rack_bug__/bug.css"
+ response.should be_ok
+ end
+
+ it "modifies HTML responses with a charset" do
+ response = get "/", :content_type => "application/xhtml+xml; charset=utf-8"
+ response.should contain("Rack::Bug")
+ end
+
+ it "does not modify XMLHttpRequest responses" do
+ response = get "/", {}, { :xhr => true }
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "modifies XHTML responses" do
+ response = get "/", :content_type => "application/xhtml+xml"
+ response.should contain("Rack::Bug")
+ end
+
+ it "does not modify non-HTML responses" do
+ response = get "/", :content_type => "text/csv"
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "does not modify redirects" do
+ response = get "/redirect"
+ response.body.should == ""
+ end
+
+ it "does not modify server errors" do
+ response = get "/error"
+ response.should_not contain("Rack::Bug")
+ end
+
+ context "configured to intercept redirects" do
+ it "inserts the Rack::Bug toolbar for redirects" do
+ response = get "/redirect", {}, "rack-bug.intercept_redirects" => true
+ response.should contain("Location: /")
+ end
+ end
+
+ context "configured with an IP address restriction" do
+ before do
+ header "rack-bug.ip_masks", [IPAddr.new("127.0.0.1/255.255.255.0")]
+ end
+
+ it "inserts the Rack::Bug toolbar when the IP matches" do
+ response = get "/", {}, "REMOTE_ADDR" => "127.0.0.2"
+ response.should contain("Rack::Bug")
+ end
+
+ it "is disabled when the IP doesn't match" do
+ response = get "/", {}, "REMOTE_ADDR" => "128.0.0.1"
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "doesn't use any panels" do
+ DummyPanel.should_not_receive(:new)
+ header "rack-bug.panel_classes", [DummyPanel]
+ get "/", {}, "REMOTE_ADDR" => "128.0.0.1"
+ end
+ end
+
+ context "configured with a password" do
+ before do
+ header "rack-bug.password", "secret"
+ end
+
+ it "inserts the Rack::Bug toolbar when the password matches" do
+ sha = "545049d1c5e2a6e0dfefd37f9a9e0beb95241935"
+ response = get "/", {}, :cookie => ["rack_bug_enabled=1", "rack_bug_password=#{sha}"]
+ response.should contain("Rack::Bug")
+ end
+
+ it "is disabled when the password doesn't match" do
+ response = get "/"
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "doesn't use any panels" do
+ DummyPanel.should_not_receive(:new)
+ header "rack-bug.panel_classes", [DummyPanel]
+ get "/"
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rcov.opts b/vendor/plugins/rack-bug/spec/rcov.opts
new file mode 100644
index 0000000..5b0aa15
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rcov.opts
@@ -0,0 +1 @@
+-x gems,spec\/
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/spec.opts b/vendor/plugins/rack-bug/spec/spec.opts
new file mode 100644
index 0000000..4e1e0d2
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/spec.opts
@@ -0,0 +1 @@
+--color
diff --git a/vendor/plugins/rack-bug/spec/spec_helper.rb b/vendor/plugins/rack-bug/spec/spec_helper.rb
new file mode 100644
index 0000000..8b1caa3
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/spec_helper.rb
@@ -0,0 +1,70 @@
+require "rubygems"
+require "spec"
+require "webrat"
+require "rack/test"
+
+$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__)) + '/lib'
+$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))
+
+require "rack/bug"
+require "spec/fixtures/sample_app"
+require "spec/fixtures/dummy_panel"
+
+module Rails
+ def self.version
+ ""
+ end
+
+ class Info
+ def self.properties
+ []
+ end
+ end
+end
+
+module ActiveRecord
+ class Base
+ end
+end
+
+Spec::Runner.configure do |config|
+ TIME_MS_REGEXP = /\d+\.\d{2}ms/
+
+ config.include Rack::Test::Methods
+ config.include Webrat::Matchers
+
+ config.before do
+ # This allows specs to record data outside the request
+ Rack::Bug.enable
+
+ # Set the cookie that triggers Rack::Bug under normal conditions
+ header :cookie, "rack_bug_enabled=1"
+ end
+
+ def app
+ Rack::Builder.new do
+ use Rack::Bug
+ run SampleApp.new
+ end
+ end
+
+ def have_row(container, key, value = nil)
+ simple_matcher("contain row") do |response|
+ if value
+ response.should have_selector("#{container} tr", :content => key) do |row|
+ row.should contain(value)
+ end
+ else
+ response.should have_selector("#{container} tr", :content => key)
+ end
+ end
+ end
+
+ def have_heading(text)
+ simple_matcher("have heading") do |response|
+ response.should have_selector("#rack_bug_toolbar li") do |heading|
+ heading.should contain(text)
+ end
+ end
+ end
+end
\ No newline at end of file
|
sunlightlabs/tcorps | 1ec6de5949062fdd98b6b180adb63512c026b399 | Took off password prompt from rack::bug JS | diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
index 3f93392..0643de5 100644
--- a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
@@ -1,215 +1,212 @@
/**
*
* Secure Hash Algorithm (SHA1)
* http://www.webtoolkit.info/
*
**/
document.SHA1 = function(msg) {
function rotate_left(n,s) {
var t4 = ( n<<s ) | (n>>>(32-s));
return t4;
};
function lsb_hex(val) {
var str="";
var i;
var vh;
var vl;
for( i=0; i<=6; i+=2 ) {
vh = (val>>>(i*4+4))&0x0f;
vl = (val>>>(i*4))&0x0f;
str += vh.toString(16) + vl.toString(16);
}
return str;
};
function cvt_hex(val) {
var str="";
var i;
var v;
for( i=7; i>=0; i-- ) {
v = (val>>>(i*4))&0x0f;
str += v.toString(16);
}
return str;
};
function Utf8Encode(string) {
string = string.replace(/\r\n/g,"\n");
var utftext = "";
for (var n = 0; n < string.length; n++) {
var c = string.charCodeAt(n);
if (c < 128) {
utftext += String.fromCharCode(c);
}
else if((c > 127) && (c < 2048)) {
utftext += String.fromCharCode((c >> 6) | 192);
utftext += String.fromCharCode((c & 63) | 128);
}
else {
utftext += String.fromCharCode((c >> 12) | 224);
utftext += String.fromCharCode(((c >> 6) & 63) | 128);
utftext += String.fromCharCode((c & 63) | 128);
}
}
return utftext;
};
var blockstart;
var i, j;
var W = new Array(80);
var H0 = 0x67452301;
var H1 = 0xEFCDAB89;
var H2 = 0x98BADCFE;
var H3 = 0x10325476;
var H4 = 0xC3D2E1F0;
var A, B, C, D, E;
var temp;
msg = Utf8Encode(msg);
var msg_len = msg.length;
var word_array = new Array();
for( i=0; i<msg_len-3; i+=4 ) {
j = msg.charCodeAt(i)<<24 | msg.charCodeAt(i+1)<<16 |
msg.charCodeAt(i+2)<<8 | msg.charCodeAt(i+3);
word_array.push( j );
}
switch( msg_len % 4 ) {
case 0:
i = 0x080000000;
break;
case 1:
i = msg.charCodeAt(msg_len-1)<<24 | 0x0800000;
break;
case 2:
i = msg.charCodeAt(msg_len-2)<<24 | msg.charCodeAt(msg_len-1)<<16 | 0x08000;
break;
case 3:
i = msg.charCodeAt(msg_len-3)<<24 | msg.charCodeAt(msg_len-2)<<16 | msg.charCodeAt(msg_len-1)<<8 | 0x80;
break;
}
word_array.push( i );
while( (word_array.length % 16) != 14 ) word_array.push( 0 );
word_array.push( msg_len>>>29 );
word_array.push( (msg_len<<3)&0x0ffffffff );
for ( blockstart=0; blockstart<word_array.length; blockstart+=16 ) {
for( i=0; i<16; i++ ) W[i] = word_array[blockstart+i];
for( i=16; i<=79; i++ ) W[i] = rotate_left(W[i-3] ^ W[i-8] ^ W[i-14] ^ W[i-16], 1);
A = H0;
B = H1;
C = H2;
D = H3;
E = H4;
for( i= 0; i<=19; i++ ) {
temp = (rotate_left(A,5) + ((B&C) | (~B&D)) + E + W[i] + 0x5A827999) & 0x0ffffffff;
E = D;
D = C;
C = rotate_left(B,30);
B = A;
A = temp;
}
for( i=20; i<=39; i++ ) {
temp = (rotate_left(A,5) + (B ^ C ^ D) + E + W[i] + 0x6ED9EBA1) & 0x0ffffffff;
E = D;
D = C;
C = rotate_left(B,30);
B = A;
A = temp;
}
for( i=40; i<=59; i++ ) {
temp = (rotate_left(A,5) + ((B&C) | (B&D) | (C&D)) + E + W[i] + 0x8F1BBCDC) & 0x0ffffffff;
E = D;
D = C;
C = rotate_left(B,30);
B = A;
A = temp;
}
for( i=60; i<=79; i++ ) {
temp = (rotate_left(A,5) + (B ^ C ^ D) + E + W[i] + 0xCA62C1D6) & 0x0ffffffff;
E = D;
D = C;
C = rotate_left(B,30);
B = A;
A = temp;
}
H0 = (H0 + A) & 0x0ffffffff;
H1 = (H1 + B) & 0x0ffffffff;
H2 = (H2 + C) & 0x0ffffffff;
H3 = (H3 + D) & 0x0ffffffff;
H4 = (H4 + E) & 0x0ffffffff;
}
var temp = cvt_hex(H0) + cvt_hex(H1) + cvt_hex(H2) + cvt_hex(H3) + cvt_hex(H4);
return temp.toLowerCase();
}
document.createCookie = function(name,value,days) {
if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString();
}
else
var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
document.readCookie = function(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(';');
for(var i=0;i < ca.length;i++) {
var c = ca[i];
while (c.charAt(0)==' ')
c = c.substring(1,c.length);
if (c.indexOf(nameEQ) == 0)
return c.substring(nameEQ.length,c.length);
}
return null;
}
document.eraseCookie = function(name) {
document.createCookie(name,"",-1);
}
document.rackBugBookmarklet = function() {
- if (document.readCookie('rack_bug_password')) {
- document.eraseCookie('rack_bug_password');
+ if (document.readCookie('rack_bug_enabled')) {
document.eraseCookie('rack_bug_enabled');
alert('Rack::Bug Disabled');
} else {
- var password = prompt("Rack::Bug password:", "")
- document.createCookie('rack_bug_password', document.SHA1('rack_bug:'+password));
document.createCookie('rack_bug_enabled', "1");
alert('Rack::Bug Enabled');
}
}
document.rackBugBookmarklet();
\ No newline at end of file
|
sunlightlabs/tcorps | 365841a884122614fabda72a826a32fe80494b4c | Added rack-bug into TCorps, with a slight monkeypatching of ruby-openid's monkeypatching of ActiveSupport's monkeypatching | diff --git a/config/environments/development.rb b/config/environments/development.rb
index 5883408..e9df74f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,21 +1,23 @@
# Settings specified here will take precedence over those in config/environment.rb
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
# since you don't have to restart the webserver when you make code changes.
config.cache_classes = false
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
# config.action_mailer.raise_delivery_errors = false
CLICKPASS_SITE_KEY = 'uvdTy5rmBP'
+SITE_HOST = 'localhost:3000'
-SITE_HOST = 'localhost:3000'
\ No newline at end of file
+
+config.middleware.use "Rack::Bug"
\ No newline at end of file
diff --git a/vendor/gems/ruby-openid-2.1.4/lib/openid/extras.rb b/vendor/gems/ruby-openid-2.1.4/lib/openid/extras.rb
index 0d9560a..a36a51d 100644
--- a/vendor/gems/ruby-openid-2.1.4/lib/openid/extras.rb
+++ b/vendor/gems/ruby-openid-2.1.4/lib/openid/extras.rb
@@ -1,11 +1,11 @@
class String
def starts_with?(other)
- head = self[0, other.length]
+ head = self[0, other.to_s.length]
head == other
end
def ends_with?(other)
- tail = self[-1 * other.length, other.length]
+ tail = self[-1 * other.to_s.length, other.to_s.length]
tail == other
end
end
diff --git a/vendor/plugins/rack-bug/History.txt b/vendor/plugins/rack-bug/History.txt
new file mode 100644
index 0000000..e69de29
diff --git a/vendor/plugins/rack-bug/MIT-LICENSE.txt b/vendor/plugins/rack-bug/MIT-LICENSE.txt
new file mode 100644
index 0000000..e2463e6
--- /dev/null
+++ b/vendor/plugins/rack-bug/MIT-LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2009 Bryan Helmkamp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/plugins/rack-bug/README.rdoc b/vendor/plugins/rack-bug/README.rdoc
new file mode 100644
index 0000000..516c1f7
--- /dev/null
+++ b/vendor/plugins/rack-bug/README.rdoc
@@ -0,0 +1,19 @@
+Usage:
+
+ script/plugin install git://github.com/brynary/rack-bug.git
+
+ # config/environments/development.rb
+ config.middleware.use "Rack::Bug"
+
+ # add bookmarklet to browser
+ open http://RAILS_APP/__rack_bug__/bookmarklet.html
+
+Thanks to:
+
+ Django debug toolbar
+ Rails footnotes
+ Rack's ShowException middleware
+ Oink
+ Rack::Cache
+
+
diff --git a/vendor/plugins/rack-bug/Rakefile b/vendor/plugins/rack-bug/Rakefile
new file mode 100644
index 0000000..6859c49
--- /dev/null
+++ b/vendor/plugins/rack-bug/Rakefile
@@ -0,0 +1,49 @@
+require "rubygems"
+require "rake/gempackagetask"
+require "rake/clean"
+require "spec/rake/spectask"
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
+
+require "rack/bug"
+
+Spec::Rake::SpecTask.new do |t|
+ t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+end
+
+desc "Run the specs"
+task :default => :spec
+
+desc "Run all specs in spec directory with RCov"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+ t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+ t.rcov = true
+ t.rcov_opts = lambda do
+ IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+ end
+end
+
+spec = Gem::Specification.new do |s|
+ s.name = "rack-bug"
+ s.version = Rack::Bug::VERSION
+ s.author = "Bryan Helmkamp"
+ s.email = "bryan" + "@" + "brynary.com"
+ s.homepage = "http://github.com/brynary/rack-bug"
+ s.summary = "Debugging toolbar for Rack applications implemented as middleware"
+ s.description = s.summary
+ s.files = %w[History.txt Rakefile README.rdoc] + Dir["lib/**/*"]
+
+ # rdoc
+ s.has_rdoc = true
+ s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
+end
+
+Rake::GemPackageTask.new(spec) do |package|
+ package.gem_spec = spec
+end
+
+desc 'Install the package as a gem.'
+task :install => [:clean, :package] do
+ gem = Dir['pkg/*.gem'].first
+ sh "sudo gem install --no-rdoc --no-ri --local #{gem}"
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug.rb b/vendor/plugins/rack-bug/lib/rack/bug.rb
new file mode 100644
index 0000000..ea36ebe
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug.rb
@@ -0,0 +1,26 @@
+require "rack"
+
+module Rack::Bug
+ require "rack/bug/toolbar"
+
+ VERSION = "0.1.0"
+
+ class SecurityError < StandardError
+ end
+
+ def self.enable
+ Thread.current["rack-bug.enabled"] = true
+ end
+
+ def self.disable
+ Thread.current["rack-bug.enabled"] = false
+ end
+
+ def self.enabled?
+ Thread.current["rack-bug.enabled"] == true
+ end
+
+ def self.new(*args, &block)
+ Toolbar.new(*args, &block)
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/options.rb b/vendor/plugins/rack-bug/lib/rack/bug/options.rb
new file mode 100644
index 0000000..8c12f40
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/options.rb
@@ -0,0 +1,90 @@
+module Rack::Bug
+
+ module Options
+ class << self
+ private
+ def option_accessor(key)
+ define_method(key) { || read_option(key) }
+ define_method("#{key}=") { |value| write_option(key, value) }
+ define_method("#{key}?") { || !! read_option(key) }
+ end
+ end
+
+ option_accessor :secret_key
+ option_accessor :ip_masks
+ option_accessor :password
+ option_accessor :panel_classes
+ option_accessor :intercept_redirects
+
+ # The underlying options Hash. During initialization (or outside of a
+ # request), this is a default values Hash. During a request, this is the
+ # Rack environment Hash. The default values Hash is merged in underneath
+ # the Rack environment before each request is processed.
+ def options
+ @env || @default_options
+ end
+
+ # Set multiple options.
+ def options=(hash={})
+ hash.each { |key,value| write_option(key, value) }
+ end
+
+ # Set an option. When +option+ is a Symbol, it is set in the Rack
+ # Environment as "rack-cache.option". When +option+ is a String, it
+ # exactly as specified. The +option+ argument may also be a Hash in
+ # which case each key/value pair is merged into the environment as if
+ # the #set method were called on each.
+ def set(option, value=self, &block)
+ if block_given?
+ write_option option, block
+ elsif value == self
+ self.options = option.to_hash
+ else
+ write_option option, value
+ end
+ end
+
+ private
+
+ def read_option(key)
+ options[option_name(key)]
+ end
+
+ def write_option(key, value)
+ options[option_name(key)] = value
+ end
+
+ def option_name(key)
+ case key
+ when Symbol ; "rack-bug.#{key}"
+ when String ; key
+ else raise ArgumentError
+ end
+ end
+
+ def initialize_options(options={})
+ @default_options = {
+ 'rack-bug.ip_masks' => [IPAddr.new("127.0.0.1")],
+ 'rack-bug.password' => nil,
+ 'rack-bug.verbose' => nil,
+ 'rack-bug.secret_key' => nil,
+ 'rack-bug.intercept_redirects' => false,
+ 'rack-bug.panels' => [],
+ 'rack-bug.panel_classes' => [
+ RailsInfoPanel,
+ TimerPanel,
+ RequestVariablesPanel,
+ EnvPanel,
+ SQLPanel,
+ ActiveRecordPanel,
+ CachePanel,
+ TemplatesPanel,
+ LogPanel,
+ MemoryPanel
+ ]
+ }
+ self.options = options
+ end
+
+ end
+end
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panel.rb
new file mode 100644
index 0000000..c895b1b
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panel.rb
@@ -0,0 +1,50 @@
+require "erb"
+
+module Rack
+ module Bug
+
+ # Panels are also Rack middleware
+ class Panel
+ include Render
+ include ERB::Util
+
+ attr_reader :request
+
+ def initialize(app)
+ if panel_app
+ @app = Rack::Cascade.new([panel_app, app])
+ else
+ @app = app
+ end
+ end
+
+ def call(env)
+ before(env)
+ status, headers, body = @app.call(env)
+ @request = Request.new(env)
+ after(env, status, headers, body)
+ env["rack-bug.panels"] << self
+ return [status, headers, body]
+ end
+
+ def panel_app
+ nil
+ end
+
+ def has_content?
+ true
+ end
+
+ def before(env)
+ end
+
+ def after(env, status, headers, body)
+ end
+
+ def render(template)
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panel_app.rb b/vendor/plugins/rack-bug/lib/rack/bug/panel_app.rb
new file mode 100644
index 0000000..18d731f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panel_app.rb
@@ -0,0 +1,35 @@
+require "rack/bug/params_signature"
+
+module Rack
+ module Bug
+
+ class PanelApp
+ include Rack::Bug::Render
+
+ attr_reader :request
+
+ def call(env)
+ @request = Rack::Request.new(env)
+ dispatch
+ end
+
+ def render_template(*args)
+ Rack::Response.new([super]).to_a
+ end
+
+ def params
+ @request.GET
+ end
+
+ def not_found
+ [404, {}, []]
+ end
+
+ def validate_params
+ ParamsSignature.new(request).validate!
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel.rb
new file mode 100644
index 0000000..425c3a4
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel.rb
@@ -0,0 +1,46 @@
+require "rack/bug/panel"
+require "rack/bug/panels/active_record_panel/activerecord_extensions"
+
+module Rack
+ module Bug
+
+ class ActiveRecordPanel < Panel
+
+ def self.record(class_name)
+ return unless Rack::Bug.enabled?
+ records[class_name] += 1
+ end
+
+ def self.reset
+ Thread.current["rack.bug.active_records"] = Hash.new { 0 }
+ end
+
+ def self.records
+ Thread.current["rack.bug.active_records"] ||= Hash.new { 0 }
+ end
+
+ def self.total
+ records.inject(0) do |memo, (key, value)|
+ memo + value
+ end
+ end
+
+ def name
+ "active_record"
+ end
+
+ def heading
+ "#{self.class.total} AR Objects"
+ end
+
+ def content
+ records = self.class.records.to_a.sort_by { |key, value| value }.reverse
+ result = render_template "panels/active_record", :records => records
+ self.class.reset
+ result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb
new file mode 100644
index 0000000..6256a1c
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb
@@ -0,0 +1,18 @@
+if defined?(ActiveRecord)
+ ActiveRecord::Base.class_eval do
+
+ if instance_methods.include?("after_initialize")
+ def after_initialize_with_rack_bug
+ Rack::Bug::ActiveRecordPanel.record(self.class.base_class.name)
+ after_initialize_without_rack_bug
+ end
+
+ alias_method_chain :after_initialize, :rack_bug
+ else
+ def after_initialize
+ Rack::Bug::ActiveRecordPanel.record(self.class.base_class.name)
+ end
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel.rb
new file mode 100644
index 0000000..fc96457
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel.rb
@@ -0,0 +1,51 @@
+require "rack/bug/panels/cache_panel/memcache_extension"
+
+module Rack
+ module Bug
+
+ class CachePanel < Panel
+
+ require "rack/bug/panels/cache_panel/stats"
+ require "rack/bug/panels/cache_panel/panel_app"
+
+ def self.record(method, *keys, &block)
+ return block.call unless Rack::Bug.enabled?
+
+ start_time = Time.now
+ result = block.call
+ total_time = Time.now - start_time
+ hit = result.nil? ? false : true
+ stats.record_call(method, total_time * 1_000, hit, *keys)
+ return result
+ end
+
+ def self.reset
+ Thread.current["rack.bug.cache"] = Stats.new
+ end
+
+ def self.stats
+ Thread.current["rack.bug.cache"] ||= Stats.new
+ end
+
+ def panel_app
+ PanelApp.new
+ end
+
+ def name
+ "cache"
+ end
+
+ def heading
+ "Cache: %.2fms (#{self.class.stats.queries.size} calls)" % self.class.stats.time
+ end
+
+ def content
+ result = render_template "panels/cache", :stats => self.class.stats
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/memcache_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/memcache_extension.rb
new file mode 100644
index 0000000..4a78377
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/memcache_extension.rb
@@ -0,0 +1,129 @@
+if defined?(Memcached)
+ Memcached.class_eval do
+
+ def set_with_rack_bug(key, value, timeout=0, marshal=true)
+ Rack::Bug::CachePanel.record(:set, key) do
+ set_without_rack_bug(key, value, timeout, marshal)
+ end
+ end
+
+ def add_with_rack_bug(key, value, timeout=0, marshal=true)
+ Rack::Bug::CachePanel.record(:add, key) do
+ add_without_rack_bug(key, value, timeout, marshal)
+ end
+ end
+
+ def increment_with_rack_bug(key, offset=1)
+ Rack::Bug::CachePanel.record(:incr, key) do
+ increment_without_rack_bug(key, offset)
+ end
+ end
+
+ def decrement_with_rack_bug(key, offset=1)
+ Rack::Bug::CachePanel.record(:decr, key) do
+ decrement_without_rack_bug(key, offset)
+ end
+ end
+
+ def replace_with_rack_bug(key, value, timeout=0, marshal=true)
+ Rack::Bug::CachePanel.record(:replace, key) do
+ replace_without_rack_bug(key, value, timeout, marshal)
+ end
+ end
+
+ def append_with_rack_bug(key, value)
+ Rack::Bug::CachePanel.record(:append, key) do
+ append_without_rack_bug(key, value)
+ end
+ end
+
+ def prepend_with_rack_bug(key, value)
+ Rack::Bug::CachePanel.record(:prepend, key) do
+ prepend_without_rack_bug(key, value)
+ end
+ end
+
+ def delete_with_rack_bug(key)
+ Rack::Bug::CachePanel.record(:delete, key) do
+ delete_without_rack_bug(key)
+ end
+ end
+
+ def get_with_rack_bug(keys, marshal=true)
+ if keys.is_a? Array
+ Rack::Bug::CachePanel.record(:get_multi, *keys) do
+ get_without_rack_bug(keys, marshal)
+ end
+ else
+ Rack::Bug::CachePanel.record(:get, keys) do
+ get_without_rack_bug(keys, marshal)
+ end
+ end
+ end
+
+ alias_method_chain :decrement, :rack_bug
+ alias_method_chain :get, :rack_bug
+ alias_method_chain :increment, :rack_bug
+ alias_method_chain :set, :rack_bug
+ alias_method_chain :add, :rack_bug
+ alias_method_chain :replace, :rack_bug
+ alias_method_chain :delete, :rack_bug
+ alias_method_chain :prepend, :rack_bug
+ alias_method_chain :append, :rack_bug
+ end
+end
+
+if defined?(MemCache)
+ MemCache.class_eval do
+
+ def decr_with_rack_bug(key, amount = 1)
+ Rack::Bug::CachePanel.record(:decr, key) do
+ decr_without_rack_bug(key, amount)
+ end
+ end
+
+ def get_with_rack_bug(key, raw = false)
+ Rack::Bug::CachePanel.record(:get, key) do
+ get_without_rack_bug(key, raw)
+ end
+ end
+
+ def get_multi_with_rack_bug(*keys)
+ Rack::Bug::CachePanel.record(:get_multi, *keys) do
+ get_multi_without_rack_bug(*keys)
+ end
+ end
+
+ def incr_with_rack_bug(key, amount = 1)
+ Rack::Bug::CachePanel.record(:incr, key) do
+ incr_without_rack_bug(key, amount)
+ end
+ end
+
+ def set_with_rack_bug(key, value, expiry = 0, raw = false)
+ Rack::Bug::CachePanel.record(:set, key) do
+ set_without_rack_bug(key, value, expiry, raw)
+ end
+ end
+
+ def add_with_rack_bug(key, value, expiry = 0, raw = false)
+ Rack::Bug::CachePanel.record(:add, key) do
+ add_without_rack_bug(key, value, expiry, raw)
+ end
+ end
+
+ def delete_with_rack_bug(key, expiry = 0)
+ Rack::Bug::CachePanel.record(:delete, key) do
+ delete_without_rack_bug(key, expiry)
+ end
+ end
+
+ alias_method_chain :decr, :rack_bug
+ alias_method_chain :get, :rack_bug
+ alias_method_chain :get_multi, :rack_bug
+ alias_method_chain :incr, :rack_bug
+ alias_method_chain :set, :rack_bug
+ alias_method_chain :add, :rack_bug
+ alias_method_chain :delete, :rack_bug
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/panel_app.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/panel_app.rb
new file mode 100644
index 0000000..1f767fd
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/panel_app.rb
@@ -0,0 +1,50 @@
+require "rack/bug/panel_app"
+
+module Rack
+ module Bug
+ class CachePanel
+
+ class PanelApp < ::Rack::Bug::PanelApp
+
+ def dispatch
+ case request.path_info
+ when "/__rack_bug__/view_cache" then view_cache
+ when "/__rack_bug__/delete_cache" then delete_cache
+ when "/__rack_bug__/delete_cache_list" then delete_cache_list
+ else not_found
+ end
+ end
+
+ def ok
+ Rack::Response.new(["OK"]).to_a
+ end
+
+ def view_cache
+ validate_params
+ render_template "panels/view_cache", :key => params["key"], :value => Rails.cache.read(params["key"])
+ end
+
+ def delete_cache
+ validate_params
+ raise "Rails not found... can't delete key" unless defined?(Rails)
+ Rails.cache.delete(params["key"])
+ ok
+ end
+
+ def delete_cache_list
+ validate_params
+ raise "Rails not found... can't delete key" unless defined?(Rails)
+
+ params.each do |key, value|
+ next unless key =~ /^keys_/
+ Rails.cache.delete(value)
+ end
+
+ ok
+ end
+
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/stats.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/stats.rb
new file mode 100644
index 0000000..769f7d5
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/cache_panel/stats.rb
@@ -0,0 +1,97 @@
+module Rack
+ module Bug
+ class CachePanel
+
+ class Stats
+ class Query
+ attr_reader :method, :time, :hit, :keys
+
+ def initialize(method, time, hit, keys)
+ @method = method
+ @time = time
+ @hit = hit
+ @keys = keys
+ end
+
+ def display_time
+ "%.2fms" % time
+ end
+
+ def display_keys
+ if keys.size == 1
+ keys.first
+ else
+ keys.join(", ")
+ end
+ end
+ end
+
+ attr_reader :calls
+ attr_reader :keys
+ attr_reader :queries
+
+ def initialize
+ @queries = []
+ @misses =
+ @calls = 0
+ @time = 0.0
+ @keys = []
+ end
+
+ def record_call(method, time, hit, *keys)
+ @queries << Query.new(method, time, hit, keys)
+ @calls += 1
+ @time += time
+ @keys += keys
+ end
+
+ def display_time
+ "%.2fms" % time
+ end
+
+ def time
+ @queries.inject(0) do |memo, query|
+ memo + query.time
+ end
+ end
+
+ def gets
+ count_queries(:get)
+ end
+
+ def sets
+ count_queries(:set)
+ end
+
+ def deletes
+ count_queries(:delete)
+ end
+
+ def get_multis
+ count_queries(:get_multi)
+ end
+
+ def hits
+ @queries.select { |q| [:get, :get_multi].include?(q.method) && q.hit }.size
+ end
+
+ def misses
+ @queries.select { |q| [:get, :get_multi].include?(q.method) && !q.hit }.size
+ end
+
+ def count_queries(method)
+ @queries.select { |q| q.method == method }.size
+ end
+
+ def queries_to_param
+ params = {}
+ @queries.each_with_index do |query, index|
+ params["keys_#{index}"] = query.keys.first
+ end
+ params
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/env_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/env_panel.rb
new file mode 100644
index 0000000..0945e44
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/env_panel.rb
@@ -0,0 +1,25 @@
+module Rack
+ module Bug
+
+ class EnvPanel < Panel
+
+ def name
+ "env"
+ end
+
+ def before(env)
+ @env = env
+ end
+
+ def heading
+ "Rack Env"
+ end
+
+ def content
+ render_template "panels/env", :env => @env
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel.rb
new file mode 100644
index 0000000..a143373
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel.rb
@@ -0,0 +1,39 @@
+require "rack/bug/panels/log_panel/rails_extension"
+
+module Rack
+ module Bug
+
+ class LogPanel < Panel
+
+ def self.record(message)
+ return unless Rack::Bug.enabled?
+ return unless message
+ logs << message.to_s
+ end
+
+ def self.reset
+ Thread.current["rack.bug.logs"] = []
+ end
+
+ def self.logs
+ Thread.current["rack.bug.logs"] ||= []
+ end
+
+ def name
+ "log"
+ end
+
+ def heading
+ "Log"
+ end
+
+ def content
+ result = render_template "panels/log", :logs => self.class.logs
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel/rails_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel/rails_extension.rb
new file mode 100644
index 0000000..1f7c5a6
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/log_panel/rails_extension.rb
@@ -0,0 +1,11 @@
+if defined?(Rails) && Rails.logger
+ module LoggingExtensions
+ def add(*args, &block)
+ logged_message = super
+ Rack::Bug::LogPanel.record(logged_message)
+ return logged_message
+ end
+ end
+
+ Rails.logger.extend LoggingExtensions
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/memory_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/memory_panel.rb
new file mode 100644
index 0000000..2fa70f4
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/memory_panel.rb
@@ -0,0 +1,27 @@
+#
+module Rack
+ module Bug
+
+ class MemoryPanel < Panel
+
+ def before(env)
+ @original_memory = `ps -o rss= -p #{$$}`.to_i
+ end
+
+ def after(env, status, headers, body)
+ @total_memory = `ps -o rss= -p #{$$}`.to_i
+ @memory_increase = @total_memory - @original_memory
+ end
+
+ def heading
+ "#{@memory_increase} KB Δ, #{@total_memory} KB total"
+ end
+
+ def has_content?
+ false
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/rails_info_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/rails_info_panel.rb
new file mode 100644
index 0000000..fb1eae7
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/rails_info_panel.rb
@@ -0,0 +1,23 @@
+module Rack
+ module Bug
+
+ class RailsInfoPanel < Panel
+
+ def name
+ "rails_info"
+ end
+
+ def heading
+ return unless defined?(Rails)
+ "Rails #{Rails.version}"
+ end
+
+ def content
+ return unless defined?(Rails)
+ render_template "panels/rails_info"
+ end
+
+ end
+
+ end
+end
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/request_variables_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/request_variables_panel.rb
new file mode 100644
index 0000000..df3338e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/request_variables_panel.rb
@@ -0,0 +1,25 @@
+module Rack
+ module Bug
+
+ class RequestVariablesPanel < Panel
+
+ def name
+ "request_variables"
+ end
+
+ def before(env)
+ @env = env
+ end
+
+ def heading
+ "Request Vars"
+ end
+
+ def content
+ render_template "panels/request_variables", :request => @request
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel.rb
new file mode 100644
index 0000000..114a747
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel.rb
@@ -0,0 +1,55 @@
+require "digest"
+
+module Rack
+ module Bug
+
+ class SQLPanel < Panel
+
+ require "rack/bug/panels/sql_panel/sql_extension"
+ require "rack/bug/panels/sql_panel/query"
+ require "rack/bug/panels/sql_panel/panel_app"
+
+ def panel_app
+ PanelApp.new
+ end
+
+ def self.record(sql, backtrace = [], &block)
+ return block.call unless Rack::Bug.enabled?
+
+ start_time = Time.now
+ result = block.call
+ queries << Query.new(sql, Time.now - start_time, backtrace)
+
+ return result
+ end
+
+ def self.reset
+ Thread.current["rack.test.queries"] = []
+ end
+
+ def self.queries
+ Thread.current["rack.test.queries"] ||= []
+ end
+
+ def self.total_time
+ (queries.inject(0) { |memo, query| memo + query.time}) * 1_000
+ end
+
+ def name
+ "sql"
+ end
+
+ def heading
+ "#{self.class.queries.size} Queries (%.2fms)" % self.class.total_time
+ end
+
+ def content
+ result = render_template "panels/sql", :queries => self.class.queries
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/panel_app.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/panel_app.rb
new file mode 100644
index 0000000..019206d
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/panel_app.rb
@@ -0,0 +1,39 @@
+require "rack/bug/panel_app"
+
+module Rack
+ module Bug
+ class SQLPanel
+
+ class PanelApp < ::Rack::Bug::PanelApp
+
+ def dispatch
+ case request.path_info
+ when "/__rack_bug__/explain_sql" then explain_sql
+ when "/__rack_bug__/profile_sql" then profile_sql
+ when "/__rack_bug__/execute_sql" then execute_sql
+ else not_found
+ end
+ end
+
+ def explain_sql
+ validate_params
+ query = Query.new(params["query"], params["time"].to_f)
+ render_template "panels/explain_sql", :result => query.explain, :query => query.sql, :time => query.time
+ end
+
+ def profile_sql
+ validate_params
+ query = Query.new(params["query"], params["time"].to_f)
+ render_template "panels/profile_sql", :result => query.profile, :query => query.sql, :time => query.time
+ end
+
+ def execute_sql
+ validate_params
+ query = Query.new(params["query"], params["time"].to_f)
+ render_template "panels/execute_sql", :result => query.execute, :query => query.sql, :time => query.time
+ end
+
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/query.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/query.rb
new file mode 100644
index 0000000..877ee51
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/query.rb
@@ -0,0 +1,73 @@
+module Rack
+ module Bug
+ class SQLPanel
+
+ class Query
+ attr_reader :sql
+ attr_reader :time
+ attr_reader :backtrace
+
+ def initialize(sql, time, backtrace = [])
+ @sql = sql
+ @time = time
+ @backtrace = backtrace
+ end
+
+ def human_time
+ "%.2fms" % (@time * 1_000)
+ end
+
+ def inspectable?
+ sql.strip =~ /^SELECT /i
+ end
+
+ def with_profiling
+ self.class.execute("SET PROFILING=1")
+ result = yield
+ self.class.execute("SET PROFILING=0")
+ return result
+ end
+
+ def explain
+ self.class.execute "EXPLAIN #{@sql}"
+ end
+
+ def profile
+ with_profiling do
+ execute
+ self.class.execute <<-SQL
+ SELECT *
+ FROM information_schema.profiling
+ WHERE query_id = (SELECT query_id FROM information_schema.profiling ORDER BY query_id DESC LIMIT 1)
+ SQL
+ end
+ end
+
+ def execute
+ self.class.execute(@sql)
+ end
+
+ def valid_hash?(secret_key, possible_hash)
+ hash = Digest::SHA1.hexdigest [secret_key, @sql].join(":")
+ possible_hash == hash
+ end
+
+ def self.execute(sql)
+ ActiveRecord::Base.connection.execute(sql)
+ end
+
+ def has_backtrace?
+ filtered_backtrace.any?
+ end
+
+ def filtered_backtrace
+ @filtered_backtrace ||= @backtrace.map { |l| l.to_s.strip }.select do |line|
+ line.starts_with?(Rails.root) &&
+ !line.starts_with?(Rails.root.join("vendor"))
+ end
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/sql_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/sql_extension.rb
new file mode 100644
index 0000000..387d080
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/sql_panel/sql_extension.rb
@@ -0,0 +1,11 @@
+if defined?(ActiveRecord)
+ ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+ def log_with_rack_bug(sql, name, &block)
+ Rack::Bug::SQLPanel.record(sql, Kernel.caller) do
+ log_without_rack_bug(sql, name, &block)
+ end
+ end
+
+ alias_method_chain :log, :rack_bug
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel.rb
new file mode 100644
index 0000000..1bdd792
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel.rb
@@ -0,0 +1,44 @@
+module Rack
+ module Bug
+
+ class TemplatesPanel < Panel
+
+ require "rack/bug/panels/templates_panel/actionview_extension"
+ require "rack/bug/panels/templates_panel/trace"
+ require "rack/bug/panels/templates_panel/rendering"
+
+ def self.record(template, &block)
+ return block.call unless Rack::Bug.enabled?
+
+ template_trace.start(template)
+ result = block.call
+ template_trace.finished(template)
+ return result
+ end
+
+ def self.reset
+ Thread.current["rack.bug.template_trace"] = Trace.new
+ end
+
+ def self.template_trace
+ Thread.current["rack.bug.template_trace"] ||= Trace.new
+ end
+
+ def name
+ "templates"
+ end
+
+ def heading
+ "Templates: %.2fms" % (self.class.template_trace.total_time * 1_000)
+ end
+
+ def content
+ result = render_template "panels/templates", :template_trace => self.class.template_trace
+ self.class.reset
+ return result
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/actionview_extension.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/actionview_extension.rb
new file mode 100644
index 0000000..f2e1238
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/actionview_extension.rb
@@ -0,0 +1,12 @@
+if defined?(ActionView) && defined?(ActionView::Template)
+ ActionView::Template.class_eval do
+
+ def render_template_with_rack_bug(*args, &block)
+ Rack::Bug::TemplatesPanel.record(path_without_format_and_extension) do
+ render_template_without_rack_bug(*args, &block)
+ end
+ end
+
+ alias_method_chain :render_template, :rack_bug
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/rendering.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/rendering.rb
new file mode 100644
index 0000000..561c5e6
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/rendering.rb
@@ -0,0 +1,67 @@
+module Rack
+ module Bug
+ class TemplatesPanel
+
+ class Rendering
+ attr_accessor :name
+ attr_accessor :start_time
+ attr_accessor :end_time
+ attr_accessor :parent
+ attr_reader :children
+
+
+ def initialize(name)
+ @name = name
+ @children = []
+ end
+
+ def add(rendering)
+ @children << rendering
+ rendering.parent = self
+ end
+
+ def time
+ @end_time - @start_time
+ end
+
+ def exclusive_time
+ time - child_time
+ end
+
+ def child_time
+ children.inject(0.0) { |memo, c| memo + c.time }
+ end
+
+ def time_summary
+ if children.any?
+ "%.2fms, %.2f exclusive" % [time * 1_000, exclusive_time * 1_000]
+ else
+ "%.2fms" % (time * 1_000)
+ end
+ end
+ def html
+ <<-HTML
+ <li>
+ <p>#{name} (#{time_summary})</p>
+
+ #{children_html}
+ </li>
+ HTML
+ end
+
+ def children_html
+ return "" unless children.any?
+
+ <<-HTML
+ <ul>#{joined_children_html}</ul>
+ HTML
+ end
+
+ def joined_children_html
+ children.map { |c| c.html }.join
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/trace.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/trace.rb
new file mode 100644
index 0000000..52740b9
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/templates_panel/trace.rb
@@ -0,0 +1,34 @@
+module Rack
+ module Bug
+ class TemplatesPanel
+
+ class Trace
+
+ def start(template_name)
+ rendering = Rendering.new(template_name)
+ rendering.start_time = Time.now
+ @current.add(rendering)
+ @current = rendering
+ end
+
+ def finished(template_name)
+ @current.end_time = Time.now
+ @current = @current.parent
+ end
+
+ def initialize
+ @current = root
+ end
+
+ def total_time
+ root.child_time
+ end
+
+ def root
+ @root ||= Rendering.new("root")
+ end
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/panels/timer_panel.rb b/vendor/plugins/rack-bug/lib/rack/bug/panels/timer_panel.rb
new file mode 100644
index 0000000..99a1918
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/panels/timer_panel.rb
@@ -0,0 +1,41 @@
+require "rack/bug/panel"
+require "benchmark"
+
+module Rack
+ module Bug
+
+ class TimerPanel < Panel
+
+ def name
+ "timer"
+ end
+
+ def call(env)
+ status, headers, body = nil
+ @times = Benchmark.measure do
+ status, headers, body = @app.call(env)
+ end
+
+ @measurements = [
+ ["User CPU time", "%.2fms" % (@times.utime * 1_000)],
+ ["System CPU time", "%.2fms" % (@times.stime * 1_000)],
+ ["Total CPU time", "%.2fms" % (@times.total * 1_000)],
+ ["Elapsed time", "%.2fms" % (@times.real * 1_000)]
+ ]
+
+ env["rack-bug.panels"] << self
+ return [status, headers, body]
+ end
+
+ def heading
+ "%.2fms" % (@times.real * 1_000)
+ end
+
+ def content
+ render_template "panels/timer", :measurements => @measurements
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/params_signature.rb b/vendor/plugins/rack-bug/lib/rack/bug/params_signature.rb
new file mode 100644
index 0000000..89ad80c
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/params_signature.rb
@@ -0,0 +1,65 @@
+require "digest"
+
+module Rack
+ module Bug
+
+ class ParamsSignature
+ extend ERB::Util
+
+ def self.sign(request, hash)
+ parts = []
+
+ hash.keys.sort.each do |key|
+ parts << "#{key}=#{u(hash[key])}"
+ end
+
+ signature = new(request).signature(hash)
+ parts << "hash=#{u(signature)}"
+
+ parts.join("&")
+ end
+
+ attr_reader :request
+
+ def initialize(request)
+ @request = request
+ end
+
+ def secret_key
+ @request.env['rack-bug.secret_key']
+ end
+
+ def secret_key_blank?
+ secret_key.nil? || secret_key == ""
+ end
+
+ def validate!
+ if secret_key_blank?
+ raise SecurityError.new("Missing secret key")
+ end
+
+ if secret_key_blank? || request.params["hash"] != signature(request.params)
+ raise SecurityError.new("Invalid query hash.")
+ end
+ end
+
+ def signature(params)
+ Digest::SHA1.hexdigest(signature_base(params))
+ end
+
+ def signature_base(params)
+ signature = []
+ signature << secret_key
+
+ params.keys.sort.each do |key|
+ next if key == "hash"
+ signature << params[key].to_s
+ end
+
+ signature.join(":")
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.html b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.html
new file mode 100644
index 0000000..aca6ad3
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.html
@@ -0,0 +1,10 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <br/><br/><br/>
+ <a href="javascript: (function(){var script=document.createElement('script'); script.src='/__rack_bug__/bookmarklet.js'; document.getElementsByTagName('head')[0].appendChild(script);})()">
+ Toggle Rack::Bug
+ </a>
+ </body>
+</html>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
new file mode 100644
index 0000000..3f93392
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bookmarklet.js
@@ -0,0 +1,215 @@
+/**
+*
+* Secure Hash Algorithm (SHA1)
+* http://www.webtoolkit.info/
+*
+**/
+
+document.SHA1 = function(msg) {
+ function rotate_left(n,s) {
+ var t4 = ( n<<s ) | (n>>>(32-s));
+ return t4;
+ };
+
+ function lsb_hex(val) {
+ var str="";
+ var i;
+ var vh;
+ var vl;
+
+ for( i=0; i<=6; i+=2 ) {
+ vh = (val>>>(i*4+4))&0x0f;
+ vl = (val>>>(i*4))&0x0f;
+ str += vh.toString(16) + vl.toString(16);
+ }
+ return str;
+ };
+
+ function cvt_hex(val) {
+ var str="";
+ var i;
+ var v;
+
+ for( i=7; i>=0; i-- ) {
+ v = (val>>>(i*4))&0x0f;
+ str += v.toString(16);
+ }
+ return str;
+ };
+
+
+ function Utf8Encode(string) {
+ string = string.replace(/\r\n/g,"\n");
+ var utftext = "";
+
+ for (var n = 0; n < string.length; n++) {
+
+ var c = string.charCodeAt(n);
+
+ if (c < 128) {
+ utftext += String.fromCharCode(c);
+ }
+ else if((c > 127) && (c < 2048)) {
+ utftext += String.fromCharCode((c >> 6) | 192);
+ utftext += String.fromCharCode((c & 63) | 128);
+ }
+ else {
+ utftext += String.fromCharCode((c >> 12) | 224);
+ utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+ utftext += String.fromCharCode((c & 63) | 128);
+ }
+
+ }
+
+ return utftext;
+ };
+
+ var blockstart;
+ var i, j;
+ var W = new Array(80);
+ var H0 = 0x67452301;
+ var H1 = 0xEFCDAB89;
+ var H2 = 0x98BADCFE;
+ var H3 = 0x10325476;
+ var H4 = 0xC3D2E1F0;
+ var A, B, C, D, E;
+ var temp;
+
+ msg = Utf8Encode(msg);
+
+ var msg_len = msg.length;
+
+ var word_array = new Array();
+ for( i=0; i<msg_len-3; i+=4 ) {
+ j = msg.charCodeAt(i)<<24 | msg.charCodeAt(i+1)<<16 |
+ msg.charCodeAt(i+2)<<8 | msg.charCodeAt(i+3);
+ word_array.push( j );
+ }
+
+ switch( msg_len % 4 ) {
+ case 0:
+ i = 0x080000000;
+ break;
+ case 1:
+ i = msg.charCodeAt(msg_len-1)<<24 | 0x0800000;
+ break;
+
+ case 2:
+ i = msg.charCodeAt(msg_len-2)<<24 | msg.charCodeAt(msg_len-1)<<16 | 0x08000;
+ break;
+
+ case 3:
+ i = msg.charCodeAt(msg_len-3)<<24 | msg.charCodeAt(msg_len-2)<<16 | msg.charCodeAt(msg_len-1)<<8 | 0x80;
+ break;
+ }
+
+ word_array.push( i );
+
+ while( (word_array.length % 16) != 14 ) word_array.push( 0 );
+
+ word_array.push( msg_len>>>29 );
+ word_array.push( (msg_len<<3)&0x0ffffffff );
+
+
+ for ( blockstart=0; blockstart<word_array.length; blockstart+=16 ) {
+
+ for( i=0; i<16; i++ ) W[i] = word_array[blockstart+i];
+ for( i=16; i<=79; i++ ) W[i] = rotate_left(W[i-3] ^ W[i-8] ^ W[i-14] ^ W[i-16], 1);
+
+ A = H0;
+ B = H1;
+ C = H2;
+ D = H3;
+ E = H4;
+
+ for( i= 0; i<=19; i++ ) {
+ temp = (rotate_left(A,5) + ((B&C) | (~B&D)) + E + W[i] + 0x5A827999) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ for( i=20; i<=39; i++ ) {
+ temp = (rotate_left(A,5) + (B ^ C ^ D) + E + W[i] + 0x6ED9EBA1) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ for( i=40; i<=59; i++ ) {
+ temp = (rotate_left(A,5) + ((B&C) | (B&D) | (C&D)) + E + W[i] + 0x8F1BBCDC) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ for( i=60; i<=79; i++ ) {
+ temp = (rotate_left(A,5) + (B ^ C ^ D) + E + W[i] + 0xCA62C1D6) & 0x0ffffffff;
+ E = D;
+ D = C;
+ C = rotate_left(B,30);
+ B = A;
+ A = temp;
+ }
+
+ H0 = (H0 + A) & 0x0ffffffff;
+ H1 = (H1 + B) & 0x0ffffffff;
+ H2 = (H2 + C) & 0x0ffffffff;
+ H3 = (H3 + D) & 0x0ffffffff;
+ H4 = (H4 + E) & 0x0ffffffff;
+
+ }
+
+ var temp = cvt_hex(H0) + cvt_hex(H1) + cvt_hex(H2) + cvt_hex(H3) + cvt_hex(H4);
+
+ return temp.toLowerCase();
+}
+
+document.createCookie = function(name,value,days) {
+ if (days) {
+ var date = new Date();
+ date.setTime(date.getTime()+(days*24*60*60*1000));
+ var expires = "; expires="+date.toGMTString();
+ }
+ else
+ var expires = "";
+ document.cookie = name+"="+value+expires+"; path=/";
+}
+
+document.readCookie = function(name) {
+ var nameEQ = name + "=";
+ var ca = document.cookie.split(';');
+ for(var i=0;i < ca.length;i++) {
+ var c = ca[i];
+ while (c.charAt(0)==' ')
+ c = c.substring(1,c.length);
+ if (c.indexOf(nameEQ) == 0)
+ return c.substring(nameEQ.length,c.length);
+ }
+ return null;
+}
+
+document.eraseCookie = function(name) {
+ document.createCookie(name,"",-1);
+}
+
+document.rackBugBookmarklet = function() {
+ if (document.readCookie('rack_bug_password')) {
+ document.eraseCookie('rack_bug_password');
+ document.eraseCookie('rack_bug_enabled');
+ alert('Rack::Bug Disabled');
+ } else {
+ var password = prompt("Rack::Bug password:", "")
+ document.createCookie('rack_bug_password', document.SHA1('rack_bug:'+password));
+ document.createCookie('rack_bug_enabled', "1");
+ alert('Rack::Bug Enabled');
+ }
+}
+
+document.rackBugBookmarklet();
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.css b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.css
new file mode 100644
index 0000000..cc62ea2
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.css
@@ -0,0 +1,186 @@
+#rack_bug {
+ color: #000;
+ float: none;
+ margin: 0;
+ padding: 0;
+ position: static;
+}
+
+#rack_bug a {
+ color: #f7c757;
+}
+#rack_bug a:hover {
+ color: #aaa;
+}
+
+#rack_bug_toolbar {
+ background: #326342;
+ height: 30px;
+ z-index: 100000000;
+ border-bottom: 2px solid #234f32;
+ position:absolute;
+ top:0;
+ left:0;
+ right:0;
+}
+
+.rack_bug_error #rack_bug_toolbar {
+ background: #ff0000;
+ color: #fff;
+ border: none;
+}
+
+.rack_bug_error #rack_bug_toolbar p {
+ margin-top: 6px;
+ margin-left: 15px;
+ font-weight: bold;
+ color: #fff;
+}
+
+#rack_bug_toolbar ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+#rack_bug_toolbar li {
+ color: #fff;
+ display: inline;
+ font-size: 11px;
+ font-weight: bold;
+ float: none;
+ height: 20px;
+ margin: 0;
+ padding: 0;
+ line-height: 30px;
+ position: relative;
+ width: auto;
+}
+#rack_bug_toolbar li a {
+ border-left: 1px solid #487858;
+ padding: 8px 9px 9px;
+}
+
+#rack_bug_toolbar li a:hover {
+ background: #487858;
+ color: #fff;
+}
+
+#rack_bug_toolbar li:last-child {
+ border-right: 1px solid #487858;
+}
+
+#rack_bug_toolbar #rb_debug_button {
+ color: #92ef3f;
+ padding-left: 20px;
+}
+
+#rack_bug .panel_content {
+ background: #2a5738;
+ border-bottom: 2px solid #234f32;
+ border-top: 2px solid #487858;
+ display: none;
+ position: absolute;
+ margin: 0;
+ padding: 10px;
+ top: 32px;
+ width: auto;
+ left: 0px;
+ right: 0px;
+ bottom: 5px;
+ color: black;
+ z-index: 1000000;
+ overflow: auto;
+}
+
+#rack_bug .panel_content p a,
+#rack_bug .panel_content dl a {
+ color: #40684c;
+}
+
+#rack_bug .panel_content p a:hover,
+#rack_bug .panel_content dl a:hover {
+ color: #92EF3F;
+}
+
+#rack_bug .panel_content h3 {
+ border-bottom: 1px solid #40684c;
+ color: #92ef3f;
+ padding: 0 0 5px;
+}
+
+#rack_bug .panel_content p {
+ padding: 0 5px;
+}
+
+#rack_bug .panel_content p,
+#rack_bug .panel_content table,
+#rack_bug .panel_content ol,
+#rack_bug .panel_content dl {
+ margin: 5px 0 15px;
+ background-color: #fff;
+}
+
+#rack_bug .panel_content ul {
+ padding: 10px 30px 10px 30px;
+ background-color: #fff;
+}
+
+#rack_bug .panel_content ul ul {
+ padding: 0;
+}
+
+#rack_bug .panel_content table {
+ width: 100%;
+ clear: both;
+}
+
+#rack_bug .panel_content table a {
+ color: #40684C;
+}
+
+#rack_bug .panel_content table th {
+ background-color: #9dcc49;
+ font-weight: bold;
+ color: #000;
+ font-size: 11px;
+ padding: 3px 7px 3px;
+ text-align: left;
+ cursor: pointer;
+ border-right: 1px solid #b9d977;
+}
+
+#rack_bug .panel_content table td {
+ padding: 5px 10px;
+ font-size: 11px;
+ background: #fff;
+ color: #000;
+ vertical-align: top;
+}
+#rack_bug .panel_content table tr.odd td {
+ background: #eee;
+}
+
+#rack_bug .panel_content .rack_bug_close {
+ float: right;
+ font-weight: bold;
+}
+
+#rack_bug .panel_content dt, #rack_bug .panel_content dd {
+ display: block;
+}
+
+#rack_bug .panel_content dd {
+ margin-left: 10px;
+}
+
+#rack_bug .panel_content table tr.odd td.rack_bug_spinner,
+#rack_bug .panel_content table tr.even td.rack_bug_spinner,
+#rack_bug .panel_content table td.rack_bug_spinner,
+#rack_bug .rack_bug_spinner {
+ background-image: url(/__rack_bug__/spinner.gif);
+ background-repeat: no-repeat;
+ background-position: center center;
+ text-indent: -3000px;
+ color: transparent;
+}
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.js
new file mode 100644
index 0000000..53cd8cf
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/bug.js
@@ -0,0 +1,69 @@
+var _$ = window.$;
+jQuery.noConflict();
+jQuery(function($) {
+ $.rackBug = function(data, klass) {
+ $.rackBug.init();
+ }
+ $.extend($.rackBug, {
+ init: function() {
+ var current = null;
+ $('#rack_bug ul.panels li a').click(function() {
+ current = $('#rack_bug #' + this.className);
+
+ if (current.is(':visible')) {
+ $(document).trigger('close.rackBug');
+ } else {
+ $('#rack_bug .panel_content').hide();
+ current.show();
+ $.rackBug.open();
+ }
+ return false;
+ });
+ $('#rack_bug a.remote_call').click(function() {
+ $('#rack_bug_debug_window').load(this.href, null, function() {
+ $('#rack_bug_debug_window a.back').click(function() {
+ $(this).parent().hide();
+ return false;
+ });
+ });
+ $('#rack_bug_debug_window').show();
+ return false;
+ });
+ $('#rack_bug a.reveal_backtrace').click(function() {
+ $(this).parents("tr").next().toggle();
+ return false;
+ });
+ $('#rack_bug a.rack_bug_close').click(function() {
+ $(document).trigger('close.rackBug');
+ return false;
+ });
+ },
+ open: function() {
+ $(document).bind('keydown.rackBug', function(e) {
+ if (e.keyCode == 27) {
+ $.rackBug.close();
+ }
+ });
+ },
+ toggle_content: function(elem) {
+ if (elem.is(':visible')) {
+ elem.hide();
+ } else {
+ elem.show();
+ }
+ },
+ close: function() {
+ $(document).trigger('close.rackBug');
+ return false;
+ }
+ });
+ $(document).bind('close.rackBug', function() {
+ $(document).unbind('keydown.rackBug');
+ $('.panel_content').hide();
+ });
+});
+
+jQuery(function() {
+ jQuery.rackBug();
+});
+$ = _$;
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js
new file mode 100644
index 0000000..9263574
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/jquery-1.3.2.js
@@ -0,0 +1,4376 @@
+/*!
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){
+
+var
+ // Will speed up references to window, and allows munging its name.
+ window = this,
+ // Will speed up references to undefined, and allows munging its name.
+ undefined,
+ // Map over jQuery in case of overwrite
+ _jQuery = window.jQuery,
+ // Map over the $ in case of overwrite
+ _$ = window.$,
+
+ jQuery = window.jQuery = window.$ = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ return new jQuery.fn.init( selector, context );
+ },
+
+ // A simple way to check for HTML strings or ID strings
+ // (both of which we optimize for)
+ quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
+ // Is it a simple selector
+ isSimple = /^.[^:#\[\.,]*$/;
+
+jQuery.fn = jQuery.prototype = {
+ init: function( selector, context ) {
+ // Make sure that a selection was provided
+ selector = selector || document;
+
+ // Handle $(DOMElement)
+ if ( selector.nodeType ) {
+ this[0] = selector;
+ this.length = 1;
+ this.context = selector;
+ return this;
+ }
+ // Handle HTML strings
+ if ( typeof selector === "string" ) {
+ // Are we dealing with HTML string or an ID?
+ var match = quickExpr.exec( selector );
+
+ // Verify a match, and that no context was specified for #id
+ if ( match && (match[1] || !context) ) {
+
+ // HANDLE: $(html) -> $(array)
+ if ( match[1] )
+ selector = jQuery.clean( [ match[1] ], context );
+
+ // HANDLE: $("#id")
+ else {
+ var elem = document.getElementById( match[3] );
+
+ // Handle the case where IE and Opera return items
+ // by name instead of ID
+ if ( elem && elem.id != match[3] )
+ return jQuery().find( selector );
+
+ // Otherwise, we inject the element directly into the jQuery object
+ var ret = jQuery( elem || [] );
+ ret.context = document;
+ ret.selector = selector;
+ return ret;
+ }
+
+ // HANDLE: $(expr, [context])
+ // (which is just equivalent to: $(content).find(expr)
+ } else
+ return jQuery( context ).find( selector );
+
+ // HANDLE: $(function)
+ // Shortcut for document ready
+ } else if ( jQuery.isFunction( selector ) )
+ return jQuery( document ).ready( selector );
+
+ // Make sure that old selector state is passed along
+ if ( selector.selector && selector.context ) {
+ this.selector = selector.selector;
+ this.context = selector.context;
+ }
+
+ return this.setArray(jQuery.isArray( selector ) ?
+ selector :
+ jQuery.makeArray(selector));
+ },
+
+ // Start with an empty selector
+ selector: "",
+
+ // The current version of jQuery being used
+ jquery: "1.3.2",
+
+ // The number of elements contained in the matched element set
+ size: function() {
+ return this.length;
+ },
+
+ // Get the Nth element in the matched element set OR
+ // Get the whole matched element set as a clean array
+ get: function( num ) {
+ return num === undefined ?
+
+ // Return a 'clean' array
+ Array.prototype.slice.call( this ) :
+
+ // Return just the object
+ this[ num ];
+ },
+
+ // Take an array of elements and push it onto the stack
+ // (returning the new matched element set)
+ pushStack: function( elems, name, selector ) {
+ // Build a new jQuery matched element set
+ var ret = jQuery( elems );
+
+ // Add the old object onto the stack (as a reference)
+ ret.prevObject = this;
+
+ ret.context = this.context;
+
+ if ( name === "find" )
+ ret.selector = this.selector + (this.selector ? " " : "") + selector;
+ else if ( name )
+ ret.selector = this.selector + "." + name + "(" + selector + ")";
+
+ // Return the newly-formed element set
+ return ret;
+ },
+
+ // Force the current matched set of elements to become
+ // the specified array of elements (destroying the stack in the process)
+ // You should use pushStack() in order to do this, but maintain the stack
+ setArray: function( elems ) {
+ // Resetting the length to 0, then using the native Array push
+ // is a super-fast way to populate an object with array-like properties
+ this.length = 0;
+ Array.prototype.push.apply( this, elems );
+
+ return this;
+ },
+
+ // Execute a callback for every element in the matched set.
+ // (You can seed the arguments with an array of args, but this is
+ // only used internally.)
+ each: function( callback, args ) {
+ return jQuery.each( this, callback, args );
+ },
+
+ // Determine the position of an element within
+ // the matched set of elements
+ index: function( elem ) {
+ // Locate the position of the desired element
+ return jQuery.inArray(
+ // If it receives a jQuery object, the first element is used
+ elem && elem.jquery ? elem[0] : elem
+ , this );
+ },
+
+ attr: function( name, value, type ) {
+ var options = name;
+
+ // Look for the case where we're accessing a style value
+ if ( typeof name === "string" )
+ if ( value === undefined )
+ return this[0] && jQuery[ type || "attr" ]( this[0], name );
+
+ else {
+ options = {};
+ options[ name ] = value;
+ }
+
+ // Check to see if we're setting style values
+ return this.each(function(i){
+ // Set all the styles
+ for ( name in options )
+ jQuery.attr(
+ type ?
+ this.style :
+ this,
+ name, jQuery.prop( this, options[ name ], type, i, name )
+ );
+ });
+ },
+
+ css: function( key, value ) {
+ // ignore negative width and height values
+ if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+ value = undefined;
+ return this.attr( key, value, "curCSS" );
+ },
+
+ text: function( text ) {
+ if ( typeof text !== "object" && text != null )
+ return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+
+ var ret = "";
+
+ jQuery.each( text || this, function(){
+ jQuery.each( this.childNodes, function(){
+ if ( this.nodeType != 8 )
+ ret += this.nodeType != 1 ?
+ this.nodeValue :
+ jQuery.fn.text( [ this ] );
+ });
+ });
+
+ return ret;
+ },
+
+ wrapAll: function( html ) {
+ if ( this[0] ) {
+ // The elements to wrap the target around
+ var wrap = jQuery( html, this[0].ownerDocument ).clone();
+
+ if ( this[0].parentNode )
+ wrap.insertBefore( this[0] );
+
+ wrap.map(function(){
+ var elem = this;
+
+ while ( elem.firstChild )
+ elem = elem.firstChild;
+
+ return elem;
+ }).append(this);
+ }
+
+ return this;
+ },
+
+ wrapInner: function( html ) {
+ return this.each(function(){
+ jQuery( this ).contents().wrapAll( html );
+ });
+ },
+
+ wrap: function( html ) {
+ return this.each(function(){
+ jQuery( this ).wrapAll( html );
+ });
+ },
+
+ append: function() {
+ return this.domManip(arguments, true, function(elem){
+ if (this.nodeType == 1)
+ this.appendChild( elem );
+ });
+ },
+
+ prepend: function() {
+ return this.domManip(arguments, true, function(elem){
+ if (this.nodeType == 1)
+ this.insertBefore( elem, this.firstChild );
+ });
+ },
+
+ before: function() {
+ return this.domManip(arguments, false, function(elem){
+ this.parentNode.insertBefore( elem, this );
+ });
+ },
+
+ after: function() {
+ return this.domManip(arguments, false, function(elem){
+ this.parentNode.insertBefore( elem, this.nextSibling );
+ });
+ },
+
+ end: function() {
+ return this.prevObject || jQuery( [] );
+ },
+
+ // For internal use only.
+ // Behaves like an Array's method, not like a jQuery method.
+ push: [].push,
+ sort: [].sort,
+ splice: [].splice,
+
+ find: function( selector ) {
+ if ( this.length === 1 ) {
+ var ret = this.pushStack( [], "find", selector );
+ ret.length = 0;
+ jQuery.find( selector, this[0], ret );
+ return ret;
+ } else {
+ return this.pushStack( jQuery.unique(jQuery.map(this, function(elem){
+ return jQuery.find( selector, elem );
+ })), "find", selector );
+ }
+ },
+
+ clone: function( events ) {
+ // Do the clone
+ var ret = this.map(function(){
+ if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+ // IE copies events bound via attachEvent when
+ // using cloneNode. Calling detachEvent on the
+ // clone will also remove the events from the orignal
+ // In order to get around this, we use innerHTML.
+ // Unfortunately, this means some modifications to
+ // attributes in IE that are actually only stored
+ // as properties will not be copied (such as the
+ // the name attribute on an input).
+ var html = this.outerHTML;
+ if ( !html ) {
+ var div = this.ownerDocument.createElement("div");
+ div.appendChild( this.cloneNode(true) );
+ html = div.innerHTML;
+ }
+
+ return jQuery.clean([html.replace(/ jQuery\d+="(?:\d+|null)"/g, "").replace(/^\s*/, "")])[0];
+ } else
+ return this.cloneNode(true);
+ });
+
+ // Copy the events from the original to the clone
+ if ( events === true ) {
+ var orig = this.find("*").andSelf(), i = 0;
+
+ ret.find("*").andSelf().each(function(){
+ if ( this.nodeName !== orig[i].nodeName )
+ return;
+
+ var events = jQuery.data( orig[i], "events" );
+
+ for ( var type in events ) {
+ for ( var handler in events[ type ] ) {
+ jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+ }
+ }
+
+ i++;
+ });
+ }
+
+ // Return the cloned set
+ return ret;
+ },
+
+ filter: function( selector ) {
+ return this.pushStack(
+ jQuery.isFunction( selector ) &&
+ jQuery.grep(this, function(elem, i){
+ return selector.call( elem, i );
+ }) ||
+
+ jQuery.multiFilter( selector, jQuery.grep(this, function(elem){
+ return elem.nodeType === 1;
+ }) ), "filter", selector );
+ },
+
+ closest: function( selector ) {
+ var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
+ closer = 0;
+
+ return this.map(function(){
+ var cur = this;
+ while ( cur && cur.ownerDocument ) {
+ if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
+ jQuery.data(cur, "closest", closer);
+ return cur;
+ }
+ cur = cur.parentNode;
+ closer++;
+ }
+ });
+ },
+
+ not: function( selector ) {
+ if ( typeof selector === "string" )
+ // test special case where just one selector is passed in
+ if ( isSimple.test( selector ) )
+ return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector );
+ else
+ selector = jQuery.multiFilter( selector, this );
+
+ var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
+ return this.filter(function() {
+ return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
+ });
+ },
+
+ add: function( selector ) {
+ return this.pushStack( jQuery.unique( jQuery.merge(
+ this.get(),
+ typeof selector === "string" ?
+ jQuery( selector ) :
+ jQuery.makeArray( selector )
+ )));
+ },
+
+ is: function( selector ) {
+ return !!selector && jQuery.multiFilter( selector, this ).length > 0;
+ },
+
+ hasClass: function( selector ) {
+ return !!selector && this.is( "." + selector );
+ },
+
+ val: function( value ) {
+ if ( value === undefined ) {
+ var elem = this[0];
+
+ if ( elem ) {
+ if( jQuery.nodeName( elem, 'option' ) )
+ return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+
+ // We need to handle select boxes special
+ if ( jQuery.nodeName( elem, "select" ) ) {
+ var index = elem.selectedIndex,
+ values = [],
+ options = elem.options,
+ one = elem.type == "select-one";
+
+ // Nothing was selected
+ if ( index < 0 )
+ return null;
+
+ // Loop through all the selected options
+ for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+ var option = options[ i ];
+
+ if ( option.selected ) {
+ // Get the specifc value for the option
+ value = jQuery(option).val();
+
+ // We don't need an array for one selects
+ if ( one )
+ return value;
+
+ // Multi-Selects return an array
+ values.push( value );
+ }
+ }
+
+ return values;
+ }
+
+ // Everything else, we just grab the value
+ return (elem.value || "").replace(/\r/g, "");
+
+ }
+
+ return undefined;
+ }
+
+ if ( typeof value === "number" )
+ value += '';
+
+ return this.each(function(){
+ if ( this.nodeType != 1 )
+ return;
+
+ if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
+ this.checked = (jQuery.inArray(this.value, value) >= 0 ||
+ jQuery.inArray(this.name, value) >= 0);
+
+ else if ( jQuery.nodeName( this, "select" ) ) {
+ var values = jQuery.makeArray(value);
+
+ jQuery( "option", this ).each(function(){
+ this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
+ jQuery.inArray( this.text, values ) >= 0);
+ });
+
+ if ( !values.length )
+ this.selectedIndex = -1;
+
+ } else
+ this.value = value;
+ });
+ },
+
+ html: function( value ) {
+ return value === undefined ?
+ (this[0] ?
+ this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g, "") :
+ null) :
+ this.empty().append( value );
+ },
+
+ replaceWith: function( value ) {
+ return this.after( value ).remove();
+ },
+
+ eq: function( i ) {
+ return this.slice( i, +i + 1 );
+ },
+
+ slice: function() {
+ return this.pushStack( Array.prototype.slice.apply( this, arguments ),
+ "slice", Array.prototype.slice.call(arguments).join(",") );
+ },
+
+ map: function( callback ) {
+ return this.pushStack( jQuery.map(this, function(elem, i){
+ return callback.call( elem, i, elem );
+ }));
+ },
+
+ andSelf: function() {
+ return this.add( this.prevObject );
+ },
+
+ domManip: function( args, table, callback ) {
+ if ( this[0] ) {
+ var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(),
+ scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ),
+ first = fragment.firstChild;
+
+ if ( first )
+ for ( var i = 0, l = this.length; i < l; i++ )
+ callback.call( root(this[i], first), this.length > 1 || i > 0 ?
+ fragment.cloneNode(true) : fragment );
+
+ if ( scripts )
+ jQuery.each( scripts, evalScript );
+ }
+
+ return this;
+
+ function root( elem, cur ) {
+ return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ?
+ (elem.getElementsByTagName("tbody")[0] ||
+ elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+ elem;
+ }
+ }
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+function evalScript( i, elem ) {
+ if ( elem.src )
+ jQuery.ajax({
+ url: elem.src,
+ async: false,
+ dataType: "script"
+ });
+
+ else
+ jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+
+ if ( elem.parentNode )
+ elem.parentNode.removeChild( elem );
+}
+
+function now(){
+ return +new Date;
+}
+
+jQuery.extend = jQuery.fn.extend = function() {
+ // copy reference to target object
+ var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
+
+ // Handle a deep copy situation
+ if ( typeof target === "boolean" ) {
+ deep = target;
+ target = arguments[1] || {};
+ // skip the boolean and the target
+ i = 2;
+ }
+
+ // Handle case when target is a string or something (possible in deep copy)
+ if ( typeof target !== "object" && !jQuery.isFunction(target) )
+ target = {};
+
+ // extend jQuery itself if only one argument is passed
+ if ( length == i ) {
+ target = this;
+ --i;
+ }
+
+ for ( ; i < length; i++ )
+ // Only deal with non-null/undefined values
+ if ( (options = arguments[ i ]) != null )
+ // Extend the base object
+ for ( var name in options ) {
+ var src = target[ name ], copy = options[ name ];
+
+ // Prevent never-ending loop
+ if ( target === copy )
+ continue;
+
+ // Recurse if we're merging object values
+ if ( deep && copy && typeof copy === "object" && !copy.nodeType )
+ target[ name ] = jQuery.extend( deep,
+ // Never move original objects, clone them
+ src || ( copy.length != null ? [ ] : { } )
+ , copy );
+
+ // Don't bring in undefined values
+ else if ( copy !== undefined )
+ target[ name ] = copy;
+
+ }
+
+ // Return the modified object
+ return target;
+};
+
+// exclude the following css properties to add px
+var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+ // cache defaultView
+ defaultView = document.defaultView || {},
+ toString = Object.prototype.toString;
+
+jQuery.extend({
+ noConflict: function( deep ) {
+ window.$ = _$;
+
+ if ( deep )
+ window.jQuery = _jQuery;
+
+ return jQuery;
+ },
+
+ // See test/unit/core.js for details concerning isFunction.
+ // Since version 1.3, DOM methods and functions like alert
+ // aren't supported. They return false on IE (#2968).
+ isFunction: function( obj ) {
+ return toString.call(obj) === "[object Function]";
+ },
+
+ isArray: function( obj ) {
+ return toString.call(obj) === "[object Array]";
+ },
+
+ // check if an element is in a (or is an) XML document
+ isXMLDoc: function( elem ) {
+ return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+ !!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument );
+ },
+
+ // Evalulates a script in a global context
+ globalEval: function( data ) {
+ if ( data && /\S/.test(data) ) {
+ // Inspired by code by Andrea Giammarchi
+ // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+ var head = document.getElementsByTagName("head")[0] || document.documentElement,
+ script = document.createElement("script");
+
+ script.type = "text/javascript";
+ if ( jQuery.support.scriptEval )
+ script.appendChild( document.createTextNode( data ) );
+ else
+ script.text = data;
+
+ // Use insertBefore instead of appendChild to circumvent an IE6 bug.
+ // This arises when a base node is used (#2709).
+ head.insertBefore( script, head.firstChild );
+ head.removeChild( script );
+ }
+ },
+
+ nodeName: function( elem, name ) {
+ return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+ },
+
+ // args is for internal usage only
+ each: function( object, callback, args ) {
+ var name, i = 0, length = object.length;
+
+ if ( args ) {
+ if ( length === undefined ) {
+ for ( name in object )
+ if ( callback.apply( object[ name ], args ) === false )
+ break;
+ } else
+ for ( ; i < length; )
+ if ( callback.apply( object[ i++ ], args ) === false )
+ break;
+
+ // A special, fast, case for the most common use of each
+ } else {
+ if ( length === undefined ) {
+ for ( name in object )
+ if ( callback.call( object[ name ], name, object[ name ] ) === false )
+ break;
+ } else
+ for ( var value = object[0];
+ i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
+ }
+
+ return object;
+ },
+
+ prop: function( elem, value, type, i, name ) {
+ // Handle executable functions
+ if ( jQuery.isFunction( value ) )
+ value = value.call( elem, i );
+
+ // Handle passing in a number to a CSS property
+ return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
+ value + "px" :
+ value;
+ },
+
+ className: {
+ // internal only, use addClass("class")
+ add: function( elem, classNames ) {
+ jQuery.each((classNames || "").split(/\s+/), function(i, className){
+ if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
+ elem.className += (elem.className ? " " : "") + className;
+ });
+ },
+
+ // internal only, use removeClass("class")
+ remove: function( elem, classNames ) {
+ if (elem.nodeType == 1)
+ elem.className = classNames !== undefined ?
+ jQuery.grep(elem.className.split(/\s+/), function(className){
+ return !jQuery.className.has( classNames, className );
+ }).join(" ") :
+ "";
+ },
+
+ // internal only, use hasClass("class")
+ has: function( elem, className ) {
+ return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+ }
+ },
+
+ // A method for quickly swapping in/out CSS properties to get correct calculations
+ swap: function( elem, options, callback ) {
+ var old = {};
+ // Remember the old values, and insert the new ones
+ for ( var name in options ) {
+ old[ name ] = elem.style[ name ];
+ elem.style[ name ] = options[ name ];
+ }
+
+ callback.call( elem );
+
+ // Revert the old values
+ for ( var name in options )
+ elem.style[ name ] = old[ name ];
+ },
+
+ css: function( elem, name, force, extra ) {
+ if ( name == "width" || name == "height" ) {
+ var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
+
+ function getWH() {
+ val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
+
+ if ( extra === "border" )
+ return;
+
+ jQuery.each( which, function() {
+ if ( !extra )
+ val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+ if ( extra === "margin" )
+ val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+ else
+ val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+ });
+ }
+
+ if ( elem.offsetWidth !== 0 )
+ getWH();
+ else
+ jQuery.swap( elem, props, getWH );
+
+ return Math.max(0, Math.round(val));
+ }
+
+ return jQuery.curCSS( elem, name, force );
+ },
+
+ curCSS: function( elem, name, force ) {
+ var ret, style = elem.style;
+
+ // We need to handle opacity special in IE
+ if ( name == "opacity" && !jQuery.support.opacity ) {
+ ret = jQuery.attr( style, "opacity" );
+
+ return ret == "" ?
+ "1" :
+ ret;
+ }
+
+ // Make sure we're using the right name for getting the float value
+ if ( name.match( /float/i ) )
+ name = styleFloat;
+
+ if ( !force && style && style[ name ] )
+ ret = style[ name ];
+
+ else if ( defaultView.getComputedStyle ) {
+
+ // Only "float" is needed here
+ if ( name.match( /float/i ) )
+ name = "float";
+
+ name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
+
+ var computedStyle = defaultView.getComputedStyle( elem, null );
+
+ if ( computedStyle )
+ ret = computedStyle.getPropertyValue( name );
+
+ // We should always get a number back from opacity
+ if ( name == "opacity" && ret == "" )
+ ret = "1";
+
+ } else if ( elem.currentStyle ) {
+ var camelCase = name.replace(/\-(\w)/g, function(all, letter){
+ return letter.toUpperCase();
+ });
+
+ ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+
+ // From the awesome hack by Dean Edwards
+ // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+ // If we're not dealing with a regular pixel number
+ // but a number that has a weird ending, we need to convert it to pixels
+ if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+ // Remember the original values
+ var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+ // Put in the new values to get a computed value out
+ elem.runtimeStyle.left = elem.currentStyle.left;
+ style.left = ret || 0;
+ ret = style.pixelLeft + "px";
+
+ // Revert the changed values
+ style.left = left;
+ elem.runtimeStyle.left = rsLeft;
+ }
+ }
+
+ return ret;
+ },
+
+ clean: function( elems, context, fragment ) {
+ context = context || document;
+
+ // !context.createElement fails in IE with an error but returns typeof 'object'
+ if ( typeof context.createElement === "undefined" )
+ context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+
+ // If a single string is passed in and it's a single tag
+ // just do a createElement and skip the rest
+ if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) {
+ var match = /^<(\w+)\s*\/?>$/.exec(elems[0]);
+ if ( match )
+ return [ context.createElement( match[1] ) ];
+ }
+
+ var ret = [], scripts = [], div = context.createElement("div");
+
+ jQuery.each(elems, function(i, elem){
+ if ( typeof elem === "number" )
+ elem += '';
+
+ if ( !elem )
+ return;
+
+ // Convert html string into DOM nodes
+ if ( typeof elem === "string" ) {
+ // Fix "XHTML"-style tags in all browsers
+ elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
+ return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
+ all :
+ front + "></" + tag + ">";
+ });
+
+ // Trim whitespace, otherwise indexOf won't work as expected
+ var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase();
+
+ var wrap =
+ // option or optgroup
+ !tags.indexOf("<opt") &&
+ [ 1, "<select multiple='multiple'>", "</select>" ] ||
+
+ !tags.indexOf("<leg") &&
+ [ 1, "<fieldset>", "</fieldset>" ] ||
+
+ tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+ [ 1, "<table>", "</table>" ] ||
+
+ !tags.indexOf("<tr") &&
+ [ 2, "<table><tbody>", "</tbody></table>" ] ||
+
+ // <thead> matched above
+ (!tags.indexOf("<td") || !tags.indexOf("<th")) &&
+ [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
+
+ !tags.indexOf("<col") &&
+ [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
+
+ // IE can't serialize <link> and <script> tags normally
+ !jQuery.support.htmlSerialize &&
+ [ 1, "div<div>", "</div>" ] ||
+
+ [ 0, "", "" ];
+
+ // Go to html and back, then peel off extra wrappers
+ div.innerHTML = wrap[1] + elem + wrap[2];
+
+ // Move to the right depth
+ while ( wrap[0]-- )
+ div = div.lastChild;
+
+ // Remove IE's autoinserted <tbody> from table fragments
+ if ( !jQuery.support.tbody ) {
+
+ // String was a <table>, *may* have spurious <tbody>
+ var hasBody = /<tbody/i.test(elem),
+ tbody = !tags.indexOf("<table") && !hasBody ?
+ div.firstChild && div.firstChild.childNodes :
+
+ // String was a bare <thead> or <tfoot>
+ wrap[1] == "<table>" && !hasBody ?
+ div.childNodes :
+ [];
+
+ for ( var j = tbody.length - 1; j >= 0 ; --j )
+ if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
+ tbody[ j ].parentNode.removeChild( tbody[ j ] );
+
+ }
+
+ // IE completely kills leading whitespace when innerHTML is used
+ if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) )
+ div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
+
+ elem = jQuery.makeArray( div.childNodes );
+ }
+
+ if ( elem.nodeType )
+ ret.push( elem );
+ else
+ ret = jQuery.merge( ret, elem );
+
+ });
+
+ if ( fragment ) {
+ for ( var i = 0; ret[i]; i++ ) {
+ if ( jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+ scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+ } else {
+ if ( ret[i].nodeType === 1 )
+ ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+ fragment.appendChild( ret[i] );
+ }
+ }
+
+ return scripts;
+ }
+
+ return ret;
+ },
+
+ attr: function( elem, name, value ) {
+ // don't set attributes on text and comment nodes
+ if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+ return undefined;
+
+ var notxml = !jQuery.isXMLDoc( elem ),
+ // Whether we are setting (or getting)
+ set = value !== undefined;
+
+ // Try to normalize/fix the name
+ name = notxml && jQuery.props[ name ] || name;
+
+ // Only do all the following if this is a node (faster for style)
+ // IE elem.getAttribute passes even for style
+ if ( elem.tagName ) {
+
+ // These attributes require special treatment
+ var special = /href|src|style/.test( name );
+
+ // Safari mis-reports the default selected property of a hidden option
+ // Accessing the parent's selectedIndex property fixes it
+ if ( name == "selected" && elem.parentNode )
+ elem.parentNode.selectedIndex;
+
+ // If applicable, access the attribute via the DOM 0 way
+ if ( name in elem && notxml && !special ) {
+ if ( set ){
+ // We can't allow the type property to be changed (since it causes problems in IE)
+ if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
+ throw "type property can't be changed";
+
+ elem[ name ] = value;
+ }
+
+ // browsers index elements by id/name on forms, give priority to attributes.
+ if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
+ return elem.getAttributeNode( name ).nodeValue;
+
+ // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+ // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+ if ( name == "tabIndex" ) {
+ var attributeNode = elem.getAttributeNode( "tabIndex" );
+ return attributeNode && attributeNode.specified
+ ? attributeNode.value
+ : elem.nodeName.match(/(button|input|object|select|textarea)/i)
+ ? 0
+ : elem.nodeName.match(/^(a|area)$/i) && elem.href
+ ? 0
+ : undefined;
+ }
+
+ return elem[ name ];
+ }
+
+ if ( !jQuery.support.style && notxml && name == "style" )
+ return jQuery.attr( elem.style, "cssText", value );
+
+ if ( set )
+ // convert the value to a string (all browsers do this but IE) see #1070
+ elem.setAttribute( name, "" + value );
+
+ var attr = !jQuery.support.hrefNormalized && notxml && special
+ // Some attributes require a special call on IE
+ ? elem.getAttribute( name, 2 )
+ : elem.getAttribute( name );
+
+ // Non-existent attributes return null, we normalize to undefined
+ return attr === null ? undefined : attr;
+ }
+
+ // elem is actually elem.style ... set the style
+
+ // IE uses filters for opacity
+ if ( !jQuery.support.opacity && name == "opacity" ) {
+ if ( set ) {
+ // IE has trouble with opacity if it does not have layout
+ // Force it by setting the zoom level
+ elem.zoom = 1;
+
+ // Set the alpha filter to set the opacity
+ elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
+ (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+ }
+
+ return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
+ (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ "";
+ }
+
+ name = name.replace(/-([a-z])/ig, function(all, letter){
+ return letter.toUpperCase();
+ });
+
+ if ( set )
+ elem[ name ] = value;
+
+ return elem[ name ];
+ },
+
+ trim: function( text ) {
+ return (text || "").replace( /^\s+|\s+$/g, "" );
+ },
+
+ makeArray: function( array ) {
+ var ret = [];
+
+ if( array != null ){
+ var i = array.length;
+ // The window, strings (and functions) also have 'length'
+ if( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval )
+ ret[0] = array;
+ else
+ while( i )
+ ret[--i] = array[i];
+ }
+
+ return ret;
+ },
+
+ inArray: function( elem, array ) {
+ for ( var i = 0, length = array.length; i < length; i++ )
+ // Use === because on IE, window == document
+ if ( array[ i ] === elem )
+ return i;
+
+ return -1;
+ },
+
+ merge: function( first, second ) {
+ // We have to loop this way because IE & Opera overwrite the length
+ // expando of getElementsByTagName
+ var i = 0, elem, pos = first.length;
+ // Also, we need to make sure that the correct elements are being returned
+ // (IE returns comment nodes in a '*' query)
+ if ( !jQuery.support.getAll ) {
+ while ( (elem = second[ i++ ]) != null )
+ if ( elem.nodeType != 8 )
+ first[ pos++ ] = elem;
+
+ } else
+ while ( (elem = second[ i++ ]) != null )
+ first[ pos++ ] = elem;
+
+ return first;
+ },
+
+ unique: function( array ) {
+ var ret = [], done = {};
+
+ try {
+
+ for ( var i = 0, length = array.length; i < length; i++ ) {
+ var id = jQuery.data( array[ i ] );
+
+ if ( !done[ id ] ) {
+ done[ id ] = true;
+ ret.push( array[ i ] );
+ }
+ }
+
+ } catch( e ) {
+ ret = array;
+ }
+
+ return ret;
+ },
+
+ grep: function( elems, callback, inv ) {
+ var ret = [];
+
+ // Go through the array, only saving the items
+ // that pass the validator function
+ for ( var i = 0, length = elems.length; i < length; i++ )
+ if ( !inv != !callback( elems[ i ], i ) )
+ ret.push( elems[ i ] );
+
+ return ret;
+ },
+
+ map: function( elems, callback ) {
+ var ret = [];
+
+ // Go through the array, translating each of the items to their
+ // new value (or values).
+ for ( var i = 0, length = elems.length; i < length; i++ ) {
+ var value = callback( elems[ i ], i );
+
+ if ( value != null )
+ ret[ ret.length ] = value;
+ }
+
+ return ret.concat.apply( [], ret );
+ }
+});
+
+// Use of jQuery.browser is deprecated.
+// It's included for backwards compatibility and plugins,
+// although they should work to migrate away.
+
+var userAgent = navigator.userAgent.toLowerCase();
+
+// Figure out what browser is being used
+jQuery.browser = {
+ version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
+ safari: /webkit/.test( userAgent ),
+ opera: /opera/.test( userAgent ),
+ msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
+ mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
+};
+
+jQuery.each({
+ parent: function(elem){return elem.parentNode;},
+ parents: function(elem){return jQuery.dir(elem,"parentNode");},
+ next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
+ prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
+ nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
+ prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
+ siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
+ children: function(elem){return jQuery.sibling(elem.firstChild);},
+ contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
+}, function(name, fn){
+ jQuery.fn[ name ] = function( selector ) {
+ var ret = jQuery.map( this, fn );
+
+ if ( selector && typeof selector == "string" )
+ ret = jQuery.multiFilter( selector, ret );
+
+ return this.pushStack( jQuery.unique( ret ), name, selector );
+ };
+});
+
+jQuery.each({
+ appendTo: "append",
+ prependTo: "prepend",
+ insertBefore: "before",
+ insertAfter: "after",
+ replaceAll: "replaceWith"
+}, function(name, original){
+ jQuery.fn[ name ] = function( selector ) {
+ var ret = [], insert = jQuery( selector );
+
+ for ( var i = 0, l = insert.length; i < l; i++ ) {
+ var elems = (i > 0 ? this.clone(true) : this).get();
+ jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+ ret = ret.concat( elems );
+ }
+
+ return this.pushStack( ret, name, selector );
+ };
+});
+
+jQuery.each({
+ removeAttr: function( name ) {
+ jQuery.attr( this, name, "" );
+ if (this.nodeType == 1)
+ this.removeAttribute( name );
+ },
+
+ addClass: function( classNames ) {
+ jQuery.className.add( this, classNames );
+ },
+
+ removeClass: function( classNames ) {
+ jQuery.className.remove( this, classNames );
+ },
+
+ toggleClass: function( classNames, state ) {
+ if( typeof state !== "boolean" )
+ state = !jQuery.className.has( this, classNames );
+ jQuery.className[ state ? "add" : "remove" ]( this, classNames );
+ },
+
+ remove: function( selector ) {
+ if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
+ // Prevent memory leaks
+ jQuery( "*", this ).add([this]).each(function(){
+ jQuery.event.remove(this);
+ jQuery.removeData(this);
+ });
+ if (this.parentNode)
+ this.parentNode.removeChild( this );
+ }
+ },
+
+ empty: function() {
+ // Remove element nodes and prevent memory leaks
+ jQuery(this).children().remove();
+
+ // Remove any remaining nodes
+ while ( this.firstChild )
+ this.removeChild( this.firstChild );
+ }
+}, function(name, fn){
+ jQuery.fn[ name ] = function(){
+ return this.each( fn, arguments );
+ };
+});
+
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+ return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}
+var expando = "jQuery" + now(), uuid = 0, windowData = {};
+
+jQuery.extend({
+ cache: {},
+
+ data: function( elem, name, data ) {
+ elem = elem == window ?
+ windowData :
+ elem;
+
+ var id = elem[ expando ];
+
+ // Compute a unique ID for the element
+ if ( !id )
+ id = elem[ expando ] = ++uuid;
+
+ // Only generate the data cache if we're
+ // trying to access or manipulate it
+ if ( name && !jQuery.cache[ id ] )
+ jQuery.cache[ id ] = {};
+
+ // Prevent overriding the named cache with undefined values
+ if ( data !== undefined )
+ jQuery.cache[ id ][ name ] = data;
+
+ // Return the named cache data, or the ID for the element
+ return name ?
+ jQuery.cache[ id ][ name ] :
+ id;
+ },
+
+ removeData: function( elem, name ) {
+ elem = elem == window ?
+ windowData :
+ elem;
+
+ var id = elem[ expando ];
+
+ // If we want to remove a specific section of the element's data
+ if ( name ) {
+ if ( jQuery.cache[ id ] ) {
+ // Remove the section of cache data
+ delete jQuery.cache[ id ][ name ];
+
+ // If we've removed all the data, remove the element's cache
+ name = "";
+
+ for ( name in jQuery.cache[ id ] )
+ break;
+
+ if ( !name )
+ jQuery.removeData( elem );
+ }
+
+ // Otherwise, we want to remove all of the element's data
+ } else {
+ // Clean up the element expando
+ try {
+ delete elem[ expando ];
+ } catch(e){
+ // IE has trouble directly removing the expando
+ // but it's ok with using removeAttribute
+ if ( elem.removeAttribute )
+ elem.removeAttribute( expando );
+ }
+
+ // Completely remove the data cache
+ delete jQuery.cache[ id ];
+ }
+ },
+ queue: function( elem, type, data ) {
+ if ( elem ){
+
+ type = (type || "fx") + "queue";
+
+ var q = jQuery.data( elem, type );
+
+ if ( !q || jQuery.isArray(data) )
+ q = jQuery.data( elem, type, jQuery.makeArray(data) );
+ else if( data )
+ q.push( data );
+
+ }
+ return q;
+ },
+
+ dequeue: function( elem, type ){
+ var queue = jQuery.queue( elem, type ),
+ fn = queue.shift();
+
+ if( !type || type === "fx" )
+ fn = queue[0];
+
+ if( fn !== undefined )
+ fn.call(elem);
+ }
+});
+
+jQuery.fn.extend({
+ data: function( key, value ){
+ var parts = key.split(".");
+ parts[1] = parts[1] ? "." + parts[1] : "";
+
+ if ( value === undefined ) {
+ var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+ if ( data === undefined && this.length )
+ data = jQuery.data( this[0], key );
+
+ return data === undefined && parts[1] ?
+ this.data( parts[0] ) :
+ data;
+ } else
+ return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+ jQuery.data( this, key, value );
+ });
+ },
+
+ removeData: function( key ){
+ return this.each(function(){
+ jQuery.removeData( this, key );
+ });
+ },
+ queue: function(type, data){
+ if ( typeof type !== "string" ) {
+ data = type;
+ type = "fx";
+ }
+
+ if ( data === undefined )
+ return jQuery.queue( this[0], type );
+
+ return this.each(function(){
+ var queue = jQuery.queue( this, type, data );
+
+ if( type == "fx" && queue.length == 1 )
+ queue[0].call(this);
+ });
+ },
+ dequeue: function(type){
+ return this.each(function(){
+ jQuery.dequeue( this, type );
+ });
+ }
+});/*!
+ * Sizzle CSS Selector Engine - v0.9.3
+ * Copyright 2009, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ * More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,
+ done = 0,
+ toString = Object.prototype.toString;
+
+var Sizzle = function(selector, context, results, seed) {
+ results = results || [];
+ context = context || document;
+
+ if ( context.nodeType !== 1 && context.nodeType !== 9 )
+ return [];
+
+ if ( !selector || typeof selector !== "string" ) {
+ return results;
+ }
+
+ var parts = [], m, set, checkSet, check, mode, extra, prune = true;
+
+ // Reset the position of the chunker regexp (start from head)
+ chunker.lastIndex = 0;
+
+ while ( (m = chunker.exec(selector)) !== null ) {
+ parts.push( m[1] );
+
+ if ( m[2] ) {
+ extra = RegExp.rightContext;
+ break;
+ }
+ }
+
+ if ( parts.length > 1 && origPOS.exec( selector ) ) {
+ if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+ set = posProcess( parts[0] + parts[1], context );
+ } else {
+ set = Expr.relative[ parts[0] ] ?
+ [ context ] :
+ Sizzle( parts.shift(), context );
+
+ while ( parts.length ) {
+ selector = parts.shift();
+
+ if ( Expr.relative[ selector ] )
+ selector += parts.shift();
+
+ set = posProcess( selector, set );
+ }
+ }
+ } else {
+ var ret = seed ?
+ { expr: parts.pop(), set: makeArray(seed) } :
+ Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, isXML(context) );
+ set = Sizzle.filter( ret.expr, ret.set );
+
+ if ( parts.length > 0 ) {
+ checkSet = makeArray(set);
+ } else {
+ prune = false;
+ }
+
+ while ( parts.length ) {
+ var cur = parts.pop(), pop = cur;
+
+ if ( !Expr.relative[ cur ] ) {
+ cur = "";
+ } else {
+ pop = parts.pop();
+ }
+
+ if ( pop == null ) {
+ pop = context;
+ }
+
+ Expr.relative[ cur ]( checkSet, pop, isXML(context) );
+ }
+ }
+
+ if ( !checkSet ) {
+ checkSet = set;
+ }
+
+ if ( !checkSet ) {
+ throw "Syntax error, unrecognized expression: " + (cur || selector);
+ }
+
+ if ( toString.call(checkSet) === "[object Array]" ) {
+ if ( !prune ) {
+ results.push.apply( results, checkSet );
+ } else if ( context.nodeType === 1 ) {
+ for ( var i = 0; checkSet[i] != null; i++ ) {
+ if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+ results.push( set[i] );
+ }
+ }
+ } else {
+ for ( var i = 0; checkSet[i] != null; i++ ) {
+ if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+ results.push( set[i] );
+ }
+ }
+ }
+ } else {
+ makeArray( checkSet, results );
+ }
+
+ if ( extra ) {
+ Sizzle( extra, context, results, seed );
+
+ if ( sortOrder ) {
+ hasDuplicate = false;
+ results.sort(sortOrder);
+
+ if ( hasDuplicate ) {
+ for ( var i = 1; i < results.length; i++ ) {
+ if ( results[i] === results[i-1] ) {
+ results.splice(i--, 1);
+ }
+ }
+ }
+ }
+ }
+
+ return results;
+};
+
+Sizzle.matches = function(expr, set){
+ return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+ var set, match;
+
+ if ( !expr ) {
+ return [];
+ }
+
+ for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+ var type = Expr.order[i], match;
+
+ if ( (match = Expr.match[ type ].exec( expr )) ) {
+ var left = RegExp.leftContext;
+
+ if ( left.substr( left.length - 1 ) !== "\\" ) {
+ match[1] = (match[1] || "").replace(/\\/g, "");
+ set = Expr.find[ type ]( match, context, isXML );
+ if ( set != null ) {
+ expr = expr.replace( Expr.match[ type ], "" );
+ break;
+ }
+ }
+ }
+ }
+
+ if ( !set ) {
+ set = context.getElementsByTagName("*");
+ }
+
+ return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+ var old = expr, result = [], curLoop = set, match, anyFound,
+ isXMLFilter = set && set[0] && isXML(set[0]);
+
+ while ( expr && set.length ) {
+ for ( var type in Expr.filter ) {
+ if ( (match = Expr.match[ type ].exec( expr )) != null ) {
+ var filter = Expr.filter[ type ], found, item;
+ anyFound = false;
+
+ if ( curLoop == result ) {
+ result = [];
+ }
+
+ if ( Expr.preFilter[ type ] ) {
+ match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+ if ( !match ) {
+ anyFound = found = true;
+ } else if ( match === true ) {
+ continue;
+ }
+ }
+
+ if ( match ) {
+ for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+ if ( item ) {
+ found = filter( item, match, i, curLoop );
+ var pass = not ^ !!found;
+
+ if ( inplace && found != null ) {
+ if ( pass ) {
+ anyFound = true;
+ } else {
+ curLoop[i] = false;
+ }
+ } else if ( pass ) {
+ result.push( item );
+ anyFound = true;
+ }
+ }
+ }
+ }
+
+ if ( found !== undefined ) {
+ if ( !inplace ) {
+ curLoop = result;
+ }
+
+ expr = expr.replace( Expr.match[ type ], "" );
+
+ if ( !anyFound ) {
+ return [];
+ }
+
+ break;
+ }
+ }
+ }
+
+ // Improper expression
+ if ( expr == old ) {
+ if ( anyFound == null ) {
+ throw "Syntax error, unrecognized expression: " + expr;
+ } else {
+ break;
+ }
+ }
+
+ old = expr;
+ }
+
+ return curLoop;
+};
+
+var Expr = Sizzle.selectors = {
+ order: [ "ID", "NAME", "TAG" ],
+ match: {
+ ID: /#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+ CLASS: /\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+ NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,
+ ATTR: /\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+ TAG: /^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,
+ CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+ POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+ PSEUDO: /:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
+ },
+ attrMap: {
+ "class": "className",
+ "for": "htmlFor"
+ },
+ attrHandle: {
+ href: function(elem){
+ return elem.getAttribute("href");
+ }
+ },
+ relative: {
+ "+": function(checkSet, part, isXML){
+ var isPartStr = typeof part === "string",
+ isTag = isPartStr && !/\W/.test(part),
+ isPartStrNotTag = isPartStr && !isTag;
+
+ if ( isTag && !isXML ) {
+ part = part.toUpperCase();
+ }
+
+ for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+ if ( (elem = checkSet[i]) ) {
+ while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+ checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ?
+ elem || false :
+ elem === part;
+ }
+ }
+
+ if ( isPartStrNotTag ) {
+ Sizzle.filter( part, checkSet, true );
+ }
+ },
+ ">": function(checkSet, part, isXML){
+ var isPartStr = typeof part === "string";
+
+ if ( isPartStr && !/\W/.test(part) ) {
+ part = isXML ? part : part.toUpperCase();
+
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ var parent = elem.parentNode;
+ checkSet[i] = parent.nodeName === part ? parent : false;
+ }
+ }
+ } else {
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ checkSet[i] = isPartStr ?
+ elem.parentNode :
+ elem.parentNode === part;
+ }
+ }
+
+ if ( isPartStr ) {
+ Sizzle.filter( part, checkSet, true );
+ }
+ }
+ },
+ "": function(checkSet, part, isXML){
+ var doneName = done++, checkFn = dirCheck;
+
+ if ( !part.match(/\W/) ) {
+ var nodeCheck = part = isXML ? part : part.toUpperCase();
+ checkFn = dirNodeCheck;
+ }
+
+ checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+ },
+ "~": function(checkSet, part, isXML){
+ var doneName = done++, checkFn = dirCheck;
+
+ if ( typeof part === "string" && !part.match(/\W/) ) {
+ var nodeCheck = part = isXML ? part : part.toUpperCase();
+ checkFn = dirNodeCheck;
+ }
+
+ checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+ }
+ },
+ find: {
+ ID: function(match, context, isXML){
+ if ( typeof context.getElementById !== "undefined" && !isXML ) {
+ var m = context.getElementById(match[1]);
+ return m ? [m] : [];
+ }
+ },
+ NAME: function(match, context, isXML){
+ if ( typeof context.getElementsByName !== "undefined" ) {
+ var ret = [], results = context.getElementsByName(match[1]);
+
+ for ( var i = 0, l = results.length; i < l; i++ ) {
+ if ( results[i].getAttribute("name") === match[1] ) {
+ ret.push( results[i] );
+ }
+ }
+
+ return ret.length === 0 ? null : ret;
+ }
+ },
+ TAG: function(match, context){
+ return context.getElementsByTagName(match[1]);
+ }
+ },
+ preFilter: {
+ CLASS: function(match, curLoop, inplace, result, not, isXML){
+ match = " " + match[1].replace(/\\/g, "") + " ";
+
+ if ( isXML ) {
+ return match;
+ }
+
+ for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+ if ( elem ) {
+ if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) {
+ if ( !inplace )
+ result.push( elem );
+ } else if ( inplace ) {
+ curLoop[i] = false;
+ }
+ }
+ }
+
+ return false;
+ },
+ ID: function(match){
+ return match[1].replace(/\\/g, "");
+ },
+ TAG: function(match, curLoop){
+ for ( var i = 0; curLoop[i] === false; i++ ){}
+ return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
+ },
+ CHILD: function(match){
+ if ( match[1] == "nth" ) {
+ // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+ var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+ match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||
+ !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+ // calculate the numbers (first)n+(last) including if they are negative
+ match[2] = (test[1] + (test[2] || 1)) - 0;
+ match[3] = test[3] - 0;
+ }
+
+ // TODO: Move to normal caching system
+ match[0] = done++;
+
+ return match;
+ },
+ ATTR: function(match, curLoop, inplace, result, not, isXML){
+ var name = match[1].replace(/\\/g, "");
+
+ if ( !isXML && Expr.attrMap[name] ) {
+ match[1] = Expr.attrMap[name];
+ }
+
+ if ( match[2] === "~=" ) {
+ match[4] = " " + match[4] + " ";
+ }
+
+ return match;
+ },
+ PSEUDO: function(match, curLoop, inplace, result, not){
+ if ( match[1] === "not" ) {
+ // If we're dealing with a complex expression, or a simple one
+ if ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) {
+ match[3] = Sizzle(match[3], null, null, curLoop);
+ } else {
+ var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+ if ( !inplace ) {
+ result.push.apply( result, ret );
+ }
+ return false;
+ }
+ } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+ return true;
+ }
+
+ return match;
+ },
+ POS: function(match){
+ match.unshift( true );
+ return match;
+ }
+ },
+ filters: {
+ enabled: function(elem){
+ return elem.disabled === false && elem.type !== "hidden";
+ },
+ disabled: function(elem){
+ return elem.disabled === true;
+ },
+ checked: function(elem){
+ return elem.checked === true;
+ },
+ selected: function(elem){
+ // Accessing this property makes selected-by-default
+ // options in Safari work properly
+ elem.parentNode.selectedIndex;
+ return elem.selected === true;
+ },
+ parent: function(elem){
+ return !!elem.firstChild;
+ },
+ empty: function(elem){
+ return !elem.firstChild;
+ },
+ has: function(elem, i, match){
+ return !!Sizzle( match[3], elem ).length;
+ },
+ header: function(elem){
+ return /h\d/i.test( elem.nodeName );
+ },
+ text: function(elem){
+ return "text" === elem.type;
+ },
+ radio: function(elem){
+ return "radio" === elem.type;
+ },
+ checkbox: function(elem){
+ return "checkbox" === elem.type;
+ },
+ file: function(elem){
+ return "file" === elem.type;
+ },
+ password: function(elem){
+ return "password" === elem.type;
+ },
+ submit: function(elem){
+ return "submit" === elem.type;
+ },
+ image: function(elem){
+ return "image" === elem.type;
+ },
+ reset: function(elem){
+ return "reset" === elem.type;
+ },
+ button: function(elem){
+ return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";
+ },
+ input: function(elem){
+ return /input|select|textarea|button/i.test(elem.nodeName);
+ }
+ },
+ setFilters: {
+ first: function(elem, i){
+ return i === 0;
+ },
+ last: function(elem, i, match, array){
+ return i === array.length - 1;
+ },
+ even: function(elem, i){
+ return i % 2 === 0;
+ },
+ odd: function(elem, i){
+ return i % 2 === 1;
+ },
+ lt: function(elem, i, match){
+ return i < match[3] - 0;
+ },
+ gt: function(elem, i, match){
+ return i > match[3] - 0;
+ },
+ nth: function(elem, i, match){
+ return match[3] - 0 == i;
+ },
+ eq: function(elem, i, match){
+ return match[3] - 0 == i;
+ }
+ },
+ filter: {
+ PSEUDO: function(elem, match, i, array){
+ var name = match[1], filter = Expr.filters[ name ];
+
+ if ( filter ) {
+ return filter( elem, i, match, array );
+ } else if ( name === "contains" ) {
+ return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;
+ } else if ( name === "not" ) {
+ var not = match[3];
+
+ for ( var i = 0, l = not.length; i < l; i++ ) {
+ if ( not[i] === elem ) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+ },
+ CHILD: function(elem, match){
+ var type = match[1], node = elem;
+ switch (type) {
+ case 'only':
+ case 'first':
+ while (node = node.previousSibling) {
+ if ( node.nodeType === 1 ) return false;
+ }
+ if ( type == 'first') return true;
+ node = elem;
+ case 'last':
+ while (node = node.nextSibling) {
+ if ( node.nodeType === 1 ) return false;
+ }
+ return true;
+ case 'nth':
+ var first = match[2], last = match[3];
+
+ if ( first == 1 && last == 0 ) {
+ return true;
+ }
+
+ var doneName = match[0],
+ parent = elem.parentNode;
+
+ if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+ var count = 0;
+ for ( node = parent.firstChild; node; node = node.nextSibling ) {
+ if ( node.nodeType === 1 ) {
+ node.nodeIndex = ++count;
+ }
+ }
+ parent.sizcache = doneName;
+ }
+
+ var diff = elem.nodeIndex - last;
+ if ( first == 0 ) {
+ return diff == 0;
+ } else {
+ return ( diff % first == 0 && diff / first >= 0 );
+ }
+ }
+ },
+ ID: function(elem, match){
+ return elem.nodeType === 1 && elem.getAttribute("id") === match;
+ },
+ TAG: function(elem, match){
+ return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;
+ },
+ CLASS: function(elem, match){
+ return (" " + (elem.className || elem.getAttribute("class")) + " ")
+ .indexOf( match ) > -1;
+ },
+ ATTR: function(elem, match){
+ var name = match[1],
+ result = Expr.attrHandle[ name ] ?
+ Expr.attrHandle[ name ]( elem ) :
+ elem[ name ] != null ?
+ elem[ name ] :
+ elem.getAttribute( name ),
+ value = result + "",
+ type = match[2],
+ check = match[4];
+
+ return result == null ?
+ type === "!=" :
+ type === "=" ?
+ value === check :
+ type === "*=" ?
+ value.indexOf(check) >= 0 :
+ type === "~=" ?
+ (" " + value + " ").indexOf(check) >= 0 :
+ !check ?
+ value && result !== false :
+ type === "!=" ?
+ value != check :
+ type === "^=" ?
+ value.indexOf(check) === 0 :
+ type === "$=" ?
+ value.substr(value.length - check.length) === check :
+ type === "|=" ?
+ value === check || value.substr(0, check.length + 1) === check + "-" :
+ false;
+ },
+ POS: function(elem, match, i, array){
+ var name = match[2], filter = Expr.setFilters[ name ];
+
+ if ( filter ) {
+ return filter( elem, i, match, array );
+ }
+ }
+ }
+};
+
+var origPOS = Expr.match.POS;
+
+for ( var type in Expr.match ) {
+ Expr.match[ type ] = RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+}
+
+var makeArray = function(array, results) {
+ array = Array.prototype.slice.call( array );
+
+ if ( results ) {
+ results.push.apply( results, array );
+ return results;
+ }
+
+ return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+try {
+ Array.prototype.slice.call( document.documentElement.childNodes );
+
+// Provide a fallback method if it does not work
+} catch(e){
+ makeArray = function(array, results) {
+ var ret = results || [];
+
+ if ( toString.call(array) === "[object Array]" ) {
+ Array.prototype.push.apply( ret, array );
+ } else {
+ if ( typeof array.length === "number" ) {
+ for ( var i = 0, l = array.length; i < l; i++ ) {
+ ret.push( array[i] );
+ }
+ } else {
+ for ( var i = 0; array[i]; i++ ) {
+ ret.push( array[i] );
+ }
+ }
+ }
+
+ return ret;
+ };
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+ sortOrder = function( a, b ) {
+ var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+ if ( ret === 0 ) {
+ hasDuplicate = true;
+ }
+ return ret;
+ };
+} else if ( "sourceIndex" in document.documentElement ) {
+ sortOrder = function( a, b ) {
+ var ret = a.sourceIndex - b.sourceIndex;
+ if ( ret === 0 ) {
+ hasDuplicate = true;
+ }
+ return ret;
+ };
+} else if ( document.createRange ) {
+ sortOrder = function( a, b ) {
+ var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+ aRange.selectNode(a);
+ aRange.collapse(true);
+ bRange.selectNode(b);
+ bRange.collapse(true);
+ var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+ if ( ret === 0 ) {
+ hasDuplicate = true;
+ }
+ return ret;
+ };
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+ // We're going to inject a fake input element with a specified name
+ var form = document.createElement("form"),
+ id = "script" + (new Date).getTime();
+ form.innerHTML = "<input name='" + id + "'/>";
+
+ // Inject it into the root element, check its status, and remove it quickly
+ var root = document.documentElement;
+ root.insertBefore( form, root.firstChild );
+
+ // The workaround has to do additional checks after a getElementById
+ // Which slows things down for other browsers (hence the branching)
+ if ( !!document.getElementById( id ) ) {
+ Expr.find.ID = function(match, context, isXML){
+ if ( typeof context.getElementById !== "undefined" && !isXML ) {
+ var m = context.getElementById(match[1]);
+ return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+ }
+ };
+
+ Expr.filter.ID = function(elem, match){
+ var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+ return elem.nodeType === 1 && node && node.nodeValue === match;
+ };
+ }
+
+ root.removeChild( form );
+})();
+
+(function(){
+ // Check to see if the browser returns only elements
+ // when doing getElementsByTagName("*")
+
+ // Create a fake element
+ var div = document.createElement("div");
+ div.appendChild( document.createComment("") );
+
+ // Make sure no comments are found
+ if ( div.getElementsByTagName("*").length > 0 ) {
+ Expr.find.TAG = function(match, context){
+ var results = context.getElementsByTagName(match[1]);
+
+ // Filter out possible comments
+ if ( match[1] === "*" ) {
+ var tmp = [];
+
+ for ( var i = 0; results[i]; i++ ) {
+ if ( results[i].nodeType === 1 ) {
+ tmp.push( results[i] );
+ }
+ }
+
+ results = tmp;
+ }
+
+ return results;
+ };
+ }
+
+ // Check to see if an attribute returns normalized href attributes
+ div.innerHTML = "<a href='#'></a>";
+ if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+ div.firstChild.getAttribute("href") !== "#" ) {
+ Expr.attrHandle.href = function(elem){
+ return elem.getAttribute("href", 2);
+ };
+ }
+})();
+
+if ( document.querySelectorAll ) (function(){
+ var oldSizzle = Sizzle, div = document.createElement("div");
+ div.innerHTML = "<p class='TEST'></p>";
+
+ // Safari can't handle uppercase or unicode characters when
+ // in quirks mode.
+ if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+ return;
+ }
+
+ Sizzle = function(query, context, extra, seed){
+ context = context || document;
+
+ // Only use querySelectorAll on non-XML documents
+ // (ID selectors don't work in non-HTML documents)
+ if ( !seed && context.nodeType === 9 && !isXML(context) ) {
+ try {
+ return makeArray( context.querySelectorAll(query), extra );
+ } catch(e){}
+ }
+
+ return oldSizzle(query, context, extra, seed);
+ };
+
+ Sizzle.find = oldSizzle.find;
+ Sizzle.filter = oldSizzle.filter;
+ Sizzle.selectors = oldSizzle.selectors;
+ Sizzle.matches = oldSizzle.matches;
+})();
+
+if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){
+ var div = document.createElement("div");
+ div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+ // Opera can't find a second classname (in 9.6)
+ if ( div.getElementsByClassName("e").length === 0 )
+ return;
+
+ // Safari caches class attributes, doesn't catch changes (in 3.2)
+ div.lastChild.className = "e";
+
+ if ( div.getElementsByClassName("e").length === 1 )
+ return;
+
+ Expr.order.splice(1, 0, "CLASS");
+ Expr.find.CLASS = function(match, context, isXML) {
+ if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+ return context.getElementsByClassName(match[1]);
+ }
+ };
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+ var sibDir = dir == "previousSibling" && !isXML;
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ if ( sibDir && elem.nodeType === 1 ){
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+ elem = elem[dir];
+ var match = false;
+
+ while ( elem ) {
+ if ( elem.sizcache === doneName ) {
+ match = checkSet[elem.sizset];
+ break;
+ }
+
+ if ( elem.nodeType === 1 && !isXML ){
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+
+ if ( elem.nodeName === cur ) {
+ match = elem;
+ break;
+ }
+
+ elem = elem[dir];
+ }
+
+ checkSet[i] = match;
+ }
+ }
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+ var sibDir = dir == "previousSibling" && !isXML;
+ for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+ var elem = checkSet[i];
+ if ( elem ) {
+ if ( sibDir && elem.nodeType === 1 ) {
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+ elem = elem[dir];
+ var match = false;
+
+ while ( elem ) {
+ if ( elem.sizcache === doneName ) {
+ match = checkSet[elem.sizset];
+ break;
+ }
+
+ if ( elem.nodeType === 1 ) {
+ if ( !isXML ) {
+ elem.sizcache = doneName;
+ elem.sizset = i;
+ }
+ if ( typeof cur !== "string" ) {
+ if ( elem === cur ) {
+ match = true;
+ break;
+ }
+
+ } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+ match = elem;
+ break;
+ }
+ }
+
+ elem = elem[dir];
+ }
+
+ checkSet[i] = match;
+ }
+ }
+}
+
+var contains = document.compareDocumentPosition ? function(a, b){
+ return a.compareDocumentPosition(b) & 16;
+} : function(a, b){
+ return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+ return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+ !!elem.ownerDocument && isXML( elem.ownerDocument );
+};
+
+var posProcess = function(selector, context){
+ var tmpSet = [], later = "", match,
+ root = context.nodeType ? [context] : context;
+
+ // Position selectors must be done after the filter
+ // And so must :not(positional) so we move all PSEUDOs to the end
+ while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+ later += match[0];
+ selector = selector.replace( Expr.match.PSEUDO, "" );
+ }
+
+ selector = Expr.relative[selector] ? selector + "*" : selector;
+
+ for ( var i = 0, l = root.length; i < l; i++ ) {
+ Sizzle( selector, root[i], tmpSet );
+ }
+
+ return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.filter = Sizzle.filter;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+
+Sizzle.selectors.filters.hidden = function(elem){
+ return elem.offsetWidth === 0 || elem.offsetHeight === 0;
+};
+
+Sizzle.selectors.filters.visible = function(elem){
+ return elem.offsetWidth > 0 || elem.offsetHeight > 0;
+};
+
+Sizzle.selectors.filters.animated = function(elem){
+ return jQuery.grep(jQuery.timers, function(fn){
+ return elem === fn.elem;
+ }).length;
+};
+
+jQuery.multiFilter = function( expr, elems, not ) {
+ if ( not ) {
+ expr = ":not(" + expr + ")";
+ }
+
+ return Sizzle.matches(expr, elems);
+};
+
+jQuery.dir = function( elem, dir ){
+ var matched = [], cur = elem[dir];
+ while ( cur && cur != document ) {
+ if ( cur.nodeType == 1 )
+ matched.push( cur );
+ cur = cur[dir];
+ }
+ return matched;
+};
+
+jQuery.nth = function(cur, result, dir, elem){
+ result = result || 1;
+ var num = 0;
+
+ for ( ; cur; cur = cur[dir] )
+ if ( cur.nodeType == 1 && ++num == result )
+ break;
+
+ return cur;
+};
+
+jQuery.sibling = function(n, elem){
+ var r = [];
+
+ for ( ; n; n = n.nextSibling ) {
+ if ( n.nodeType == 1 && n != elem )
+ r.push( n );
+ }
+
+ return r;
+};
+
+return;
+
+window.Sizzle = Sizzle;
+
+})();
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+ // Bind an event to an element
+ // Original by Dean Edwards
+ add: function(elem, types, handler, data) {
+ if ( elem.nodeType == 3 || elem.nodeType == 8 )
+ return;
+
+ // For whatever reason, IE has trouble passing the window object
+ // around, causing it to be cloned in the process
+ if ( elem.setInterval && elem != window )
+ elem = window;
+
+ // Make sure that the function being executed has a unique ID
+ if ( !handler.guid )
+ handler.guid = this.guid++;
+
+ // if data is passed, bind to handler
+ if ( data !== undefined ) {
+ // Create temporary function pointer to original handler
+ var fn = handler;
+
+ // Create unique handler function, wrapped around original handler
+ handler = this.proxy( fn );
+
+ // Store data in unique handler
+ handler.data = data;
+ }
+
+ // Init the element's event structure
+ var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
+ handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
+ // Handle the second event of a trigger and when
+ // an event is called after a page has unloaded
+ return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+ jQuery.event.handle.apply(arguments.callee.elem, arguments) :
+ undefined;
+ });
+ // Add elem as a property of the handle function
+ // This is to prevent a memory leak with non-native
+ // event in IE.
+ handle.elem = elem;
+
+ // Handle multiple events separated by a space
+ // jQuery(...).bind("mouseover mouseout", fn);
+ jQuery.each(types.split(/\s+/), function(index, type) {
+ // Namespaced event handlers
+ var namespaces = type.split(".");
+ type = namespaces.shift();
+ handler.type = namespaces.slice().sort().join(".");
+
+ // Get the current list of functions bound to this event
+ var handlers = events[type];
+
+ if ( jQuery.event.specialAll[type] )
+ jQuery.event.specialAll[type].setup.call(elem, data, namespaces);
+
+ // Init the event handler queue
+ if (!handlers) {
+ handlers = events[type] = {};
+
+ // Check for a special event handler
+ // Only use addEventListener/attachEvent if the special
+ // events handler returns false
+ if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem, data, namespaces) === false ) {
+ // Bind the global event handler to the element
+ if (elem.addEventListener)
+ elem.addEventListener(type, handle, false);
+ else if (elem.attachEvent)
+ elem.attachEvent("on" + type, handle);
+ }
+ }
+
+ // Add the function to the element's handler list
+ handlers[handler.guid] = handler;
+
+ // Keep track of which events have been used, for global triggering
+ jQuery.event.global[type] = true;
+ });
+
+ // Nullify elem to prevent memory leaks in IE
+ elem = null;
+ },
+
+ guid: 1,
+ global: {},
+
+ // Detach an event or set of events from an element
+ remove: function(elem, types, handler) {
+ // don't do events on text and comment nodes
+ if ( elem.nodeType == 3 || elem.nodeType == 8 )
+ return;
+
+ var events = jQuery.data(elem, "events"), ret, index;
+
+ if ( events ) {
+ // Unbind all events for the element
+ if ( types === undefined || (typeof types === "string" && types.charAt(0) == ".") )
+ for ( var type in events )
+ this.remove( elem, type + (types || "") );
+ else {
+ // types is actually an event object here
+ if ( types.type ) {
+ handler = types.handler;
+ types = types.type;
+ }
+
+ // Handle multiple events seperated by a space
+ // jQuery(...).unbind("mouseover mouseout", fn);
+ jQuery.each(types.split(/\s+/), function(index, type){
+ // Namespaced event handlers
+ var namespaces = type.split(".");
+ type = namespaces.shift();
+ var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
+
+ if ( events[type] ) {
+ // remove the given handler for the given type
+ if ( handler )
+ delete events[type][handler.guid];
+
+ // remove all handlers for the given type
+ else
+ for ( var handle in events[type] )
+ // Handle the removal of namespaced events
+ if ( namespace.test(events[type][handle].type) )
+ delete events[type][handle];
+
+ if ( jQuery.event.specialAll[type] )
+ jQuery.event.specialAll[type].teardown.call(elem, namespaces);
+
+ // remove generic event handler if no more handlers exist
+ for ( ret in events[type] ) break;
+ if ( !ret ) {
+ if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem, namespaces) === false ) {
+ if (elem.removeEventListener)
+ elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
+ else if (elem.detachEvent)
+ elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
+ }
+ ret = null;
+ delete events[type];
+ }
+ }
+ });
+ }
+
+ // Remove the expando if it's no longer used
+ for ( ret in events ) break;
+ if ( !ret ) {
+ var handle = jQuery.data( elem, "handle" );
+ if ( handle ) handle.elem = null;
+ jQuery.removeData( elem, "events" );
+ jQuery.removeData( elem, "handle" );
+ }
+ }
+ },
+
+ // bubbling is internal
+ trigger: function( event, data, elem, bubbling ) {
+ // Event object or event type
+ var type = event.type || event;
+
+ if( !bubbling ){
+ event = typeof event === "object" ?
+ // jQuery.Event object
+ event[expando] ? event :
+ // Object literal
+ jQuery.extend( jQuery.Event(type), event ) :
+ // Just the event type (string)
+ jQuery.Event(type);
+
+ if ( type.indexOf("!") >= 0 ) {
+ event.type = type = type.slice(0, -1);
+ event.exclusive = true;
+ }
+
+ // Handle a global trigger
+ if ( !elem ) {
+ // Don't bubble custom events when global (to avoid too much overhead)
+ event.stopPropagation();
+ // Only trigger if we've ever bound an event for it
+ if ( this.global[type] )
+ jQuery.each( jQuery.cache, function(){
+ if ( this.events && this.events[type] )
+ jQuery.event.trigger( event, data, this.handle.elem );
+ });
+ }
+
+ // Handle triggering a single element
+
+ // don't do events on text and comment nodes
+ if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 )
+ return undefined;
+
+ // Clean up in case it is reused
+ event.result = undefined;
+ event.target = elem;
+
+ // Clone the incoming data, if any
+ data = jQuery.makeArray(data);
+ data.unshift( event );
+ }
+
+ event.currentTarget = elem;
+
+ // Trigger the event, it is assumed that "handle" is a function
+ var handle = jQuery.data(elem, "handle");
+ if ( handle )
+ handle.apply( elem, data );
+
+ // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+ if ( (!elem[type] || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+ event.result = false;
+
+ // Trigger the native events (except for clicks on links)
+ if ( !bubbling && elem[type] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
+ this.triggered = true;
+ try {
+ elem[ type ]();
+ // prevent IE from throwing an error for some hidden elements
+ } catch (e) {}
+ }
+
+ this.triggered = false;
+
+ if ( !event.isPropagationStopped() ) {
+ var parent = elem.parentNode || elem.ownerDocument;
+ if ( parent )
+ jQuery.event.trigger(event, data, parent, true);
+ }
+ },
+
+ handle: function(event) {
+ // returned undefined or false
+ var all, handlers;
+
+ event = arguments[0] = jQuery.event.fix( event || window.event );
+ event.currentTarget = this;
+
+ // Namespaced event handlers
+ var namespaces = event.type.split(".");
+ event.type = namespaces.shift();
+
+ // Cache this now, all = true means, any handler
+ all = !namespaces.length && !event.exclusive;
+
+ var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
+
+ handlers = ( jQuery.data(this, "events") || {} )[event.type];
+
+ for ( var j in handlers ) {
+ var handler = handlers[j];
+
+ // Filter the functions by class
+ if ( all || namespace.test(handler.type) ) {
+ // Pass in a reference to the handler function itself
+ // So that we can later remove it
+ event.handler = handler;
+ event.data = handler.data;
+
+ var ret = handler.apply(this, arguments);
+
+ if( ret !== undefined ){
+ event.result = ret;
+ if ( ret === false ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ }
+
+ if( event.isImmediatePropagationStopped() )
+ break;
+
+ }
+ }
+ },
+
+ props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+ fix: function(event) {
+ if ( event[expando] )
+ return event;
+
+ // store a copy of the original event object
+ // and "clone" to set read-only properties
+ var originalEvent = event;
+ event = jQuery.Event( originalEvent );
+
+ for ( var i = this.props.length, prop; i; ){
+ prop = this.props[ --i ];
+ event[ prop ] = originalEvent[ prop ];
+ }
+
+ // Fix target property, if necessary
+ if ( !event.target )
+ event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+
+ // check if target is a textnode (safari)
+ if ( event.target.nodeType == 3 )
+ event.target = event.target.parentNode;
+
+ // Add relatedTarget, if necessary
+ if ( !event.relatedTarget && event.fromElement )
+ event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
+
+ // Calculate pageX/Y if missing and clientX/Y available
+ if ( event.pageX == null && event.clientX != null ) {
+ var doc = document.documentElement, body = document.body;
+ event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
+ event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
+ }
+
+ // Add which for key events
+ if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
+ event.which = event.charCode || event.keyCode;
+
+ // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+ if ( !event.metaKey && event.ctrlKey )
+ event.metaKey = event.ctrlKey;
+
+ // Add which for click: 1 == left; 2 == middle; 3 == right
+ // Note: button is not normalized, so don't use it
+ if ( !event.which && event.button )
+ event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+
+ return event;
+ },
+
+ proxy: function( fn, proxy ){
+ proxy = proxy || function(){ return fn.apply(this, arguments); };
+ // Set the guid of unique handler to the same of original handler, so it can be removed
+ proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
+ // So proxy can be declared as an argument
+ return proxy;
+ },
+
+ special: {
+ ready: {
+ // Make sure the ready event is setup
+ setup: bindReady,
+ teardown: function() {}
+ }
+ },
+
+ specialAll: {
+ live: {
+ setup: function( selector, namespaces ){
+ jQuery.event.add( this, namespaces[0], liveHandler );
+ },
+ teardown: function( namespaces ){
+ if ( namespaces.length ) {
+ var remove = 0, name = RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)");
+
+ jQuery.each( (jQuery.data(this, "events").live || {}), function(){
+ if ( name.test(this.type) )
+ remove++;
+ });
+
+ if ( remove < 1 )
+ jQuery.event.remove( this, namespaces[0], liveHandler );
+ }
+ }
+ }
+ }
+};
+
+jQuery.Event = function( src ){
+ // Allow instantiation without the 'new' keyword
+ if( !this.preventDefault )
+ return new jQuery.Event(src);
+
+ // Event object
+ if( src && src.type ){
+ this.originalEvent = src;
+ this.type = src.type;
+ // Event type
+ }else
+ this.type = src;
+
+ // timeStamp is buggy for some events on Firefox(#3843)
+ // So we won't rely on the native value
+ this.timeStamp = now();
+
+ // Mark it as fixed
+ this[expando] = true;
+};
+
+function returnFalse(){
+ return false;
+}
+function returnTrue(){
+ return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+ preventDefault: function() {
+ this.isDefaultPrevented = returnTrue;
+
+ var e = this.originalEvent;
+ if( !e )
+ return;
+ // if preventDefault exists run it on the original event
+ if (e.preventDefault)
+ e.preventDefault();
+ // otherwise set the returnValue property of the original event to false (IE)
+ e.returnValue = false;
+ },
+ stopPropagation: function() {
+ this.isPropagationStopped = returnTrue;
+
+ var e = this.originalEvent;
+ if( !e )
+ return;
+ // if stopPropagation exists run it on the original event
+ if (e.stopPropagation)
+ e.stopPropagation();
+ // otherwise set the cancelBubble property of the original event to true (IE)
+ e.cancelBubble = true;
+ },
+ stopImmediatePropagation:function(){
+ this.isImmediatePropagationStopped = returnTrue;
+ this.stopPropagation();
+ },
+ isDefaultPrevented: returnFalse,
+ isPropagationStopped: returnFalse,
+ isImmediatePropagationStopped: returnFalse
+};
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function(event) {
+ // Check if mouse(over|out) are still within the same parent element
+ var parent = event.relatedTarget;
+ // Traverse up the tree
+ while ( parent && parent != this )
+ try { parent = parent.parentNode; }
+ catch(e) { parent = this; }
+
+ if( parent != this ){
+ // set the correct event type
+ event.type = event.data;
+ // handle event if we actually just moused on to a non sub-element
+ jQuery.event.handle.apply( this, arguments );
+ }
+};
+
+jQuery.each({
+ mouseover: 'mouseenter',
+ mouseout: 'mouseleave'
+}, function( orig, fix ){
+ jQuery.event.special[ fix ] = {
+ setup: function(){
+ jQuery.event.add( this, orig, withinElement, fix );
+ },
+ teardown: function(){
+ jQuery.event.remove( this, orig, withinElement );
+ }
+ };
+});
+
+jQuery.fn.extend({
+ bind: function( type, data, fn ) {
+ return type == "unload" ? this.one(type, data, fn) : this.each(function(){
+ jQuery.event.add( this, type, fn || data, fn && data );
+ });
+ },
+
+ one: function( type, data, fn ) {
+ var one = jQuery.event.proxy( fn || data, function(event) {
+ jQuery(this).unbind(event, one);
+ return (fn || data).apply( this, arguments );
+ });
+ return this.each(function(){
+ jQuery.event.add( this, type, one, fn && data);
+ });
+ },
+
+ unbind: function( type, fn ) {
+ return this.each(function(){
+ jQuery.event.remove( this, type, fn );
+ });
+ },
+
+ trigger: function( type, data ) {
+ return this.each(function(){
+ jQuery.event.trigger( type, data, this );
+ });
+ },
+
+ triggerHandler: function( type, data ) {
+ if( this[0] ){
+ var event = jQuery.Event(type);
+ event.preventDefault();
+ event.stopPropagation();
+ jQuery.event.trigger( event, data, this[0] );
+ return event.result;
+ }
+ },
+
+ toggle: function( fn ) {
+ // Save reference to arguments for access in closure
+ var args = arguments, i = 1;
+
+ // link all the functions, so any of them can unbind this click handler
+ while( i < args.length )
+ jQuery.event.proxy( fn, args[i++] );
+
+ return this.click( jQuery.event.proxy( fn, function(event) {
+ // Figure out which function to execute
+ this.lastToggle = ( this.lastToggle || 0 ) % i;
+
+ // Make sure that clicks stop
+ event.preventDefault();
+
+ // and execute the function
+ return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+ }));
+ },
+
+ hover: function(fnOver, fnOut) {
+ return this.mouseenter(fnOver).mouseleave(fnOut);
+ },
+
+ ready: function(fn) {
+ // Attach the listeners
+ bindReady();
+
+ // If the DOM is already ready
+ if ( jQuery.isReady )
+ // Execute the function immediately
+ fn.call( document, jQuery );
+
+ // Otherwise, remember the function for later
+ else
+ // Add the function to the wait list
+ jQuery.readyList.push( fn );
+
+ return this;
+ },
+
+ live: function( type, fn ){
+ var proxy = jQuery.event.proxy( fn );
+ proxy.guid += this.selector + type;
+
+ jQuery(document).bind( liveConvert(type, this.selector), this.selector, proxy );
+
+ return this;
+ },
+
+ die: function( type, fn ){
+ jQuery(document).unbind( liveConvert(type, this.selector), fn ? { guid: fn.guid + this.selector + type } : null );
+ return this;
+ }
+});
+
+function liveHandler( event ){
+ var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"),
+ stop = true,
+ elems = [];
+
+ jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){
+ if ( check.test(fn.type) ) {
+ var elem = jQuery(event.target).closest(fn.data)[0];
+ if ( elem )
+ elems.push({ elem: elem, fn: fn });
+ }
+ });
+
+ elems.sort(function(a,b) {
+ return jQuery.data(a.elem, "closest") - jQuery.data(b.elem, "closest");
+ });
+
+ jQuery.each(elems, function(){
+ if ( this.fn.call(this.elem, event, this.fn.data) === false )
+ return (stop = false);
+ });
+
+ return stop;
+}
+
+function liveConvert(type, selector){
+ return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "|")].join(".");
+}
+
+jQuery.extend({
+ isReady: false,
+ readyList: [],
+ // Handle when the DOM is ready
+ ready: function() {
+ // Make sure that the DOM is not already loaded
+ if ( !jQuery.isReady ) {
+ // Remember that the DOM is ready
+ jQuery.isReady = true;
+
+ // If there are functions bound, to execute
+ if ( jQuery.readyList ) {
+ // Execute all of them
+ jQuery.each( jQuery.readyList, function(){
+ this.call( document, jQuery );
+ });
+
+ // Reset the list of functions
+ jQuery.readyList = null;
+ }
+
+ // Trigger any bound ready events
+ jQuery(document).triggerHandler("ready");
+ }
+ }
+});
+
+var readyBound = false;
+
+function bindReady(){
+ if ( readyBound ) return;
+ readyBound = true;
+
+ // Mozilla, Opera and webkit nightlies currently support this event
+ if ( document.addEventListener ) {
+ // Use the handy event callback
+ document.addEventListener( "DOMContentLoaded", function(){
+ document.removeEventListener( "DOMContentLoaded", arguments.callee, false );
+ jQuery.ready();
+ }, false );
+
+ // If IE event model is used
+ } else if ( document.attachEvent ) {
+ // ensure firing before onload,
+ // maybe late but safe also for iframes
+ document.attachEvent("onreadystatechange", function(){
+ if ( document.readyState === "complete" ) {
+ document.detachEvent( "onreadystatechange", arguments.callee );
+ jQuery.ready();
+ }
+ });
+
+ // If IE and not an iframe
+ // continually check to see if the document is ready
+ if ( document.documentElement.doScroll && window == window.top ) (function(){
+ if ( jQuery.isReady ) return;
+
+ try {
+ // If IE is used, use the trick by Diego Perini
+ // http://javascript.nwbox.com/IEContentLoaded/
+ document.documentElement.doScroll("left");
+ } catch( error ) {
+ setTimeout( arguments.callee, 0 );
+ return;
+ }
+
+ // and execute any waiting functions
+ jQuery.ready();
+ })();
+ }
+
+ // A fallback to window.onload, that will always work
+ jQuery.event.add( window, "load", jQuery.ready );
+}
+
+jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+ "mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave," +
+ "change,select,submit,keydown,keypress,keyup,error").split(","), function(i, name){
+
+ // Handle event binding
+ jQuery.fn[name] = function(fn){
+ return fn ? this.bind(name, fn) : this.trigger(name);
+ };
+});
+
+// Prevent memory leaks in IE
+// And prevent errors on refresh with events like mouseover in other browsers
+// Window isn't included so as not to unbind existing unload events
+jQuery( window ).bind( 'unload', function(){
+ for ( var id in jQuery.cache )
+ // Skip the window
+ if ( id != 1 && jQuery.cache[ id ].handle )
+ jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+});
+(function(){
+
+ jQuery.support = {};
+
+ var root = document.documentElement,
+ script = document.createElement("script"),
+ div = document.createElement("div"),
+ id = "script" + (new Date).getTime();
+
+ div.style.display = "none";
+ div.innerHTML = ' <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';
+
+ var all = div.getElementsByTagName("*"),
+ a = div.getElementsByTagName("a")[0];
+
+ // Can't get basic test support
+ if ( !all || !all.length || !a ) {
+ return;
+ }
+
+ jQuery.support = {
+ // IE strips leading whitespace when .innerHTML is used
+ leadingWhitespace: div.firstChild.nodeType == 3,
+
+ // Make sure that tbody elements aren't automatically inserted
+ // IE will insert them into empty tables
+ tbody: !div.getElementsByTagName("tbody").length,
+
+ // Make sure that you can get all elements in an <object> element
+ // IE 7 always returns no results
+ objectAll: !!div.getElementsByTagName("object")[0]
+ .getElementsByTagName("*").length,
+
+ // Make sure that link elements get serialized correctly by innerHTML
+ // This requires a wrapper element in IE
+ htmlSerialize: !!div.getElementsByTagName("link").length,
+
+ // Get the style information from getAttribute
+ // (IE uses .cssText insted)
+ style: /red/.test( a.getAttribute("style") ),
+
+ // Make sure that URLs aren't manipulated
+ // (IE normalizes it by default)
+ hrefNormalized: a.getAttribute("href") === "/a",
+
+ // Make sure that element opacity exists
+ // (IE uses filter instead)
+ opacity: a.style.opacity === "0.5",
+
+ // Verify style float existence
+ // (IE uses styleFloat instead of cssFloat)
+ cssFloat: !!a.style.cssFloat,
+
+ // Will be defined later
+ scriptEval: false,
+ noCloneEvent: true,
+ boxModel: null
+ };
+
+ script.type = "text/javascript";
+ try {
+ script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+ } catch(e){}
+
+ root.insertBefore( script, root.firstChild );
+
+ // Make sure that the execution of code works by injecting a script
+ // tag with appendChild/createTextNode
+ // (IE doesn't support this, fails, and uses .text instead)
+ if ( window[ id ] ) {
+ jQuery.support.scriptEval = true;
+ delete window[ id ];
+ }
+
+ root.removeChild( script );
+
+ if ( div.attachEvent && div.fireEvent ) {
+ div.attachEvent("onclick", function(){
+ // Cloning a node shouldn't copy over any
+ // bound event handlers (IE does this)
+ jQuery.support.noCloneEvent = false;
+ div.detachEvent("onclick", arguments.callee);
+ });
+ div.cloneNode(true).fireEvent("onclick");
+ }
+
+ // Figure out if the W3C box model works as expected
+ // document.body must exist before we can do this
+ jQuery(function(){
+ var div = document.createElement("div");
+ div.style.width = div.style.paddingLeft = "1px";
+
+ document.body.appendChild( div );
+ jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+ document.body.removeChild( div ).style.display = 'none';
+ });
+})();
+
+var styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat";
+
+jQuery.props = {
+ "for": "htmlFor",
+ "class": "className",
+ "float": styleFloat,
+ cssFloat: styleFloat,
+ styleFloat: styleFloat,
+ readonly: "readOnly",
+ maxlength: "maxLength",
+ cellspacing: "cellSpacing",
+ rowspan: "rowSpan",
+ tabindex: "tabIndex"
+};
+jQuery.fn.extend({
+ // Keep a copy of the old load
+ _load: jQuery.fn.load,
+
+ load: function( url, params, callback ) {
+ if ( typeof url !== "string" )
+ return this._load( url );
+
+ var off = url.indexOf(" ");
+ if ( off >= 0 ) {
+ var selector = url.slice(off, url.length);
+ url = url.slice(0, off);
+ }
+
+ // Default to a GET request
+ var type = "GET";
+
+ // If the second parameter was provided
+ if ( params )
+ // If it's a function
+ if ( jQuery.isFunction( params ) ) {
+ // We assume that it's the callback
+ callback = params;
+ params = null;
+
+ // Otherwise, build a param string
+ } else if( typeof params === "object" ) {
+ params = jQuery.param( params );
+ type = "POST";
+ }
+
+ var self = this;
+
+ // Request the remote document
+ jQuery.ajax({
+ url: url,
+ type: type,
+ dataType: "html",
+ data: params,
+ complete: function(res, status){
+ // If successful, inject the HTML into all the matched elements
+ if ( status == "success" || status == "notmodified" )
+ // See if a selector was specified
+ self.html( selector ?
+ // Create a dummy div to hold the results
+ jQuery("<div/>")
+ // inject the contents of the document in, removing the scripts
+ // to avoid any 'Permission Denied' errors in IE
+ .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+
+ // Locate the specified elements
+ .find(selector) :
+
+ // If not, just inject the full result
+ res.responseText );
+
+ if( callback )
+ self.each( callback, [res.responseText, status, res] );
+ }
+ });
+ return this;
+ },
+
+ serialize: function() {
+ return jQuery.param(this.serializeArray());
+ },
+ serializeArray: function() {
+ return this.map(function(){
+ return this.elements ? jQuery.makeArray(this.elements) : this;
+ })
+ .filter(function(){
+ return this.name && !this.disabled &&
+ (this.checked || /select|textarea/i.test(this.nodeName) ||
+ /text|hidden|password|search/i.test(this.type));
+ })
+ .map(function(i, elem){
+ var val = jQuery(this).val();
+ return val == null ? null :
+ jQuery.isArray(val) ?
+ jQuery.map( val, function(val, i){
+ return {name: elem.name, value: val};
+ }) :
+ {name: elem.name, value: val};
+ }).get();
+ }
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+ jQuery.fn[o] = function(f){
+ return this.bind(o, f);
+ };
+});
+
+var jsc = now();
+
+jQuery.extend({
+
+ get: function( url, data, callback, type ) {
+ // shift arguments if data argument was ommited
+ if ( jQuery.isFunction( data ) ) {
+ callback = data;
+ data = null;
+ }
+
+ return jQuery.ajax({
+ type: "GET",
+ url: url,
+ data: data,
+ success: callback,
+ dataType: type
+ });
+ },
+
+ getScript: function( url, callback ) {
+ return jQuery.get(url, null, callback, "script");
+ },
+
+ getJSON: function( url, data, callback ) {
+ return jQuery.get(url, data, callback, "json");
+ },
+
+ post: function( url, data, callback, type ) {
+ if ( jQuery.isFunction( data ) ) {
+ callback = data;
+ data = {};
+ }
+
+ return jQuery.ajax({
+ type: "POST",
+ url: url,
+ data: data,
+ success: callback,
+ dataType: type
+ });
+ },
+
+ ajaxSetup: function( settings ) {
+ jQuery.extend( jQuery.ajaxSettings, settings );
+ },
+
+ ajaxSettings: {
+ url: location.href,
+ global: true,
+ type: "GET",
+ contentType: "application/x-www-form-urlencoded",
+ processData: true,
+ async: true,
+ /*
+ timeout: 0,
+ data: null,
+ username: null,
+ password: null,
+ */
+ // Create the request object; Microsoft failed to properly
+ // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+ // This function can be overriden by calling jQuery.ajaxSetup
+ xhr:function(){
+ return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+ },
+ accepts: {
+ xml: "application/xml, text/xml",
+ html: "text/html",
+ script: "text/javascript, application/javascript",
+ json: "application/json, text/javascript",
+ text: "text/plain",
+ _default: "*/*"
+ }
+ },
+
+ // Last-Modified header cache for next request
+ lastModified: {},
+
+ ajax: function( s ) {
+ // Extend the settings, but re-extend 's' so that it can be
+ // checked again later (in the test suite, specifically)
+ s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+
+ var jsonp, jsre = /=\?(&|$)/g, status, data,
+ type = s.type.toUpperCase();
+
+ // convert data if not already a string
+ if ( s.data && s.processData && typeof s.data !== "string" )
+ s.data = jQuery.param(s.data);
+
+ // Handle JSONP Parameter Callbacks
+ if ( s.dataType == "jsonp" ) {
+ if ( type == "GET" ) {
+ if ( !s.url.match(jsre) )
+ s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+ } else if ( !s.data || !s.data.match(jsre) )
+ s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+ s.dataType = "json";
+ }
+
+ // Build temporary JSONP function
+ if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
+ jsonp = "jsonp" + jsc++;
+
+ // Replace the =? sequence both in the query string and the data
+ if ( s.data )
+ s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+ s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+ // We need to make sure
+ // that a JSONP style response is executed properly
+ s.dataType = "script";
+
+ // Handle JSONP-style loading
+ window[ jsonp ] = function(tmp){
+ data = tmp;
+ success();
+ complete();
+ // Garbage collect
+ window[ jsonp ] = undefined;
+ try{ delete window[ jsonp ]; } catch(e){}
+ if ( head )
+ head.removeChild( script );
+ };
+ }
+
+ if ( s.dataType == "script" && s.cache == null )
+ s.cache = false;
+
+ if ( s.cache === false && type == "GET" ) {
+ var ts = now();
+ // try replacing _= if it is there
+ var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+ // if nothing was replaced, add timestamp to the end
+ s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+ }
+
+ // If data is available, append data to url for get requests
+ if ( s.data && type == "GET" ) {
+ s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
+
+ // IE likes to send both get and post data, prevent this
+ s.data = null;
+ }
+
+ // Watch for a new set of requests
+ if ( s.global && ! jQuery.active++ )
+ jQuery.event.trigger( "ajaxStart" );
+
+ // Matches an absolute URL, and saves the domain
+ var parts = /^(\w+:)?\/\/([^\/?#]+)/.exec( s.url );
+
+ // If we're requesting a remote document
+ // and trying to load JSON or Script with a GET
+ if ( s.dataType == "script" && type == "GET" && parts
+ && ( parts[1] && parts[1] != location.protocol || parts[2] != location.host )){
+
+ var head = document.getElementsByTagName("head")[0];
+ var script = document.createElement("script");
+ script.src = s.url;
+ if (s.scriptCharset)
+ script.charset = s.scriptCharset;
+
+ // Handle Script loading
+ if ( !jsonp ) {
+ var done = false;
+
+ // Attach handlers for all browsers
+ script.onload = script.onreadystatechange = function(){
+ if ( !done && (!this.readyState ||
+ this.readyState == "loaded" || this.readyState == "complete") ) {
+ done = true;
+ success();
+ complete();
+
+ // Handle memory leak in IE
+ script.onload = script.onreadystatechange = null;
+ head.removeChild( script );
+ }
+ };
+ }
+
+ head.appendChild(script);
+
+ // We handle everything using the script element injection
+ return undefined;
+ }
+
+ var requestDone = false;
+
+ // Create the request object
+ var xhr = s.xhr();
+
+ // Open the socket
+ // Passing null username, generates a login popup on Opera (#2865)
+ if( s.username )
+ xhr.open(type, s.url, s.async, s.username, s.password);
+ else
+ xhr.open(type, s.url, s.async);
+
+ // Need an extra try/catch for cross domain requests in Firefox 3
+ try {
+ // Set the correct header, if data is being sent
+ if ( s.data )
+ xhr.setRequestHeader("Content-Type", s.contentType);
+
+ // Set the If-Modified-Since header, if ifModified mode.
+ if ( s.ifModified )
+ xhr.setRequestHeader("If-Modified-Since",
+ jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+
+ // Set header so the called script knows that it's an XMLHttpRequest
+ xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+ // Set the Accepts header for the server, depending on the dataType
+ xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+ s.accepts[ s.dataType ] + ", */*" :
+ s.accepts._default );
+ } catch(e){}
+
+ // Allow custom headers/mimetypes and early abort
+ if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
+ // Handle the global AJAX counter
+ if ( s.global && ! --jQuery.active )
+ jQuery.event.trigger( "ajaxStop" );
+ // close opended socket
+ xhr.abort();
+ return false;
+ }
+
+ if ( s.global )
+ jQuery.event.trigger("ajaxSend", [xhr, s]);
+
+ // Wait for a response to come back
+ var onreadystatechange = function(isTimeout){
+ // The request was aborted, clear the interval and decrement jQuery.active
+ if (xhr.readyState == 0) {
+ if (ival) {
+ // clear poll interval
+ clearInterval(ival);
+ ival = null;
+ // Handle the global AJAX counter
+ if ( s.global && ! --jQuery.active )
+ jQuery.event.trigger( "ajaxStop" );
+ }
+ // The transfer is complete and the data is available, or the request timed out
+ } else if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
+ requestDone = true;
+
+ // clear poll interval
+ if (ival) {
+ clearInterval(ival);
+ ival = null;
+ }
+
+ status = isTimeout == "timeout" ? "timeout" :
+ !jQuery.httpSuccess( xhr ) ? "error" :
+ s.ifModified && jQuery.httpNotModified( xhr, s.url ) ? "notmodified" :
+ "success";
+
+ if ( status == "success" ) {
+ // Watch for, and catch, XML document parse errors
+ try {
+ // process the data (runs the xml through httpData regardless of callback)
+ data = jQuery.httpData( xhr, s.dataType, s );
+ } catch(e) {
+ status = "parsererror";
+ }
+ }
+
+ // Make sure that the request was successful or notmodified
+ if ( status == "success" ) {
+ // Cache Last-Modified header, if ifModified mode.
+ var modRes;
+ try {
+ modRes = xhr.getResponseHeader("Last-Modified");
+ } catch(e) {} // swallow exception thrown by FF if header is not available
+
+ if ( s.ifModified && modRes )
+ jQuery.lastModified[s.url] = modRes;
+
+ // JSONP handles its own success callback
+ if ( !jsonp )
+ success();
+ } else
+ jQuery.handleError(s, xhr, status);
+
+ // Fire the complete handlers
+ complete();
+
+ if ( isTimeout )
+ xhr.abort();
+
+ // Stop memory leaks
+ if ( s.async )
+ xhr = null;
+ }
+ };
+
+ if ( s.async ) {
+ // don't attach the handler to the request, just poll it instead
+ var ival = setInterval(onreadystatechange, 13);
+
+ // Timeout checker
+ if ( s.timeout > 0 )
+ setTimeout(function(){
+ // Check to see if the request is still happening
+ if ( xhr && !requestDone )
+ onreadystatechange( "timeout" );
+ }, s.timeout);
+ }
+
+ // Send the data
+ try {
+ xhr.send(s.data);
+ } catch(e) {
+ jQuery.handleError(s, xhr, null, e);
+ }
+
+ // firefox 1.5 doesn't fire statechange for sync requests
+ if ( !s.async )
+ onreadystatechange();
+
+ function success(){
+ // If a local callback was specified, fire it and pass it the data
+ if ( s.success )
+ s.success( data, status );
+
+ // Fire the global callback
+ if ( s.global )
+ jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
+ }
+
+ function complete(){
+ // Process result
+ if ( s.complete )
+ s.complete(xhr, status);
+
+ // The request was completed
+ if ( s.global )
+ jQuery.event.trigger( "ajaxComplete", [xhr, s] );
+
+ // Handle the global AJAX counter
+ if ( s.global && ! --jQuery.active )
+ jQuery.event.trigger( "ajaxStop" );
+ }
+
+ // return XMLHttpRequest to allow aborting the request etc.
+ return xhr;
+ },
+
+ handleError: function( s, xhr, status, e ) {
+ // If a local callback was specified, fire it
+ if ( s.error ) s.error( xhr, status, e );
+
+ // Fire the global callback
+ if ( s.global )
+ jQuery.event.trigger( "ajaxError", [xhr, s, e] );
+ },
+
+ // Counter for holding the number of active queries
+ active: 0,
+
+ // Determines if an XMLHttpRequest was successful or not
+ httpSuccess: function( xhr ) {
+ try {
+ // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+ return !xhr.status && location.protocol == "file:" ||
+ ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223;
+ } catch(e){}
+ return false;
+ },
+
+ // Determines if an XMLHttpRequest returns NotModified
+ httpNotModified: function( xhr, url ) {
+ try {
+ var xhrRes = xhr.getResponseHeader("Last-Modified");
+
+ // Firefox always returns 200. check Last-Modified date
+ return xhr.status == 304 || xhrRes == jQuery.lastModified[url];
+ } catch(e){}
+ return false;
+ },
+
+ httpData: function( xhr, type, s ) {
+ var ct = xhr.getResponseHeader("content-type"),
+ xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
+ data = xml ? xhr.responseXML : xhr.responseText;
+
+ if ( xml && data.documentElement.tagName == "parsererror" )
+ throw "parsererror";
+
+ // Allow a pre-filtering function to sanitize the response
+ // s != null is checked to keep backwards compatibility
+ if( s && s.dataFilter )
+ data = s.dataFilter( data, type );
+
+ // The filter can actually parse the response
+ if( typeof data === "string" ){
+
+ // If the type is "script", eval it in global context
+ if ( type == "script" )
+ jQuery.globalEval( data );
+
+ // Get the JavaScript object, if JSON is used.
+ if ( type == "json" )
+ data = window["eval"]("(" + data + ")");
+ }
+
+ return data;
+ },
+
+ // Serialize an array of form elements or a set of
+ // key/values into a query string
+ param: function( a ) {
+ var s = [ ];
+
+ function add( key, value ){
+ s[ s.length ] = encodeURIComponent(key) + '=' + encodeURIComponent(value);
+ };
+
+ // If an array was passed in, assume that it is an array
+ // of form elements
+ if ( jQuery.isArray(a) || a.jquery )
+ // Serialize the form elements
+ jQuery.each( a, function(){
+ add( this.name, this.value );
+ });
+
+ // Otherwise, assume that it's an object of key/value pairs
+ else
+ // Serialize the key/values
+ for ( var j in a )
+ // If the value is an array then the key names need to be repeated
+ if ( jQuery.isArray(a[j]) )
+ jQuery.each( a[j], function(){
+ add( j, this );
+ });
+ else
+ add( j, jQuery.isFunction(a[j]) ? a[j]() : a[j] );
+
+ // Return the resulting serialization
+ return s.join("&").replace(/%20/g, "+");
+ }
+
+});
+var elemdisplay = {},
+ timerId,
+ fxAttrs = [
+ // height animations
+ [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+ // width animations
+ [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+ // opacity animations
+ [ "opacity" ]
+ ];
+
+function genFx( type, num ){
+ var obj = {};
+ jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
+ obj[ this ] = type;
+ });
+ return obj;
+}
+
+jQuery.fn.extend({
+ show: function(speed,callback){
+ if ( speed ) {
+ return this.animate( genFx("show", 3), speed, callback);
+ } else {
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ var old = jQuery.data(this[i], "olddisplay");
+
+ this[i].style.display = old || "";
+
+ if ( jQuery.css(this[i], "display") === "none" ) {
+ var tagName = this[i].tagName, display;
+
+ if ( elemdisplay[ tagName ] ) {
+ display = elemdisplay[ tagName ];
+ } else {
+ var elem = jQuery("<" + tagName + " />").appendTo("body");
+
+ display = elem.css("display");
+ if ( display === "none" )
+ display = "block";
+
+ elem.remove();
+
+ elemdisplay[ tagName ] = display;
+ }
+
+ jQuery.data(this[i], "olddisplay", display);
+ }
+ }
+
+ // Set the display of the elements in a second loop
+ // to avoid the constant reflow
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
+ }
+
+ return this;
+ }
+ },
+
+ hide: function(speed,callback){
+ if ( speed ) {
+ return this.animate( genFx("hide", 3), speed, callback);
+ } else {
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ var old = jQuery.data(this[i], "olddisplay");
+ if ( !old && old !== "none" )
+ jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+ }
+
+ // Set the display of the elements in a second loop
+ // to avoid the constant reflow
+ for ( var i = 0, l = this.length; i < l; i++ ){
+ this[i].style.display = "none";
+ }
+
+ return this;
+ }
+ },
+
+ // Save the old toggle function
+ _toggle: jQuery.fn.toggle,
+
+ toggle: function( fn, fn2 ){
+ var bool = typeof fn === "boolean";
+
+ return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+ this._toggle.apply( this, arguments ) :
+ fn == null || bool ?
+ this.each(function(){
+ var state = bool ? fn : jQuery(this).is(":hidden");
+ jQuery(this)[ state ? "show" : "hide" ]();
+ }) :
+ this.animate(genFx("toggle", 3), fn, fn2);
+ },
+
+ fadeTo: function(speed,to,callback){
+ return this.animate({opacity: to}, speed, callback);
+ },
+
+ animate: function( prop, speed, easing, callback ) {
+ var optall = jQuery.speed(speed, easing, callback);
+
+ return this[ optall.queue === false ? "each" : "queue" ](function(){
+
+ var opt = jQuery.extend({}, optall), p,
+ hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
+ self = this;
+
+ for ( p in prop ) {
+ if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+ return opt.complete.call(this);
+
+ if ( ( p == "height" || p == "width" ) && this.style ) {
+ // Store display property
+ opt.display = jQuery.css(this, "display");
+
+ // Make sure that nothing sneaks out
+ opt.overflow = this.style.overflow;
+ }
+ }
+
+ if ( opt.overflow != null )
+ this.style.overflow = "hidden";
+
+ opt.curAnim = jQuery.extend({}, prop);
+
+ jQuery.each( prop, function(name, val){
+ var e = new jQuery.fx( self, opt, name );
+
+ if ( /toggle|show|hide/.test(val) )
+ e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+ else {
+ var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
+ start = e.cur(true) || 0;
+
+ if ( parts ) {
+ var end = parseFloat(parts[2]),
+ unit = parts[3] || "px";
+
+ // We need to compute starting value
+ if ( unit != "px" ) {
+ self.style[ name ] = (end || 1) + unit;
+ start = ((end || 1) / e.cur(true)) * start;
+ self.style[ name ] = start + unit;
+ }
+
+ // If a +=/-= token was provided, we're doing a relative animation
+ if ( parts[1] )
+ end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
+
+ e.custom( start, end, unit );
+ } else
+ e.custom( start, val, "" );
+ }
+ });
+
+ // For JS strict compliance
+ return true;
+ });
+ },
+
+ stop: function(clearQueue, gotoEnd){
+ var timers = jQuery.timers;
+
+ if (clearQueue)
+ this.queue([]);
+
+ this.each(function(){
+ // go in reverse order so anything added to the queue during the loop is ignored
+ for ( var i = timers.length - 1; i >= 0; i-- )
+ if ( timers[i].elem == this ) {
+ if (gotoEnd)
+ // force the next step to be the last
+ timers[i](true);
+ timers.splice(i, 1);
+ }
+ });
+
+ // start the next in the queue if the last step wasn't forced
+ if (!gotoEnd)
+ this.dequeue();
+
+ return this;
+ }
+
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+ slideDown: genFx("show", 1),
+ slideUp: genFx("hide", 1),
+ slideToggle: genFx("toggle", 1),
+ fadeIn: { opacity: "show" },
+ fadeOut: { opacity: "hide" }
+}, function( name, props ){
+ jQuery.fn[ name ] = function( speed, callback ){
+ return this.animate( props, speed, callback );
+ };
+});
+
+jQuery.extend({
+
+ speed: function(speed, easing, fn) {
+ var opt = typeof speed === "object" ? speed : {
+ complete: fn || !fn && easing ||
+ jQuery.isFunction( speed ) && speed,
+ duration: speed,
+ easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+ };
+
+ opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+ jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+
+ // Queueing
+ opt.old = opt.complete;
+ opt.complete = function(){
+ if ( opt.queue !== false )
+ jQuery(this).dequeue();
+ if ( jQuery.isFunction( opt.old ) )
+ opt.old.call( this );
+ };
+
+ return opt;
+ },
+
+ easing: {
+ linear: function( p, n, firstNum, diff ) {
+ return firstNum + diff * p;
+ },
+ swing: function( p, n, firstNum, diff ) {
+ return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+ }
+ },
+
+ timers: [],
+
+ fx: function( elem, options, prop ){
+ this.options = options;
+ this.elem = elem;
+ this.prop = prop;
+
+ if ( !options.orig )
+ options.orig = {};
+ }
+
+});
+
+jQuery.fx.prototype = {
+
+ // Simple function for setting a style value
+ update: function(){
+ if ( this.options.step )
+ this.options.step.call( this.elem, this.now, this );
+
+ (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+ // Set display property to block for height/width animations
+ if ( ( this.prop == "height" || this.prop == "width" ) && this.elem.style )
+ this.elem.style.display = "block";
+ },
+
+ // Get the current size
+ cur: function(force){
+ if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) )
+ return this.elem[ this.prop ];
+
+ var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+ return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+ },
+
+ // Start an animation from one number to another
+ custom: function(from, to, unit){
+ this.startTime = now();
+ this.start = from;
+ this.end = to;
+ this.unit = unit || this.unit || "px";
+ this.now = this.start;
+ this.pos = this.state = 0;
+
+ var self = this;
+ function t(gotoEnd){
+ return self.step(gotoEnd);
+ }
+
+ t.elem = this.elem;
+
+ if ( t() && jQuery.timers.push(t) && !timerId ) {
+ timerId = setInterval(function(){
+ var timers = jQuery.timers;
+
+ for ( var i = 0; i < timers.length; i++ )
+ if ( !timers[i]() )
+ timers.splice(i--, 1);
+
+ if ( !timers.length ) {
+ clearInterval( timerId );
+ timerId = undefined;
+ }
+ }, 13);
+ }
+ },
+
+ // Simple 'show' function
+ show: function(){
+ // Remember where we started, so that we can go back to it later
+ this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+ this.options.show = true;
+
+ // Begin the animation
+ // Make sure that we start at a small width/height to avoid any
+ // flash of content
+ this.custom(this.prop == "width" || this.prop == "height" ? 1 : 0, this.cur());
+
+ // Start by showing the element
+ jQuery(this.elem).show();
+ },
+
+ // Simple 'hide' function
+ hide: function(){
+ // Remember where we started, so that we can go back to it later
+ this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+ this.options.hide = true;
+
+ // Begin the animation
+ this.custom(this.cur(), 0);
+ },
+
+ // Each step of an animation
+ step: function(gotoEnd){
+ var t = now();
+
+ if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+ this.now = this.end;
+ this.pos = this.state = 1;
+ this.update();
+
+ this.options.curAnim[ this.prop ] = true;
+
+ var done = true;
+ for ( var i in this.options.curAnim )
+ if ( this.options.curAnim[i] !== true )
+ done = false;
+
+ if ( done ) {
+ if ( this.options.display != null ) {
+ // Reset the overflow
+ this.elem.style.overflow = this.options.overflow;
+
+ // Reset the display
+ this.elem.style.display = this.options.display;
+ if ( jQuery.css(this.elem, "display") == "none" )
+ this.elem.style.display = "block";
+ }
+
+ // Hide the element if the "hide" operation was done
+ if ( this.options.hide )
+ jQuery(this.elem).hide();
+
+ // Reset the properties, if the item has been hidden or shown
+ if ( this.options.hide || this.options.show )
+ for ( var p in this.options.curAnim )
+ jQuery.attr(this.elem.style, p, this.options.orig[p]);
+
+ // Execute the complete function
+ this.options.complete.call( this.elem );
+ }
+
+ return false;
+ } else {
+ var n = t - this.startTime;
+ this.state = n / this.options.duration;
+
+ // Perform the easing function, defaults to swing
+ this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
+ this.now = this.start + ((this.end - this.start) * this.pos);
+
+ // Perform the next step of the animation
+ this.update();
+ }
+
+ return true;
+ }
+
+};
+
+jQuery.extend( jQuery.fx, {
+ speeds:{
+ slow: 600,
+ fast: 200,
+ // Default speed
+ _default: 400
+ },
+ step: {
+
+ opacity: function(fx){
+ jQuery.attr(fx.elem.style, "opacity", fx.now);
+ },
+
+ _default: function(fx){
+ if ( fx.elem.style && fx.elem.style[ fx.prop ] != null )
+ fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+ else
+ fx.elem[ fx.prop ] = fx.now;
+ }
+ }
+});
+if ( document.documentElement["getBoundingClientRect"] )
+ jQuery.fn.offset = function() {
+ if ( !this[0] ) return { top: 0, left: 0 };
+ if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );
+ var box = this[0].getBoundingClientRect(), doc = this[0].ownerDocument, body = doc.body, docElem = doc.documentElement,
+ clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
+ top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
+ left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+ return { top: top, left: left };
+ };
+else
+ jQuery.fn.offset = function() {
+ if ( !this[0] ) return { top: 0, left: 0 };
+ if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );
+ jQuery.offset.initialized || jQuery.offset.initialize();
+
+ var elem = this[0], offsetParent = elem.offsetParent, prevOffsetParent = elem,
+ doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
+ body = doc.body, defaultView = doc.defaultView,
+ prevComputedStyle = defaultView.getComputedStyle(elem, null),
+ top = elem.offsetTop, left = elem.offsetLeft;
+
+ while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+ computedStyle = defaultView.getComputedStyle(elem, null);
+ top -= elem.scrollTop, left -= elem.scrollLeft;
+ if ( elem === offsetParent ) {
+ top += elem.offsetTop, left += elem.offsetLeft;
+ if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) )
+ top += parseInt( computedStyle.borderTopWidth, 10) || 0,
+ left += parseInt( computedStyle.borderLeftWidth, 10) || 0;
+ prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
+ }
+ if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" )
+ top += parseInt( computedStyle.borderTopWidth, 10) || 0,
+ left += parseInt( computedStyle.borderLeftWidth, 10) || 0;
+ prevComputedStyle = computedStyle;
+ }
+
+ if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" )
+ top += body.offsetTop,
+ left += body.offsetLeft;
+
+ if ( prevComputedStyle.position === "fixed" )
+ top += Math.max(docElem.scrollTop, body.scrollTop),
+ left += Math.max(docElem.scrollLeft, body.scrollLeft);
+
+ return { top: top, left: left };
+ };
+
+jQuery.offset = {
+ initialize: function() {
+ if ( this.initialized ) return;
+ var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, rules, prop, bodyMarginTop = body.style.marginTop,
+ html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';
+
+ rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' };
+ for ( prop in rules ) container.style[prop] = rules[prop];
+
+ container.innerHTML = html;
+ body.insertBefore(container, body.firstChild);
+ innerDiv = container.firstChild, checkDiv = innerDiv.firstChild, td = innerDiv.nextSibling.firstChild.firstChild;
+
+ this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+ this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+ innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
+ this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+ body.style.marginTop = '1px';
+ this.doesNotIncludeMarginInBodyOffset = (body.offsetTop === 0);
+ body.style.marginTop = bodyMarginTop;
+
+ body.removeChild(container);
+ this.initialized = true;
+ },
+
+ bodyOffset: function(body) {
+ jQuery.offset.initialized || jQuery.offset.initialize();
+ var top = body.offsetTop, left = body.offsetLeft;
+ if ( jQuery.offset.doesNotIncludeMarginInBodyOffset )
+ top += parseInt( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0,
+ left += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0;
+ return { top: top, left: left };
+ }
+};
+
+
+jQuery.fn.extend({
+ position: function() {
+ var left = 0, top = 0, results;
+
+ if ( this[0] ) {
+ // Get *real* offsetParent
+ var offsetParent = this.offsetParent(),
+
+ // Get correct offsets
+ offset = this.offset(),
+ parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+ // Subtract element margins
+ // note: when an element has margin: auto the offsetLeft and marginLeft
+ // are the same in Safari causing offset.left to incorrectly be 0
+ offset.top -= num( this, 'marginTop' );
+ offset.left -= num( this, 'marginLeft' );
+
+ // Add offsetParent borders
+ parentOffset.top += num( offsetParent, 'borderTopWidth' );
+ parentOffset.left += num( offsetParent, 'borderLeftWidth' );
+
+ // Subtract the two offsets
+ results = {
+ top: offset.top - parentOffset.top,
+ left: offset.left - parentOffset.left
+ };
+ }
+
+ return results;
+ },
+
+ offsetParent: function() {
+ var offsetParent = this[0].offsetParent || document.body;
+ while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+ offsetParent = offsetParent.offsetParent;
+ return jQuery(offsetParent);
+ }
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ['Left', 'Top'], function(i, name) {
+ var method = 'scroll' + name;
+
+ jQuery.fn[ method ] = function(val) {
+ if (!this[0]) return null;
+
+ return val !== undefined ?
+
+ // Set the scroll offset
+ this.each(function() {
+ this == window || this == document ?
+ window.scrollTo(
+ !i ? val : jQuery(window).scrollLeft(),
+ i ? val : jQuery(window).scrollTop()
+ ) :
+ this[ method ] = val;
+ }) :
+
+ // Return the scroll offset
+ this[0] == window || this[0] == document ?
+ self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+ jQuery.boxModel && document.documentElement[ method ] ||
+ document.body[ method ] :
+ this[0][ method ];
+ };
+});
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function(i, name){
+
+ var tl = i ? "Left" : "Top", // top or left
+ br = i ? "Right" : "Bottom", // bottom or right
+ lower = name.toLowerCase();
+
+ // innerHeight and innerWidth
+ jQuery.fn["inner" + name] = function(){
+ return this[0] ?
+ jQuery.css( this[0], lower, false, "padding" ) :
+ null;
+ };
+
+ // outerHeight and outerWidth
+ jQuery.fn["outer" + name] = function(margin) {
+ return this[0] ?
+ jQuery.css( this[0], lower, false, margin ? "margin" : "border" ) :
+ null;
+ };
+
+ var type = name.toLowerCase();
+
+ jQuery.fn[ type ] = function( size ) {
+ // Get window width or height
+ return this[0] == window ?
+ // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+ document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] ||
+ document.body[ "client" + name ] :
+
+ // Get document width or height
+ this[0] == document ?
+ // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+ Math.max(
+ document.documentElement["client" + name],
+ document.body["scroll" + name], document.documentElement["scroll" + name],
+ document.body["offset" + name], document.documentElement["offset" + name]
+ ) :
+
+ // Get or set width or height on the element
+ size === undefined ?
+ // Get width or height on the element
+ (this.length ? jQuery.css( this[0], type ) : null) :
+
+ // Set the width or height on the element (default to pixels if value is unitless)
+ this.css( type, typeof size === "string" ? size : size + "px" );
+ };
+
+});
+})();
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/spinner.gif b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/spinner.gif
new file mode 100644
index 0000000..26800bf
Binary files /dev/null and b/vendor/plugins/rack-bug/lib/rack/bug/public/__rack_bug__/spinner.gif differ
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/render.rb b/vendor/plugins/rack-bug/lib/rack/bug/render.rb
new file mode 100644
index 0000000..89e7a1e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/render.rb
@@ -0,0 +1,67 @@
+require "erb"
+
+module Rack
+ module Bug
+
+ module Render
+ include ERB::Util
+
+ def signed_params(hash)
+ # require "rubygems"; require "ruby-debug"; Debugger.start; debugger
+ ParamsSignature.sign(request, hash)
+ end
+
+ module CompiledTemplates
+ end
+ include CompiledTemplates
+
+ def render_template(filename, local_assigns = {})
+ compile(filename, local_assigns)
+ render_symbol = method_name(filename, local_assigns)
+ send(render_symbol, local_assigns)
+ end
+
+ def compile(filename, local_assigns)
+ render_symbol = method_name(filename, local_assigns)
+
+ if !CompiledTemplates.instance_methods.include?(render_symbol.to_s)
+ compile!(filename, local_assigns)
+ end
+ end
+
+ def compile!(filename, local_assigns)
+ render_symbol = method_name(filename, local_assigns)
+ locals_code = local_assigns.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
+
+ source = <<-end_src
+ def #{render_symbol}(local_assigns)
+ #{locals_code}
+ #{compiled_source(filename)}
+ end
+ end_src
+
+ CompiledTemplates.module_eval(source, filename, 0)
+ end
+
+ def compiled_source(filename)
+ ::ERB.new(::File.read(::File.dirname(__FILE__) + "/../bug/views/#{filename}.html.erb"), nil, "-").src
+ end
+
+ def method_name(filename, local_assigns)
+ if local_assigns && local_assigns.any?
+ method_name = method_name_without_locals(filename).dup
+ method_name << "_locals_#{local_assigns.keys.map { |k| k.to_s }.sort.join('_')}"
+ else
+ method_name = method_name_without_locals(filename)
+ end
+ method_name.to_sym
+ end
+
+ def method_name_without_locals(filename)
+ filename.split("/").join("_")
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/toolbar.rb b/vendor/plugins/rack-bug/lib/rack/bug/toolbar.rb
new file mode 100644
index 0000000..2c13c87
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/toolbar.rb
@@ -0,0 +1,145 @@
+require "ipaddr"
+require "digest"
+
+require "rack/bug/options"
+require "rack/bug/render"
+
+Dir[File.dirname(__FILE__) + "/panels/*.rb"].each do |panel_name|
+ require "rack/bug/panels/" + File.basename(panel_name)
+end
+
+module Rack
+ module Bug
+
+ class RackStaticBugAvoider
+ def initialize(app, static_app)
+ @app = app
+ @static_app = static_app
+ end
+
+ def call(env)
+ if env["PATH_INFO"]
+ @static_app.call(env)
+ else
+ @app.call(env)
+ end
+ end
+ end
+
+ class Toolbar
+ include Options
+ include Render
+
+ MIME_TYPES = ["text/html", "application/xhtml+xml"]
+
+ def initialize(app, options = {})
+ @app = asset_server(app)
+ initialize_options options
+ instance_eval(&block) if block_given?
+ end
+
+ def asset_server(app)
+ RackStaticBugAvoider.new(app, Rack::Static.new(app, :urls => ["/__rack_bug__"], :root => public_path))
+ end
+
+ def public_path
+ ::File.expand_path(::File.dirname(__FILE__) + "/../bug/public")
+ end
+
+ def call(env)
+ env.replace @default_options.merge(env)
+ @env = env
+ @original_request = Request.new(@env)
+
+ if toolbar_requested? && ip_authorized? && password_authorized?
+ dispatch
+ else
+ pass
+ end
+ end
+
+ def pass
+ @app.call(@env)
+ end
+
+ def dispatch
+ @env["rack-bug.panels"] = []
+
+ Rack::Bug.enable
+ status, headers, body = builder.call(@env)
+ Rack::Bug.disable
+
+ @response = Rack::Response.new(body, status, headers)
+
+ if @response.redirect? && options["rack-bug.intercept_redirects"]
+ intercept_redirect
+ elsif modify?
+ inject_toolbar
+ end
+
+ return @response.to_a
+ end
+
+ def intercept_redirect
+ redirect_to = @response.location
+ new_body = render_template("redirect", :redirect_to => @response.location)
+ new_response = Rack::Response.new(new_body, 200, { "Content-Type" => "text/html" })
+ new_response["Content-Length"] = new_body.size.to_s
+ @response = new_response
+ end
+
+ def toolbar_requested?
+ @original_request.cookies["rack_bug_enabled"]
+ end
+
+ def ip_authorized?
+ return true unless options["rack-bug.ip_masks"]
+
+ options["rack-bug.ip_masks"].any? do |ip_mask|
+ ip_mask.include?(IPAddr.new(@original_request.ip))
+ end
+ end
+
+ def password_authorized?
+ return true unless options["rack-bug.password"]
+
+ expected_sha = Digest::SHA1.hexdigest ["rack_bug", options["rack-bug.password"]].join(":")
+ actual_sha = @original_request.cookies["rack_bug_password"]
+
+ actual_sha == expected_sha
+ end
+
+ def modify?
+ @response.ok? &&
+ @env["X-Requested-With"] != "XMLHttpRequest" &&
+ MIME_TYPES.include?(@response.content_type.split(";").first)
+ end
+
+ def builder
+ builder = Rack::Builder.new
+
+ options["rack-bug.panel_classes"].each do |panel_class|
+ builder.use panel_class
+ end
+
+ builder.run @app
+
+ return builder
+ end
+
+ def inject_toolbar
+ full_body = @response.body.join
+ full_body.sub! /<\/body>/, render + "</body>"
+
+ @response["Content-Length"] = full_body.size.to_s
+ @response.body = [full_body]
+ end
+
+ def render
+ render_template("toolbar", :panels => @env["rack-bug.panels"].reverse)
+ end
+
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/error.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/error.html.erb
new file mode 100644
index 0000000..1433962
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/error.html.erb
@@ -0,0 +1,16 @@
+<script type="text/javascript" charset="utf-8">
+ if (typeof jQuery == 'undefined') {
+ var jquery_url = '/__rack_bug__/jquery-1.3.2.js';
+ document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
+ }
+</script>
+<script type="text/javascript" src="/__rack_bug__/bug.js"></script>
+<style type="text/css" media="screen">
+ @import url(/__rack_bug__/bug.css);
+</style>
+
+<div id="rack_bug" class="rack_bug_error">
+ <div id="rack_bug_toolbar">
+ <p>There was an error within Rack::Bug!</p>
+ </div>
+</div>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/active_record.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/active_record.html.erb
new file mode 100644
index 0000000..97eed4f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/active_record.html.erb
@@ -0,0 +1,17 @@
+<h3>ActiveRecord Objects</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Count</th>
+ <th>Class</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% records.each do |class_name, count| %>
+ <tr>
+ <td><%= count %></td>
+ <td><%= class_name %></td>
+ </tr>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/cache.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/cache.html.erb
new file mode 100644
index 0000000..fd8888e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/cache.html.erb
@@ -0,0 +1,93 @@
+<h3>Cache Usage</h3>
+<table id="cache_usage">
+ <colgroup>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ <col width="12%"/>
+ </colgroup>
+ <tr>
+ <th>Total Calls</th>
+ <td><%= stats.calls %></td>
+
+ <th>Total Time</th>
+ <td><%= stats.display_time %></td>
+
+ <th>Hits</th>
+ <td><%= stats.hits %></td>
+
+ <th>Misses</th>
+ <td><%= stats.misses %></td>
+ </tr>
+ <tr>
+ <th>gets</th>
+ <td><%= stats.gets %></td>
+
+ <th>sets</th>
+ <td><%= stats.sets %></td>
+
+ <th>deletes</th>
+ <td><%= stats.deletes %></td>
+
+ <th>get_multis</th>
+ <td><%= stats.get_multis %></td>
+ </tr>
+</table>
+
+<% if stats.queries.any? %>
+ <h3>Breakdown</h3>
+ <table id="cache_breakdown">
+ <thead>
+ <tr>
+ <th>Time (ms)</th>
+ <th>Type</th>
+ <th>Parameters</th>
+ <th>Function</th>
+ <th>
+ <a href="/__rack_bug__/delete_cache_list?<%= signed_params(stats.queries_to_param) %>" class="rb_delete_cache">
+ Delete All
+ </a>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% stats.queries.each do |query| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%= query.display_time %></td>
+ <td><%= query.method %></td>
+ <td><%= query.display_keys %></td>
+ <td></td>
+ <td>
+ <a href="/__rack_bug__/view_cache?<%= signed_params("key" => query.keys.first) %>" class="remote_call">View</a> |
+ <a href="/__rack_bug__/delete_cache?<%= signed_params("key" => query.keys.first) %>" class="rb_delete_cache">Delete</a>
+ </td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<script type="text/javascript" charset="utf-8">
+ jQuery(function () {
+ jQuery("#rack_bug .rb_delete_cache").click(function (evt) {
+ jQuery.ajax({
+ url: this.href,
+ beforeSend: function() {
+ jQuery(evt.target).parent("td, th").addClass("rack_bug_spinner");
+ },
+ success: function () {
+ jQuery(evt.target).parent("td, th").removeClass("rack_bug_spinner");
+ jQuery(evt.target).replaceWith("Deleted");
+ }
+ });
+
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/env.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/env.html.erb
new file mode 100644
index 0000000..8cba869
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/env.html.erb
@@ -0,0 +1,19 @@
+<h3>Rack ENV</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% env.sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/execute_sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/execute_sql.html.erb
new file mode 100644
index 0000000..7a3d56a
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/execute_sql.html.erb
@@ -0,0 +1,32 @@
+<a class="back" href="">« Back</a>
+
+<h3>SQL Results</h3>
+
+<dl>
+ <dt>Executed SQL</dt>
+ <dd><pre><%=h query %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (time * 1_000) %>ms</dd>
+</dl>
+
+<table>
+ <thead>
+ <tr>
+ <% result.fetch_fields.each do |field| %>
+ <th><%= field.name.upcase %></th>
+ <% end %>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% result.each do |row| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <% row.each do |value| %>
+ <td><%= value %></td>
+ <% end %>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/explain_sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/explain_sql.html.erb
new file mode 100644
index 0000000..d6f1d7c
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/explain_sql.html.erb
@@ -0,0 +1,32 @@
+<a class="back" href="">« Back</a>
+
+<h3>SQL Explained</h3>
+
+<dl>
+ <dt>Executed SQL</dt>
+ <dd><pre><%=h query %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (time * 1_000) %>ms</dd>
+</dl>
+
+<table>
+ <thead>
+ <tr>
+ <% result.fetch_fields.each do |field| %>
+ <th><%= field.name.upcase %></th>
+ <% end %>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% result.each do |row| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <% row.each do |value| %>
+ <td><%= value %></td>
+ <% end %>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/log.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/log.html.erb
new file mode 100644
index 0000000..add0f5f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/log.html.erb
@@ -0,0 +1,23 @@
+<h3>Log Messages</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Level</th>
+ <th>Time</th>
+ <th>Message</th>
+ <th>Location</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% logs.each do |log| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td></td>
+ <td></td>
+ <td><%= log.to_s.gsub(/\e\[[;\d]+m/, "") %></td>
+ <td></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/profile_sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/profile_sql.html.erb
new file mode 100644
index 0000000..2135e04
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/profile_sql.html.erb
@@ -0,0 +1,32 @@
+<a class="back" href="">« Back</a>
+
+<h3>SQL Profiled</h3>
+
+<dl>
+ <dt>Executed SQL</dt>
+ <dd><pre><%=h query %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (time * 1_000) %>ms</dd>
+</dl>
+
+<table>
+ <thead>
+ <tr>
+ <% result.fetch_fields.each do |field| %>
+ <th><%= field.name.upcase %></th>
+ <% end %>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% result.each do |row| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <% row.each do |value| %>
+ <td><%= value %></td>
+ <% end %>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/rails_info.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/rails_info.html.erb
new file mode 100644
index 0000000..a54c313
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/rails_info.html.erb
@@ -0,0 +1,19 @@
+<h3>Rails Environment</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% Rails::Info.properties.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/request_variables.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/request_variables.html.erb
new file mode 100644
index 0000000..865e2d9
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/request_variables.html.erb
@@ -0,0 +1,87 @@
+<% if request.GET.any? %>
+ <h3>GET</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.GET.sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<% if request.POST.any? %>
+ <h3>POST</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.POST.sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<% if request.env["rack.session"] && request.env["rack.session"].any? %>
+ <h3>Session</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.env["rack.session"].sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
+
+<% if request.env["rack.request.cookie_hash"] && request.env["rack.request.cookie_hash"].any? %>
+ <h3>Cookies</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Variable</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% request.env["rack.request.cookie_hash"].sort_by { |k, v| k.to_s }.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td class="code"><div><%=h val %></div></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/sql.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/sql.html.erb
new file mode 100644
index 0000000..5f5b1a1
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/sql.html.erb
@@ -0,0 +1,43 @@
+<h3>SQL Queries</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Time (ms)</th>
+ <th>Query</th>
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% queries.each do |query| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%= query.human_time %></td>
+ <td class="syntax"><%= query.sql %></td>
+ <td>
+ <% if query.has_backtrace? %>
+ <a href="#" class="reveal_backtrace">Show Backtrace</a>
+ <% end %>
+ </td>
+ <td>
+ <% if query.inspectable? %>
+ <a href="/__rack_bug__/execute_sql?<%= signed_params("query" => query.sql, "time" => query.time) %>" class="remote_call">SELECT</a> |
+ <a href="/__rack_bug__/explain_sql?<%= signed_params("query" => query.sql, "time" => query.time) %>" class="remote_call">EXPLAIN</a> |
+ <a href="/__rack_bug__/profile_sql?<%= signed_params("query" => query.sql, "time" => query.time) %>" class="remote_call">Profile</a>
+ <% end %>
+ </td>
+ </tr>
+ <tr style="display:none">
+ <td></td>
+ <td colspan="3">
+ <ul>
+ <% query.filtered_backtrace.each do |line| %>
+ <li><%=h line %></li>
+ <% end %>
+ </ul>
+ </td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/templates.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/templates.html.erb
new file mode 100644
index 0000000..724c11f
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/templates.html.erb
@@ -0,0 +1,7 @@
+<h3>Templates</h3>
+
+<ul>
+ <% template_trace.root.children.each do |child| %>
+ <%= child.html %>
+ <% end %>
+</ul>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/timer.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/timer.html.erb
new file mode 100644
index 0000000..6cf7420
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/timer.html.erb
@@ -0,0 +1,19 @@
+<h3>Resource Usage</h3>
+<table>
+ <thead>
+ <tr>
+ <th>Key</th>
+ <th>Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <% i = 1 %>
+ <% measurements.each do |key, val| %>
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>">
+ <td><%=h key %></td>
+ <td><%=h val %></td>
+ </tr>
+ <% i += 1 %>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/panels/view_cache.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/view_cache.html.erb
new file mode 100644
index 0000000..251700d
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/panels/view_cache.html.erb
@@ -0,0 +1,19 @@
+<a class="back" href="">« Back</a>
+
+<h3>Cache Read</h3>
+
+<dl>
+ <dt>Key</dt>
+ <dd><pre><%=h key %></pre></dd>
+
+ <dt>Time</dt>
+ <dd><%=h "%.2f" % (0.0 * 1_000) %>ms</dd>
+</dl>
+
+<p>
+ <% if value.is_a?(String )%>
+ <%=h value %>
+ <% else %>
+ <%=h value.inspect %>
+ <% end %>
+</p>
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/redirect.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/redirect.html.erb
new file mode 100644
index 0000000..de9add8
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/redirect.html.erb
@@ -0,0 +1,16 @@
+<html>
+<head>
+</head>
+<body>
+ <h1>Redirect</h1>
+
+ <p>Location: <a href="<%= redirect_to %>"><%= redirect_to %></a></p>
+
+ <p class="notice">
+ Rack::Bug has intercepted a redirect to the above URL for debug viewing
+ purposes. You can click the above link to continue with the redirect as
+ normal. If you'd like to disable this feature, set the Rack::Bug
+ <code>internal_redirects</code> option to <code>false</code>.
+ </p>
+</body>
+</html>
diff --git a/vendor/plugins/rack-bug/lib/rack/bug/views/toolbar.html.erb b/vendor/plugins/rack-bug/lib/rack/bug/views/toolbar.html.erb
new file mode 100644
index 0000000..a8bfc3e
--- /dev/null
+++ b/vendor/plugins/rack-bug/lib/rack/bug/views/toolbar.html.erb
@@ -0,0 +1,41 @@
+<script type="text/javascript" charset="utf-8">
+ if (typeof jQuery == 'undefined') {
+ var jquery_url = '/__rack_bug__/jquery-1.3.2.js';
+ document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
+ }
+</script>
+<script type="text/javascript" src="/__rack_bug__/bug.js"></script>
+<style type="text/css" media="screen">
+ @import url(/__rack_bug__/bug.css);
+</style>
+
+<div id="rack_bug">
+ <div id="rack_bug_toolbar">
+ <ul class="panels">
+ <li id="rb_debug_button">Rack::Bug</li>
+
+ <% panels.each do |panel| %>
+ <li>
+ <% if panel.has_content? %>
+ <a href="#" class="<%= panel.name %>">
+ <%= panel.heading %>
+ </a>
+ <% else %>
+ <%= panel.heading %>
+ <% end %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+
+ <% panels.each do |panel| %>
+ <% if panel.has_content? %>
+ <div class="panel_content" id="<%= panel.name %>">
+ <a href="" class="rack_bug_close">Close</a>
+ <%= panel.content %>
+ </div>
+ <% end %>
+ <% end %>
+
+ <div id="rack_bug_debug_window" class="panel_content"></div>
+</div>
diff --git a/vendor/plugins/rack-bug/spec/fixtures/config.ru b/vendor/plugins/rack-bug/spec/fixtures/config.ru
new file mode 100644
index 0000000..32118e6
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/fixtures/config.ru
@@ -0,0 +1,8 @@
+require "rubygems"
+require "sample_app"
+
+$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__)) + '/../../lib'
+require "rack/bug"
+
+use Rack::Bug, :password => "secret"
+run SampleApp
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/fixtures/dummy_panel.rb b/vendor/plugins/rack-bug/spec/fixtures/dummy_panel.rb
new file mode 100644
index 0000000..93e20d4
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/fixtures/dummy_panel.rb
@@ -0,0 +1,2 @@
+class DummyPanel < Rack::Bug::Panel
+end
diff --git a/vendor/plugins/rack-bug/spec/fixtures/sample_app.rb b/vendor/plugins/rack-bug/spec/fixtures/sample_app.rb
new file mode 100644
index 0000000..3e1b068
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/fixtures/sample_app.rb
@@ -0,0 +1,29 @@
+require "sinatra/base"
+
+class SampleApp < Sinatra::Default
+
+ get "/redirect" do
+ redirect "/"
+ end
+
+ get "/error" do
+ raise "Error!"
+ end
+
+ get "/" do
+ if params[:content_type]
+ headers["Content-Type"] = params[:content_type]
+ end
+
+ <<-HTML
+ <html>
+ <head>
+ </head>
+ <body>
+ <p>Hello</p>
+ </body>
+ </html>
+ HTML
+ end
+
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/active_record_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/active_record_panel_spec.rb
new file mode 100644
index 0000000..5a58885
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/active_record_panel_spec.rb
@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe ActiveRecordPanel do
+ before do
+ ActiveRecordPanel.reset
+ header "rack-bug.panel_classes", [ActiveRecordPanel]
+ end
+
+ describe "heading" do
+ it "displays the total number of instantiated AR objects" do
+ ActiveRecordPanel.record("User")
+ ActiveRecordPanel.record("Group")
+ response = get "/"
+ response.should have_heading("2 AR Objects")
+ end
+ end
+
+ describe "content" do
+ it "displays the count of instantiated objects for each class" do
+ ActiveRecordPanel.record("User")
+ ActiveRecordPanel.record("User")
+ ActiveRecordPanel.record("Group")
+ response = get "/"
+ response.should have_row("#active_record", "User", "2")
+ response.should have_row("#active_record", "Group", "1")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/cache_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/cache_panel_spec.rb
new file mode 100644
index 0000000..7becf26
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/cache_panel_spec.rb
@@ -0,0 +1,159 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe CachePanel do
+ before do
+ CachePanel.reset
+ header "rack-bug.panel_classes", [CachePanel]
+ end
+
+ describe "heading" do
+ it "displays the total memcache time" do
+ response = get "/"
+ response.should have_heading("Cache: 0.00ms")
+ end
+ end
+
+ describe "content" do
+ describe "usage table" do
+ it "displays the total number of memcache calls" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+
+ # This causes a bus error:
+ # response.should have_selector("th:content('Total Calls') + td", :content => "1")
+
+ response.should have_row("#cache_usage", "Total Calls", "1")
+ end
+
+ it "displays the total memcache time" do
+ response = get "/"
+ response.should have_row("#cache_usage", "Total Time", "0.00ms")
+ end
+
+ it "dispays the number of memcache hits" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "Hits", "0")
+ end
+
+ it "displays the number of memcache misses" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "Misses", "1")
+ end
+
+ it "displays the number of memcache gets" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "gets", "1")
+ end
+
+ it "displays the number of memcache sets" do
+ CachePanel.record(:set, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "sets", "1")
+ end
+
+ it "displays the number of memcache deletes" do
+ CachePanel.record(:delete, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "deletes", "1")
+ end
+
+ it "displays the number of memcache get_multis" do
+ CachePanel.record(:get_multi, "user:1", "user:2") { }
+ response = get "/"
+ response.should have_row("#cache_usage", "get_multis", "1")
+ end
+ end
+
+ describe "breakdown" do
+ it "displays each memcache operation" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_breakdown", "get")
+ end
+
+ it "displays the time for each memcache call" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_breakdown", "user:1", TIME_MS_REGEXP)
+ end
+
+ it "displays the keys for each memcache call" do
+ CachePanel.record(:get, "user:1") { }
+ response = get "/"
+ response.should have_row("#cache_breakdown", "user:1", "get")
+ end
+ end
+ end
+
+ describe "expire_all" do
+ before do
+ header "rack-bug.secret_key", 'abc'
+ end
+
+ it "expires the cache keys" do
+ Rails.stub!(:cache => mock("cache"))
+ Rails.cache.should_receive(:delete).with("user:1")
+ Rails.cache.should_receive(:delete).with("user:2")
+ Rails.cache.should_receive(:delete).with("user:3")
+ Rails.cache.should_receive(:delete).with("user:4")
+
+ get "/__rack_bug__/delete_cache_list",
+ :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
+ :hash => "c367b76e0199c308862a3afd8fba32b8715e7976"
+ end
+
+ it "returns OK" do
+ Rails.stub!(:cache => mock("cache", :delete => nil))
+ response = get "/__rack_bug__/delete_cache_list",
+ :keys_1 => "user:1", :keys_2 => "user:2", :keys_3 => "user:3", :keys_4 => "user:4",
+ :hash => "c367b76e0199c308862a3afd8fba32b8715e7976"
+ response.should contain("OK")
+ end
+ end
+
+ describe "expire" do
+ before do
+ header "rack-bug.secret_key", 'abc'
+ end
+
+ it "expires the cache key" do
+ Rails.stub!(:cache => mock("cache"))
+ Rails.cache.should_receive(:delete).with("user:1")
+ get "/__rack_bug__/delete_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ end
+
+ it "returns OK" do
+ Rails.stub!(:cache => mock("cache", :delete => nil))
+ response = get "/__rack_bug__/delete_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ response.should contain("OK")
+ end
+ end
+
+ describe "view_cache" do
+ before do
+ header "rack-bug.secret_key", 'abc'
+ end
+
+ it "renders the cache key" do
+ Rails.stub!(:cache => mock("cache", :read => "cache body"))
+ response = get "/__rack_bug__/view_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ response.should contain("cache body")
+ end
+
+ it "renders non-String cache values properly" do
+ Rails.stub!(:cache => mock("cache", :read => [1, 2]))
+ response = get "/__rack_bug__/view_cache", :key => "user:1",
+ :hash => "f87215442d312d8e42cf51e6b66fc3eb3d59ac74"
+ response.should contain("[1, 2]")
+ end
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/env_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/env_panel_spec.rb
new file mode 100644
index 0000000..93f97ee
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/env_panel_spec.rb
@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe EnvPanel do
+ before do
+ header "rack-bug.panel_classes", [EnvPanel]
+ end
+
+ describe "heading" do
+ it "displays 'Rack Env'" do
+ response = get "/"
+ response.should have_heading("Rack Env")
+ end
+ end
+
+ describe "content" do
+ it "displays the Rack environment" do
+ response = get "/"
+ response.should have_row("#env", "PATH_INFO", "/")
+ response.should have_row("#env", "REMOTE_ADDR", "127.0.0.1")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/log_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/log_panel_spec.rb
new file mode 100644
index 0000000..dff2564
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/log_panel_spec.rb
@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe LogPanel do
+ before do
+ LogPanel.reset
+ header "rack-bug.panel_classes", [LogPanel]
+ end
+
+ describe "heading" do
+ it "displays 'Log'" do
+ response = get "/"
+ response.should have_heading("Log")
+ end
+ end
+
+ describe "content" do
+ it "displays recorded log lines" do
+ LogPanel.record("This is a logged message")
+ response = get "/"
+ response.should contain("This is a logged message")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/memory_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/memory_panel_spec.rb
new file mode 100644
index 0000000..65f57cc
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/memory_panel_spec.rb
@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe MemoryPanel do
+ before do
+ header "rack-bug.panel_classes", [MemoryPanel]
+ end
+
+ describe "heading" do
+ it "displays the total memory" do
+ response = get "/"
+ response.should have_heading(/\d+ KB total/)
+ end
+
+ it "displays the memory change during the request" do
+ response = get "/"
+ response.should have_heading(/\d+ KB Î/)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/rails_info_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/rails_info_panel_spec.rb
new file mode 100644
index 0000000..c66b36f
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/rails_info_panel_spec.rb
@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe RailsInfoPanel do
+ before do
+ header "rack-bug.panel_classes", [RailsInfoPanel]
+ end
+
+ describe "heading" do
+ it "displays the Rails version" do
+ Rails.stub!(:version => "v2.3.0")
+ response = get "/"
+ response.should have_heading("Rails v2.3.0")
+ end
+ end
+
+ describe "content" do
+ it "displays the Rails::Info properties" do
+ Rails::Info.stub!(:properties => [["Name", "Value"]])
+ response = get "/"
+ response.should have_row("#rails_info", "Name", "Value")
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/sql_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/sql_panel_spec.rb
new file mode 100644
index 0000000..0ba3699
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/sql_panel_spec.rb
@@ -0,0 +1,136 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe SQLPanel do
+ before do
+ SQLPanel.reset
+ header "rack-bug.panel_classes", [SQLPanel]
+ end
+
+ describe "heading" do
+ it "displays the total SQL query count" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_heading("1 Queries")
+ end
+
+ it "displays the total SQL time" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_heading(/Queries \(\d+\.\d{2}ms\)/)
+ end
+ end
+
+ describe "content" do
+ it "displays each executed SQL query" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_row("#sql", "SELECT NOW();")
+ end
+
+ it "displays the time of each executed SQL query" do
+ SQLPanel.record("SELECT NOW();") { }
+ response = get "/"
+ response.should have_row("#sql", "SELECT NOW();", TIME_MS_REGEXP)
+ end
+ end
+
+ def stub_result(results = [[]])
+ columns = results.first
+ fields = columns.map { |c| stub("field", :name => c) }
+ rows = results[1..-1]
+
+ result = stub("result", :fetch_fields => fields)
+ result.stub!(:each).and_yield(*rows)
+ return result
+ end
+
+ def expect_query(sql, results)
+ conn = stub("connection")
+ ActiveRecord::Base.stub!(:connection => conn)
+ conn.should_receive(:execute).with(sql).and_return(stub_result(results))
+ end
+
+ describe "execute_sql" do
+ it "displays the query results" do
+ header "rack-bug.secret_key", "abc"
+ expect_query "SELECT username FROM users",
+ [["username"],
+ ["bryan"]]
+
+ response = get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ response.should contain("SELECT username FROM users")
+ response.should be_ok
+ end
+
+ it "is forbidden when the hash is missing or wrong" do
+ header "rack-bug.secret_key", 'abc'
+
+ lambda {
+ get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "foobar"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is nil" do
+ header "rack-bug.secret_key", nil
+
+ lambda {
+ get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is an empty string" do
+ header "rack-bug.secret_key", ""
+
+ lambda {
+ get "/__rack_bug__/execute_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+ end
+
+ describe "explain_sql" do
+ it "displays the query explain plan" do
+ header "rack-bug.secret_key", "abc"
+ expect_query "EXPLAIN SELECT username FROM users",
+ [["table"],
+ ["users"]]
+
+ response = get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ response.should contain("SELECT username FROM users")
+ response.should be_ok
+ end
+
+ it "is forbidden when the hash is missing or wrong" do
+ header "rack-bug.secret_key", 'abc'
+
+ lambda {
+ get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "foobar"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is nil" do
+ header "rack-bug.secret_key", nil
+
+ lambda {
+ get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+
+ it "is not available when the rack-bug.secret_key is an empty string" do
+ header "rack-bug.secret_key", ""
+
+ lambda {
+ get "/__rack_bug__/explain_sql", :query => "SELECT username FROM users",
+ :hash => "6f286f55b75716e5c91f16d77d09fa73b353ebc1"
+ }.should raise_error(SecurityError)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/templates_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/templates_panel_spec.rb
new file mode 100644
index 0000000..916c196
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/templates_panel_spec.rb
@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe TemplatesPanel do
+ before do
+ TemplatesPanel.reset
+ header "rack-bug.panel_classes", [TemplatesPanel]
+ end
+
+ describe "heading" do
+ it "displays the total rendering time" do
+ response = get "/"
+ response.should have_heading("Templates: 0.00ms")
+ end
+ end
+
+ describe "content" do
+ it "displays the template paths" do
+ TemplatesPanel.record("users/show") { }
+ response = get "/"
+ response.should contain("users/show")
+ end
+
+ it "displays the template children" do
+ TemplatesPanel.record("users/show") do
+ TemplatesPanel.record("users/toolbar") { }
+ end
+
+ response = get "/"
+ response.should have_selector("li", :content => "users/show") do |li|
+ li.should contain("users/toolbar")
+ end
+ end
+
+ context "for templates that rendered templates" do
+ it "displays the total time" do
+ TemplatesPanel.record("users/show") do
+ TemplatesPanel.record("users/toolbar") { }
+ end
+
+ response = get "/"
+ response.should have_selector("li", :content => "users/show") do |li|
+ li.should contain(TIME_MS_REGEXP)
+ end
+ end
+
+ it "displays the exclusive time" do
+ TemplatesPanel.record("users/show") do
+ TemplatesPanel.record("users/toolbar") { }
+ end
+
+ response = get "/"
+ response.should have_selector("li", :content => "users/show") do |li|
+ li.should contain(/\d\.\d{2} exclusive/)
+ end
+ end
+ end
+
+ context "for leaf templates" do
+ it "does not display the exclusive time" do
+ TemplatesPanel.record("users/show") { }
+
+ response = get "/"
+ response.should contain("users/show") do |li|
+ li.should_not contain("exclusive")
+ end
+ end
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/bug/panels/timer_panel_spec.rb b/vendor/plugins/rack-bug/spec/rack/bug/panels/timer_panel_spec.rb
new file mode 100644
index 0000000..014b243
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/bug/panels/timer_panel_spec.rb
@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+module Rack::Bug
+ describe TimerPanel do
+ before do
+ header "rack-bug.panel_classes", [TimerPanel]
+ end
+
+ describe "heading" do
+ it "displays the elapsed time" do
+ response = get "/"
+ response.should have_heading(TIME_MS_REGEXP)
+ end
+ end
+
+ describe "content" do
+ it "displays the user CPU time" do
+ response = get "/"
+ response.should have_row("#timer", "User CPU time", TIME_MS_REGEXP)
+ end
+
+ it "displays the system CPU time" do
+ response = get "/"
+ response.should have_row("#timer", "System CPU time", TIME_MS_REGEXP)
+ end
+
+ it "displays the total CPU time" do
+ response = get "/"
+ response.should have_row("#timer", "Total CPU time", TIME_MS_REGEXP)
+ end
+
+ it "displays the elapsed time" do
+ response = get "/"
+ response.should have_row("#timer", "Elapsed time", TIME_MS_REGEXP)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rack/toolbar_spec.rb b/vendor/plugins/rack-bug/spec/rack/toolbar_spec.rb
new file mode 100644
index 0000000..153258c
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rack/toolbar_spec.rb
@@ -0,0 +1,100 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Rack::Bug do
+ it "inserts the Rack::Bug toolbar" do
+ response = get "/"
+ response.should contain("Rack::Bug")
+ end
+
+ it "updates the Content-Length" do
+ response = get "/"
+ response["Content-Length"].should == response.body.size.to_s
+ end
+
+ it "serves the Rack::Bug assets under /__rack_bug__/" do
+ response = get "/__rack_bug__/bug.css"
+ response.should be_ok
+ end
+
+ it "modifies HTML responses with a charset" do
+ response = get "/", :content_type => "application/xhtml+xml; charset=utf-8"
+ response.should contain("Rack::Bug")
+ end
+
+ it "does not modify XMLHttpRequest responses" do
+ response = get "/", {}, { :xhr => true }
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "modifies XHTML responses" do
+ response = get "/", :content_type => "application/xhtml+xml"
+ response.should contain("Rack::Bug")
+ end
+
+ it "does not modify non-HTML responses" do
+ response = get "/", :content_type => "text/csv"
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "does not modify redirects" do
+ response = get "/redirect"
+ response.body.should == ""
+ end
+
+ it "does not modify server errors" do
+ response = get "/error"
+ response.should_not contain("Rack::Bug")
+ end
+
+ context "configured to intercept redirects" do
+ it "inserts the Rack::Bug toolbar for redirects" do
+ response = get "/redirect", {}, "rack-bug.intercept_redirects" => true
+ response.should contain("Location: /")
+ end
+ end
+
+ context "configured with an IP address restriction" do
+ before do
+ header "rack-bug.ip_masks", [IPAddr.new("127.0.0.1/255.255.255.0")]
+ end
+
+ it "inserts the Rack::Bug toolbar when the IP matches" do
+ response = get "/", {}, "REMOTE_ADDR" => "127.0.0.2"
+ response.should contain("Rack::Bug")
+ end
+
+ it "is disabled when the IP doesn't match" do
+ response = get "/", {}, "REMOTE_ADDR" => "128.0.0.1"
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "doesn't use any panels" do
+ DummyPanel.should_not_receive(:new)
+ header "rack-bug.panel_classes", [DummyPanel]
+ get "/", {}, "REMOTE_ADDR" => "128.0.0.1"
+ end
+ end
+
+ context "configured with a password" do
+ before do
+ header "rack-bug.password", "secret"
+ end
+
+ it "inserts the Rack::Bug toolbar when the password matches" do
+ sha = "545049d1c5e2a6e0dfefd37f9a9e0beb95241935"
+ response = get "/", {}, :cookie => ["rack_bug_enabled=1", "rack_bug_password=#{sha}"]
+ response.should contain("Rack::Bug")
+ end
+
+ it "is disabled when the password doesn't match" do
+ response = get "/"
+ response.should_not contain("Rack::Bug")
+ end
+
+ it "doesn't use any panels" do
+ DummyPanel.should_not_receive(:new)
+ header "rack-bug.panel_classes", [DummyPanel]
+ get "/"
+ end
+ end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/rcov.opts b/vendor/plugins/rack-bug/spec/rcov.opts
new file mode 100644
index 0000000..5b0aa15
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/rcov.opts
@@ -0,0 +1 @@
+-x gems,spec\/
\ No newline at end of file
diff --git a/vendor/plugins/rack-bug/spec/spec.opts b/vendor/plugins/rack-bug/spec/spec.opts
new file mode 100644
index 0000000..4e1e0d2
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/spec.opts
@@ -0,0 +1 @@
+--color
diff --git a/vendor/plugins/rack-bug/spec/spec_helper.rb b/vendor/plugins/rack-bug/spec/spec_helper.rb
new file mode 100644
index 0000000..8b1caa3
--- /dev/null
+++ b/vendor/plugins/rack-bug/spec/spec_helper.rb
@@ -0,0 +1,70 @@
+require "rubygems"
+require "spec"
+require "webrat"
+require "rack/test"
+
+$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__)) + '/lib'
+$LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))
+
+require "rack/bug"
+require "spec/fixtures/sample_app"
+require "spec/fixtures/dummy_panel"
+
+module Rails
+ def self.version
+ ""
+ end
+
+ class Info
+ def self.properties
+ []
+ end
+ end
+end
+
+module ActiveRecord
+ class Base
+ end
+end
+
+Spec::Runner.configure do |config|
+ TIME_MS_REGEXP = /\d+\.\d{2}ms/
+
+ config.include Rack::Test::Methods
+ config.include Webrat::Matchers
+
+ config.before do
+ # This allows specs to record data outside the request
+ Rack::Bug.enable
+
+ # Set the cookie that triggers Rack::Bug under normal conditions
+ header :cookie, "rack_bug_enabled=1"
+ end
+
+ def app
+ Rack::Builder.new do
+ use Rack::Bug
+ run SampleApp.new
+ end
+ end
+
+ def have_row(container, key, value = nil)
+ simple_matcher("contain row") do |response|
+ if value
+ response.should have_selector("#{container} tr", :content => key) do |row|
+ row.should contain(value)
+ end
+ else
+ response.should have_selector("#{container} tr", :content => key)
+ end
+ end
+ end
+
+ def have_heading(text)
+ simple_matcher("have heading") do |response|
+ response.should have_selector("#rack_bug_toolbar li") do |heading|
+ heading.should contain(text)
+ end
+ end
+ end
+end
\ No newline at end of file
|
sunlightlabs/tcorps | 8c0faf063d810eb9de37a8ba1ae02baa48e31051 | Enabled display of total elapsed seconds in the form of minutes, in the admin section | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8aac04e..b853558 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,32 +1,36 @@
module ApplicationHelper
def is_home?(body_class)
[nil, :home].include? body_class
end
def errors(object)
render :partial => 'layouts/partials/errors', :locals => {:object => object}
end
def period(string)
string << (string.last == '.' ? '' : '.')
end
def open_id_return?
params[:open_id_complete] == '1'
end
def to_word(number)
{
1 => 'One',
2 => 'Two',
3 => 'Three',
4 => 'Four',
5 => 'Five',
6 => 'Six',
7 => 'Seven',
8 => 'Eight',
9 => 'Nine',
10 => 'Ten'
}[number] || number
end
+
+ def to_minutes(seconds)
+ "#{seconds / 60}:#{seconds % 60}"
+ end
end
\ No newline at end of file
diff --git a/app/views/layouts/partials/_stats.html.erb b/app/views/layouts/partials/_stats.html.erb
index 8e89a4e..25b079d 100644
--- a/app/views/layouts/partials/_stats.html.erb
+++ b/app/views/layouts/partials/_stats.html.erb
@@ -1,19 +1,19 @@
<h3>Stats</h3>
<ul>
<li>
<span><%= Campaign.percent_complete %>%</span>
<p>all tasks complete</p>
</li>
<li>
<span><%= User.participants.all.size %></span>
<p>people participating</p>
</li>
<li>
<span><%= Task.completed.count %></span>
<p>tasks completed</p>
</li>
<li>
- <span>2:00</span>
- <p>time spent on tasks</p>
+ <span><%= to_minutes Task.sum(:elapsed_seconds) %></span>
+ <p>time spent on tasks<br/>(minutes:seconds)</p>
</li>
</ul>
\ No newline at end of file
diff --git a/test/unit/campaign_test.rb b/test/unit/campaign_test.rb
index c0f6be6..6269261 100644
--- a/test/unit/campaign_test.rb
+++ b/test/unit/campaign_test.rb
@@ -1,147 +1,143 @@
require 'test_helper'
class CampaignTest < ActiveSupport::TestCase
test 'Campaign.percent_complete measures percent of all completed tasks' do
campaign1 = Factory :campaign, :runs => 5
campaign2 = Factory :campaign, :runs => 5
3.times {Factory :task, :campaign => campaign1}
3.times {Factory :task, :campaign => campaign2}
2.times {Factory :completed_task, :campaign => campaign1}
2.times {Factory :completed_task, :campaign => campaign2}
assert_equal 40, Campaign.percent_complete
2.times {Factory :completed_task, :campaign => campaign1}
assert_equal 60, Campaign.percent_complete
end
- test 'Campaign.time_spent is the total number of time spent on all completed tasks' do
-
- end
-
test '#percent_complete measures percent of completed tasks' do
campaign = Factory :campaign, :runs => 5
task1 = Factory :task, :campaign => campaign
task2 = Factory :task, :campaign => campaign
task3 = Factory :task, :campaign => campaign
task4 = Factory :task, :campaign => campaign
task5 = Factory :task, :campaign => campaign
assert_equal 0, campaign.percent_complete
task1.update_attribute :completed_at, Time.now
assert_equal 20, campaign.percent_complete
task2.update_attribute :completed_at, Time.now
assert_equal 40, campaign.percent_complete
task3.update_attribute :completed_at, Time.now
assert_equal 60, campaign.percent_complete
task4.update_attribute :completed_at, Time.now
assert_equal 80, campaign.percent_complete
task5.update_attribute :completed_at, Time.now
assert_equal 100, campaign.percent_complete
end
test '#active named scope limits search to campaigns who have fewer completed tasks than the # of specified runs' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert !Campaign.active.include?(campaign3)
end
test '#active named scope limits search to campaigns where the user has not reached their individual run limit' do
user = Factory :user
campaign1 = Factory :campaign, :runs => 20, :user_runs => 2
campaign2 = Factory :campaign, :runs => 20, :user_runs => 2
campaign3 = Factory :campaign, :runs => 20, :user_runs => 2
campaign4 = Factory :campaign, :runs => 20, :user_runs => nil
Factory :task, :campaign => campaign1, :user => user
Factory :task, :campaign => campaign1, :user => user
Factory :completed_task, :campaign => campaign2, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert Campaign.active.include?(campaign3)
assert Campaign.active.include?(campaign4)
assert Campaign.active_for(user).include?(campaign1)
assert Campaign.active_for(user).include?(campaign2)
assert !Campaign.active_for(user).include?(campaign3)
assert Campaign.active_for(user).include?(campaign4)
end
test '#complete? indicates whether the maximum runs have been met' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert !campaign1.complete?
assert !campaign2.complete?
assert campaign3.complete?
end
test '#complete? with a user passed in indicates whether the maximum runs for that user have been met' do
user1 = Factory :user
user2 = Factory :user
user3 = Factory :user
campaign1 = Factory :campaign, :runs => 3, :user_runs => 1
campaign2 = Factory :campaign, :runs => 3, :user_runs => 2
campaign3 = Factory :campaign, :runs => 3, :user_runs => 3
Factory :task, :campaign => campaign1, :user => user1
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user1
Factory :completed_task, :campaign => campaign3, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user3
assert !campaign1.complete?(user1)
assert !campaign1.complete?(user2)
assert !campaign1.complete?
assert !campaign2.complete?(user1)
assert campaign2.complete?(user2)
assert !campaign2.complete?
assert !campaign3.complete?(user1)
assert !campaign3.complete?(user2)
assert !campaign3.complete?(user3)
assert campaign3.complete?
end
test '#complete? for a user will always return false if the user_runs field is blank' do
user = Factory :user
endless_campaign = Factory :campaign, :user_runs => nil, :runs => 5000
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
end
end
\ No newline at end of file
|
sunlightlabs/tcorps | 4e54b40d4e6e9b5a5bb11bab3ba578f1c1e614a3 | Fixed a 0 / 0 bug in Campaign.percent_complete | diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 3d9a54a..b58295e 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -1,36 +1,41 @@
class Campaign < ActiveRecord::Base
belongs_to :creator, :class_name => 'User'
has_many :tasks
validates_presence_of :name, :points, :url, :runs, :start_at
validates_numericality_of :runs, :greater_than => 0
named_scope :active,
:select => "campaigns.*",
:conditions => "(select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs"
named_scope :active_for, lambda {|user|
# ActiveRecord does not offer ?-style interpolation for the select parameter,
# and the id attribute is not subject to user manipulation, so this is safe
{
:select => "campaigns.*",
:conditions => "(select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs and (campaigns.user_runs IS NULL OR campaigns.user_runs = 0 OR (select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL and tasks.user_id = #{user.id}) < campaigns.user_runs)"
}
}
def self.percent_complete
+ tasks_complete = Task.completed.count
+ runs = Campaign.sum :runs
+ return 0 if tasks_complete == 0 or runs == 0
((Task.completed.count.to_f / Campaign.sum(:runs).to_f) * 100).to_i
end
def percent_complete
+ # since runs must be greater than 0 in the validations,
+ # NaN and divide by zero errors are not an issue
((tasks.completed.count.to_f / runs.to_f) * 100).to_i
end
def complete?(user = nil)
if user
tasks.for_user(user).completed.count == user_runs
else
tasks.completed.count == runs
end
end
end
\ No newline at end of file
diff --git a/app/views/layouts/partials/_stats.html.erb b/app/views/layouts/partials/_stats.html.erb
index 31716d1..8e89a4e 100644
--- a/app/views/layouts/partials/_stats.html.erb
+++ b/app/views/layouts/partials/_stats.html.erb
@@ -1,19 +1,19 @@
<h3>Stats</h3>
<ul>
<li>
<span><%= Campaign.percent_complete %>%</span>
<p>all tasks complete</p>
</li>
<li>
<span><%= User.participants.all.size %></span>
<p>people participating</p>
</li>
<li>
- <span>10</span>
+ <span><%= Task.completed.count %></span>
<p>tasks completed</p>
</li>
<li>
<span>2:00</span>
<p>time spent on tasks</p>
</li>
</ul>
\ No newline at end of file
|
sunlightlabs/tcorps | c688b30233632e23230809dfe33be6d1c054221f | Enabled the 'People participating' statistic in the admin section | diff --git a/app/models/user.rb b/app/models/user.rb
index 2c245a8..17a11dc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,46 +1,49 @@
class User < ActiveRecord::Base
attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns
has_many :tasks
has_many :campaigns, :foreign_key => :creator_id
has_attached_file :avatar,
:styles => {:normal => '64x64#', :tiny => '24x24#'},
:default_url => "/images/avatar_:gender_:style.jpg"
named_scope :by_points, :select => 'users.*, (select sum(tasks.points) as sum_points from tasks where completed_at is not null and tasks.user_id = users.id) as sum_points', :order => 'sum_points desc'
named_scope :leaders, lambda {
{:conditions => ['sum_points >= ?', LEVELS.keys.sort.first]}
}
+ named_scope :participants, :select => 'users.*, (select count(*) from tasks where completed_at is not null and tasks.user_id = users.id) as num_tasks', :conditions => 'num_tasks > 0'
+
+
named_scope :campaign_subscribers, :conditions => ['subscribe_campaigns = ?', true]
acts_as_authentic
def total_points
tasks.sum :points, :conditions => 'completed_at is not null'
end
def campaign_points(campaign)
tasks.sum :points, :conditions => ['completed_at is not null and campaign_id = ?', campaign.id]
end
def manager?
!organization_name.blank?
end
def level
points = respond_to?(:sum_points) ? sum_points.to_i : total_points
levels = LEVELS.keys.sort
level = 0
levels.each_with_index do |minimum, i|
level = i + 1 if points >= minimum
end
level
end
Paperclip.interpolates :gender do |attachment, style|
[:female, :male][rand 2]
end
end
\ No newline at end of file
diff --git a/app/views/layouts/partials/_stats.html.erb b/app/views/layouts/partials/_stats.html.erb
index 9fca7d8..31716d1 100644
--- a/app/views/layouts/partials/_stats.html.erb
+++ b/app/views/layouts/partials/_stats.html.erb
@@ -1,19 +1,19 @@
<h3>Stats</h3>
<ul>
<li>
<span><%= Campaign.percent_complete %>%</span>
<p>all tasks complete</p>
</li>
<li>
- <span>5</span>
+ <span><%= User.participants.all.size %></span>
<p>people participating</p>
</li>
<li>
<span>10</span>
<p>tasks completed</p>
</li>
<li>
<span>2:00</span>
<p>time spent on tasks</p>
</li>
</ul>
\ No newline at end of file
diff --git a/test/unit/campaign_test.rb b/test/unit/campaign_test.rb
index a5bbf2e..c0f6be6 100644
--- a/test/unit/campaign_test.rb
+++ b/test/unit/campaign_test.rb
@@ -1,151 +1,147 @@
require 'test_helper'
class CampaignTest < ActiveSupport::TestCase
test 'Campaign.percent_complete measures percent of all completed tasks' do
campaign1 = Factory :campaign, :runs => 5
campaign2 = Factory :campaign, :runs => 5
3.times {Factory :task, :campaign => campaign1}
3.times {Factory :task, :campaign => campaign2}
2.times {Factory :completed_task, :campaign => campaign1}
2.times {Factory :completed_task, :campaign => campaign2}
assert_equal 40, Campaign.percent_complete
2.times {Factory :completed_task, :campaign => campaign1}
assert_equal 60, Campaign.percent_complete
end
- test 'Campaign.participants is the number of people with at least one completed task' do
-
- end
-
test 'Campaign.time_spent is the total number of time spent on all completed tasks' do
end
test '#percent_complete measures percent of completed tasks' do
campaign = Factory :campaign, :runs => 5
task1 = Factory :task, :campaign => campaign
task2 = Factory :task, :campaign => campaign
task3 = Factory :task, :campaign => campaign
task4 = Factory :task, :campaign => campaign
task5 = Factory :task, :campaign => campaign
assert_equal 0, campaign.percent_complete
task1.update_attribute :completed_at, Time.now
assert_equal 20, campaign.percent_complete
task2.update_attribute :completed_at, Time.now
assert_equal 40, campaign.percent_complete
task3.update_attribute :completed_at, Time.now
assert_equal 60, campaign.percent_complete
task4.update_attribute :completed_at, Time.now
assert_equal 80, campaign.percent_complete
task5.update_attribute :completed_at, Time.now
assert_equal 100, campaign.percent_complete
end
test '#active named scope limits search to campaigns who have fewer completed tasks than the # of specified runs' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert !Campaign.active.include?(campaign3)
end
test '#active named scope limits search to campaigns where the user has not reached their individual run limit' do
user = Factory :user
campaign1 = Factory :campaign, :runs => 20, :user_runs => 2
campaign2 = Factory :campaign, :runs => 20, :user_runs => 2
campaign3 = Factory :campaign, :runs => 20, :user_runs => 2
campaign4 = Factory :campaign, :runs => 20, :user_runs => nil
Factory :task, :campaign => campaign1, :user => user
Factory :task, :campaign => campaign1, :user => user
Factory :completed_task, :campaign => campaign2, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert Campaign.active.include?(campaign3)
assert Campaign.active.include?(campaign4)
assert Campaign.active_for(user).include?(campaign1)
assert Campaign.active_for(user).include?(campaign2)
assert !Campaign.active_for(user).include?(campaign3)
assert Campaign.active_for(user).include?(campaign4)
end
test '#complete? indicates whether the maximum runs have been met' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert !campaign1.complete?
assert !campaign2.complete?
assert campaign3.complete?
end
test '#complete? with a user passed in indicates whether the maximum runs for that user have been met' do
user1 = Factory :user
user2 = Factory :user
user3 = Factory :user
campaign1 = Factory :campaign, :runs => 3, :user_runs => 1
campaign2 = Factory :campaign, :runs => 3, :user_runs => 2
campaign3 = Factory :campaign, :runs => 3, :user_runs => 3
Factory :task, :campaign => campaign1, :user => user1
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user1
Factory :completed_task, :campaign => campaign3, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user3
assert !campaign1.complete?(user1)
assert !campaign1.complete?(user2)
assert !campaign1.complete?
assert !campaign2.complete?(user1)
assert campaign2.complete?(user2)
assert !campaign2.complete?
assert !campaign3.complete?(user1)
assert !campaign3.complete?(user2)
assert !campaign3.complete?(user3)
assert campaign3.complete?
end
test '#complete? for a user will always return false if the user_runs field is blank' do
user = Factory :user
endless_campaign = Factory :campaign, :user_runs => nil, :runs => 5000
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
end
end
\ No newline at end of file
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 91ef833..5b4471c 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,109 +1,133 @@
require 'test_helper'
class UserTest < ActiveSupport::TestCase
test '#by_points includes points as an attribute on user and sorts on this attribute' do
user1 = Factory :user
user2 = Factory :user
user3 = Factory :user
campaign_one = Factory :campaign, :creator => user1, :points => 1
campaign_two = Factory :campaign, :creator => user2, :points => 2
campaign_three = Factory :campaign, :creator => user3, :points => 4
campaign_four = Factory :campaign, :creator => user3, :points => 8
Factory :completed_task, :campaign => campaign_one, :user => user3
Factory :completed_task, :campaign => campaign_two, :user => user1
Factory :completed_task, :campaign => campaign_three, :user => user2
Factory :completed_task, :campaign => campaign_four, :user => user2
assert_equal [user2, user1, user3], User.by_points.all
assert_nothing_raised do
assert_equal 12, User.by_points.first.sum_points.to_i
end
end
+ test '#participants only returns people who have at least one completed task' do
+ no_tasks = Factory :user
+ only_uncompleted_tasks = Factory :user
+ only_completed_tasks = Factory :user
+ some_of_both = Factory :user
+
+ Factory :task, :user => only_uncompleted_tasks
+ Factory :task, :user => only_uncompleted_tasks
+ Factory :task, :user => some_of_both
+ Factory :task, :user => some_of_both
+
+ Factory :completed_task, :user => only_completed_tasks
+ Factory :completed_task, :user => only_completed_tasks
+ Factory :completed_task, :user => some_of_both
+ Factory :completed_task, :user => some_of_both
+
+ participants = User.participants.all
+ assert_equal 2, participants.size
+ assert !participants.include?(no_tasks)
+ assert !participants.include?(only_uncompleted_tasks)
+ assert participants.include?(only_completed_tasks)
+ assert participants.include?(some_of_both)
+ end
+
test '#leaders only returns people who are at least level 1' do
minimum = LEVELS.keys.sort.first
user1 = Factory :user
user2 = Factory :user
user3 = Factory :user
campaign_one = Factory :campaign, :creator => user1, :points => minimum - 1
campaign_two = Factory :campaign, :creator => user1, :points => minimum
campaign_three = Factory :campaign, :creator => user1, :points => minimum + 1
Factory :completed_task, :campaign => campaign_one, :user => user1
Factory :completed_task, :campaign => campaign_two, :user => user2
Factory :completed_task, :campaign => campaign_three, :user => user3
assert_equal [user3, user2], User.by_points.leaders.all
end
test '#total_points counts tasks from all campaigns' do
user = Factory :user
assert_equal 0, user.total_points
campaign_one = Factory :campaign, :points => 1
campaign_two = Factory :campaign, :points => 2
campaign_three = Factory :campaign, :points => 4
Factory :completed_task, :campaign => campaign_one, :user => user
Factory :completed_task, :campaign => campaign_two, :user => user
Factory :completed_task, :campaign => campaign_three, :user => user
assert_equal 7, user.total_points
end
test '#total_points counts only completed tasks' do
user = Factory :user
assert_equal 0, user.total_points
campaign_one = Factory :campaign, :points => 1
campaign_two = Factory :campaign, :points => 2
campaign_three = Factory :campaign, :points => 4
Factory :completed_task, :campaign => campaign_one, :user => user
Factory :task, :campaign => campaign_two, :user => user
Factory :completed_task, :campaign => campaign_three, :user => user
assert_equal 5, user.total_points
end
test '#campaign_points counts tasks from one campaign' do
user = Factory :user
campaign_one = Factory :campaign, :points => 1
campaign_two = Factory :campaign, :points => 2
campaign_three = Factory :campaign, :points => 4
assert_equal 0, user.campaign_points(campaign_one)
assert_equal 0, user.campaign_points(campaign_two)
assert_equal 0, user.campaign_points(campaign_three)
Factory :completed_task, :campaign => campaign_one, :user => user
Factory :completed_task, :campaign => campaign_two, :user => user
Factory :completed_task, :campaign => campaign_three, :user => user
assert_equal 1, user.campaign_points(campaign_one)
assert_equal 2, user.campaign_points(campaign_two)
assert_equal 4, user.campaign_points(campaign_three)
end
test '#campaign_points counts only completed tasks' do
user = Factory :user
campaign = Factory :campaign, :points => 1
assert_equal 0, user.campaign_points(campaign)
Factory :completed_task, :campaign => campaign, :user => user
Factory :completed_task, :campaign => campaign, :user => user
Factory :task, :campaign => campaign, :user => user
assert_equal 2, user.campaign_points(campaign)
end
test '#manager? depends on presence of organization name' do
assert Factory(:user, :organization_name => 'any name').manager?
assert !Factory(:user, :organization_name => nil).manager?
assert !Factory(:user, :admin => true, :organization_name => nil).manager?
end
end
\ No newline at end of file
|
sunlightlabs/tcorps | 3d7f0dd1b34545d950c8e9f214063db8aa30d1dd | Enabled task complete stats on the admin area | diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 74095d4..3d9a54a 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -1,32 +1,36 @@
class Campaign < ActiveRecord::Base
belongs_to :creator, :class_name => 'User'
has_many :tasks
validates_presence_of :name, :points, :url, :runs, :start_at
validates_numericality_of :runs, :greater_than => 0
named_scope :active,
:select => "campaigns.*",
:conditions => "(select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs"
named_scope :active_for, lambda {|user|
# ActiveRecord does not offer ?-style interpolation for the select parameter,
# and the id attribute is not subject to user manipulation, so this is safe
{
:select => "campaigns.*",
:conditions => "(select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL) < campaigns.runs and (campaigns.user_runs IS NULL OR campaigns.user_runs = 0 OR (select count(*) from tasks where tasks.campaign_id = campaigns.id and tasks.completed_at IS NOT NULL and tasks.user_id = #{user.id}) < campaigns.user_runs)"
}
}
+ def self.percent_complete
+ ((Task.completed.count.to_f / Campaign.sum(:runs).to_f) * 100).to_i
+ end
+
def percent_complete
((tasks.completed.count.to_f / runs.to_f) * 100).to_i
end
def complete?(user = nil)
if user
tasks.for_user(user).completed.count == user_runs
else
tasks.completed.count == runs
end
end
end
\ No newline at end of file
diff --git a/app/views/layouts/partials/_stats.html.erb b/app/views/layouts/partials/_stats.html.erb
index f1dd56f..9fca7d8 100644
--- a/app/views/layouts/partials/_stats.html.erb
+++ b/app/views/layouts/partials/_stats.html.erb
@@ -1,19 +1,19 @@
<h3>Stats</h3>
<ul>
<li>
- <span>45%</span>
+ <span><%= Campaign.percent_complete %>%</span>
<p>all tasks complete</p>
</li>
<li>
<span>5</span>
<p>people participating</p>
</li>
<li>
<span>10</span>
<p>tasks completed</p>
</li>
<li>
<span>2:00</span>
<p>time spent on tasks</p>
</li>
</ul>
\ No newline at end of file
diff --git a/test/unit/campaign_test.rb b/test/unit/campaign_test.rb
index eafa294..a5bbf2e 100644
--- a/test/unit/campaign_test.rb
+++ b/test/unit/campaign_test.rb
@@ -1,128 +1,151 @@
require 'test_helper'
class CampaignTest < ActiveSupport::TestCase
+ test 'Campaign.percent_complete measures percent of all completed tasks' do
+ campaign1 = Factory :campaign, :runs => 5
+ campaign2 = Factory :campaign, :runs => 5
+ 3.times {Factory :task, :campaign => campaign1}
+ 3.times {Factory :task, :campaign => campaign2}
+ 2.times {Factory :completed_task, :campaign => campaign1}
+ 2.times {Factory :completed_task, :campaign => campaign2}
+
+ assert_equal 40, Campaign.percent_complete
+
+ 2.times {Factory :completed_task, :campaign => campaign1}
+
+ assert_equal 60, Campaign.percent_complete
+ end
+
+ test 'Campaign.participants is the number of people with at least one completed task' do
+
+ end
+
+ test 'Campaign.time_spent is the total number of time spent on all completed tasks' do
+
+ end
+
test '#percent_complete measures percent of completed tasks' do
campaign = Factory :campaign, :runs => 5
task1 = Factory :task, :campaign => campaign
task2 = Factory :task, :campaign => campaign
task3 = Factory :task, :campaign => campaign
task4 = Factory :task, :campaign => campaign
task5 = Factory :task, :campaign => campaign
assert_equal 0, campaign.percent_complete
task1.update_attribute :completed_at, Time.now
assert_equal 20, campaign.percent_complete
task2.update_attribute :completed_at, Time.now
assert_equal 40, campaign.percent_complete
task3.update_attribute :completed_at, Time.now
assert_equal 60, campaign.percent_complete
task4.update_attribute :completed_at, Time.now
assert_equal 80, campaign.percent_complete
task5.update_attribute :completed_at, Time.now
assert_equal 100, campaign.percent_complete
end
test '#active named scope limits search to campaigns who have fewer completed tasks than the # of specified runs' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert !Campaign.active.include?(campaign3)
end
test '#active named scope limits search to campaigns where the user has not reached their individual run limit' do
user = Factory :user
campaign1 = Factory :campaign, :runs => 20, :user_runs => 2
campaign2 = Factory :campaign, :runs => 20, :user_runs => 2
campaign3 = Factory :campaign, :runs => 20, :user_runs => 2
campaign4 = Factory :campaign, :runs => 20, :user_runs => nil
Factory :task, :campaign => campaign1, :user => user
Factory :task, :campaign => campaign1, :user => user
Factory :completed_task, :campaign => campaign2, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
Factory :completed_task, :campaign => campaign3, :user => user
assert Campaign.active.include?(campaign1)
assert Campaign.active.include?(campaign2)
assert Campaign.active.include?(campaign3)
assert Campaign.active.include?(campaign4)
assert Campaign.active_for(user).include?(campaign1)
assert Campaign.active_for(user).include?(campaign2)
assert !Campaign.active_for(user).include?(campaign3)
assert Campaign.active_for(user).include?(campaign4)
end
test '#complete? indicates whether the maximum runs have been met' do
campaign1 = Factory :campaign, :runs => 2
campaign2 = Factory :campaign, :runs => 2
campaign3 = Factory :campaign, :runs => 2
Factory :task, :campaign => campaign1
Factory :task, :campaign => campaign1
Factory :completed_task, :campaign => campaign2
Factory :completed_task, :campaign => campaign3
Factory :completed_task, :campaign => campaign3
assert !campaign1.complete?
assert !campaign2.complete?
assert campaign3.complete?
end
test '#complete? with a user passed in indicates whether the maximum runs for that user have been met' do
user1 = Factory :user
user2 = Factory :user
user3 = Factory :user
campaign1 = Factory :campaign, :runs => 3, :user_runs => 1
campaign2 = Factory :campaign, :runs => 3, :user_runs => 2
campaign3 = Factory :campaign, :runs => 3, :user_runs => 3
Factory :task, :campaign => campaign1, :user => user1
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign2, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user1
Factory :completed_task, :campaign => campaign3, :user => user2
Factory :completed_task, :campaign => campaign3, :user => user3
assert !campaign1.complete?(user1)
assert !campaign1.complete?(user2)
assert !campaign1.complete?
assert !campaign2.complete?(user1)
assert campaign2.complete?(user2)
assert !campaign2.complete?
assert !campaign3.complete?(user1)
assert !campaign3.complete?(user2)
assert !campaign3.complete?(user3)
assert campaign3.complete?
end
test '#complete? for a user will always return false if the user_runs field is blank' do
user = Factory :user
endless_campaign = Factory :campaign, :user_runs => nil, :runs => 5000
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
Factory :completed_task, :user => user
assert !endless_campaign.complete?(user)
end
end
\ No newline at end of file
|
sunlightlabs/tcorps | 1890ca75254aebc7acfce83b6f74fc9e084488b0 | Fixed bug where subscription option couldn't be set from a form without whitelisting | diff --git a/app/models/user.rb b/app/models/user.rb
index 6ea936b..2c245a8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,46 +1,46 @@
class User < ActiveRecord::Base
- attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar
+ attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns
has_many :tasks
has_many :campaigns, :foreign_key => :creator_id
has_attached_file :avatar,
:styles => {:normal => '64x64#', :tiny => '24x24#'},
:default_url => "/images/avatar_:gender_:style.jpg"
named_scope :by_points, :select => 'users.*, (select sum(tasks.points) as sum_points from tasks where completed_at is not null and tasks.user_id = users.id) as sum_points', :order => 'sum_points desc'
named_scope :leaders, lambda {
{:conditions => ['sum_points >= ?', LEVELS.keys.sort.first]}
}
named_scope :campaign_subscribers, :conditions => ['subscribe_campaigns = ?', true]
acts_as_authentic
def total_points
tasks.sum :points, :conditions => 'completed_at is not null'
end
def campaign_points(campaign)
tasks.sum :points, :conditions => ['completed_at is not null and campaign_id = ?', campaign.id]
end
def manager?
!organization_name.blank?
end
def level
points = respond_to?(:sum_points) ? sum_points.to_i : total_points
levels = LEVELS.keys.sort
level = 0
levels.each_with_index do |minimum, i|
level = i + 1 if points >= minimum
end
level
end
Paperclip.interpolates :gender do |attachment, style|
[:female, :male][rand 2]
end
end
\ No newline at end of file
|
sunlightlabs/tcorps | e9eb5f75ff09763fbd3568c172d40cf75399eb54 | Added a checkbox to allow people to subscribe to email notifications when new campaigns are added | diff --git a/app/controllers/admin/campaigns_controller.rb b/app/controllers/admin/campaigns_controller.rb
index 1fd1d8f..36425b0 100644
--- a/app/controllers/admin/campaigns_controller.rb
+++ b/app/controllers/admin/campaigns_controller.rb
@@ -1,58 +1,64 @@
class Admin::CampaignsController < ApplicationController
layout 'admin'
skip_before_filter :load_sidebar
before_filter :require_login
before_filter :require_manager
before_filter :load_campaign, :only => [:edit, :update, :confirm_destroy, :destroy]
def index
@campaigns = current_user.campaigns.all(:order => 'created_at DESC')
end
def new
@campaign = current_user.campaigns.new :points => RECOMMENDED_CAMPAIGN_POINTS
end
def create
@campaign = current_user.campaigns.new params[:campaign]
if @campaign.save
+ deliver_campaign_notifications @campaign
flash[:success] = 'Campaign created.'
redirect_to admin_campaigns_path
else
render :action => :new
end
end
def edit
end
def update
if @campaign.update_attributes params[:campaign]
flash[:success] = 'Your campaign has been updated.'
redirect_to admin_campaigns_path
else
render :action => :edit
end
end
def confirm_destroy
-
end
def destroy
@campaign.destroy
flash[:success] = 'Your campaign has been deleted.'
redirect_to admin_campaigns_path
end
protected
def load_campaign
unless @campaign = Campaign.find_by_id(params[:id]) and @campaign.creator == current_user
redirect_to root_path and return false
end
end
+ def deliver_campaign_notifications(campaign)
+ (User.campaign_subscribers.all - [campaign.creator]).each do |user|
+ CampaignMailer.deliver_new_campaign(campaign, user)
+ end
+ end
+
end
\ No newline at end of file
diff --git a/app/models/campaign_mailer.rb b/app/models/campaign_mailer.rb
new file mode 100644
index 0000000..cb17fdb
--- /dev/null
+++ b/app/models/campaign_mailer.rb
@@ -0,0 +1,10 @@
+class CampaignMailer < ActionMailer::Base
+
+ def new_campaign(campaign, user)
+ recipients user.email
+ from '[email protected]'
+ subject "A new campaign has appeared on TransparencyCorps"
+ body :campaign => campaign, :user => user, :host => SITE_HOST
+ content_type 'text/html'
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index f0d0710..6ea936b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,45 +1,46 @@
class User < ActiveRecord::Base
attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar
has_many :tasks
has_many :campaigns, :foreign_key => :creator_id
has_attached_file :avatar,
:styles => {:normal => '64x64#', :tiny => '24x24#'},
:default_url => "/images/avatar_:gender_:style.jpg"
named_scope :by_points, :select => 'users.*, (select sum(tasks.points) as sum_points from tasks where completed_at is not null and tasks.user_id = users.id) as sum_points', :order => 'sum_points desc'
named_scope :leaders, lambda {
{:conditions => ['sum_points >= ?', LEVELS.keys.sort.first]}
}
+ named_scope :campaign_subscribers, :conditions => ['subscribe_campaigns = ?', true]
acts_as_authentic
def total_points
tasks.sum :points, :conditions => 'completed_at is not null'
end
def campaign_points(campaign)
tasks.sum :points, :conditions => ['completed_at is not null and campaign_id = ?', campaign.id]
end
def manager?
!organization_name.blank?
end
def level
points = respond_to?(:sum_points) ? sum_points.to_i : total_points
levels = LEVELS.keys.sort
level = 0
levels.each_with_index do |minimum, i|
level = i + 1 if points >= minimum
end
level
end
Paperclip.interpolates :gender do |attachment, style|
[:female, :male][rand 2]
end
end
\ No newline at end of file
diff --git a/app/views/campaign_mailer/new_campaign.erb b/app/views/campaign_mailer/new_campaign.erb
new file mode 100644
index 0000000..97a7529
--- /dev/null
+++ b/app/views/campaign_mailer/new_campaign.erb
@@ -0,0 +1,23 @@
+<p>
+ Hi <%= @user.login %>,
+</p>
+
+<p>
+ A new campaign named "<%= @campaign.name %>" has appeared on TransparencyCorps. Here's the description:
+</p>
+
+<%= simple_format @campaign.description %>
+
+<p>
+ Visit this campaign here:<br/>
+ <%= campaign_url @campaign, :host => @host %>
+</p>
+
+<p>
+ -- The TransparencyCorps team
+</p>
+
+<p>
+ P.S. You asked to be notified when a new campaign appears on TransparencyCorps. But if you want to unsubscribe from these notifications, visit your user profile on TransparencyCorps, uncheck the box that says "Email me when there's a new campaign", and click the Update button.<br/>
+ <%= edit_user_url @user, :host => @host %>
+</p>
\ No newline at end of file
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 707b792..468dfc9 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,36 +1,42 @@
<div class="mainTaskHeader">
<h2>Edit Profile</h2>
<div class="clear"></div>
</div>
<% form_for @user, :html => {:multipart => true} do |f| %>
<%= errors @user %>
<ul>
<li>
<label for='username'>Username</label>
<%= f.text_field :login, :id => 'username', :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email, :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password, :class => 'text', :size => '32' %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, :class => 'text', :size => '32' %>
</li>
<li>
<label for='avatar'>Current Avatar</label>
<%= image_tag @user.avatar.url(:normal) %>
</li>
<li>
- <label for='avatar_new'>Upload a new avatar</label>
+ <label for='user_avatar'>Upload a new avatar</label>
<%= f.file_field :avatar %>
</li>
+
+ <li>
+ <label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
+ <%= f.check_box :subscribe_campaigns %>
+ </li>
+
<input type="submit" value="Update" name="commit" id="update_button" />
</ul>
<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 96ae19b..8edd7a0 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,114 +1,122 @@
<% content_for :class, :signup %>
<div class="mainTaskHeader">
<h2>Join Us</h2>
<div class="clear"></div>
</div>
<p class="join">Already have an account? <%= link_to 'Sign in!', login_path %></p>
<p>Join the cause, by signing up for Transparency Corps with one of the options below.</p>
<div id="signup_nav" class="nav">
<ul>
<li id="nav_standard" class="active"><a href="#">Standard Sign Up</a></li>
<!--
<li id="nav_aol"><a href="#">AOL</a></li>
<li id="nav_yahoo"><a href="#">Yahoo</a></li>
<li id="nav_google"><a href="#">Google</a></li>
<li id="nav_facebook"><a href="#">Facebook</a></li>
-->
<li id="nav_openid"><a href="#">OpenID</a></li>
</ul>
<div class="clear"></div>
</div>
<div id="signup_options">
<%= errors @user %>
<div id="signup_standard" class="signup_option">
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<%= f.label :password %>
<%= f.password_field :password %>
</li>
<li>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation %>
</li>
+ <li>
+ <label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
+ <%= f.check_box :subscribe_campaigns %>
+ </li>
</ul>
<%= f.submit 'Register' %>
<% end %>
</div>
<div id="signup_aol" class="signup_option" style="display: none">
<h3>Sign up using your AOL account.</h3>
<p class="tip">Clicking this button will take you to AOL to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="aolBtn" type="submit">
<span>Sign Up Using AOL</span>
</button>
</div>
<div id="signup_yahoo" class="signup_option" style="display: none">
<h3>Sign up using your Yahoo account.</h3>
<p class="tip">Clicking this button will take you to Yahoo to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="yahooBtn" type="submit">
<span>Sign Up Using Yahoo</span>
</button>
</div>
<div id="signup_google" class="signup_option" style="display: none">
<h3>Sign up using your Google account.</h3>
<p class="tip">Clicking this button will take you to Google to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="googleBtn" type="submit">
<span>Sign Up Using Google</span>
</button>
</div>
<div id="signup_facebook" class="signup_option" style="display: none">
<h3>Sign up using your Facebook account.</h3>
<p class="tip">Clicking this button will take you to Facebook to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<button class="facebookBtn" type="submit">
<span>Sign Up Using Facebook</span>
</button>
</div>
<div id="signup_openid" class="signup_option" style="display: none">
<h3>Sign up using your OpenID account.</h3>
<p class="tip">Clicking this button will take you to OpenID to sign in to your account. Once your account has been verified you'll be magically sent back to Transparency Corps.</p>
<% form_for @user do |f| %>
<ul>
<li>
<label for="username_login">Username</label>
<%= f.text_field :login %>
</li>
<li>
<%= f.label :email %>
<%= f.text_field :email %>
</li>
<li>
<label for="user_openid_identifier">OpenID</label>
<%= f.text_field :openid_identifier, :value => @user.openid_identifier.blank? ? 'http://' : @user.openid_identifier %>
</li>
+ <li>
+ <label for='user_subscribe_campaigns'>Email me when there's a new campaign:</label>
+ <%= f.check_box :subscribe_campaigns %>
+ </li>
</ul>
<button class="openidBtn" type="submit">
<span>Sign Up Using OpenID</span>
</button>
<% end %>
</div>
</div>
<% if open_id_return? %>
<% javascript_tag do %>
switch_nav('openid', 'signup');
<% end %>
<% end %>
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index feb4ce9..5883408 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,19 +1,21 @@
# Settings specified here will take precedence over those in config/environment.rb
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
# since you don't have to restart the webserver when you make code changes.
config.cache_classes = false
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
# config.action_mailer.raise_delivery_errors = false
-CLICKPASS_SITE_KEY = 'uvdTy5rmBP'
\ No newline at end of file
+CLICKPASS_SITE_KEY = 'uvdTy5rmBP'
+
+SITE_HOST = 'localhost:3000'
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 65e2fe0..0688d66 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,31 +1,33 @@
# Settings specified here will take precedence over those in config/environment.rb
# The production environment is meant for finished, "live" apps.
# Code is not reloaded between requests
config.cache_classes = true
# Full error reports are disabled and caching is turned on
config.action_controller.consider_all_requests_local = false
config.action_controller.perform_caching = true
config.action_view.cache_template_loading = true
# See everything in the log (default is :info)
# config.log_level = :debug
# Use a different logger for distributed setups
# config.logger = SyslogLogger.new
# Use a different cache store in production
# config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and javascripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
# Enable threaded mode
# config.threadsafe!
# TODO: eventually, change this to a production key
-CLICKPASS_SITE_KEY = 'uvdTy5rmBP'
\ No newline at end of file
+CLICKPASS_SITE_KEY = 'uvdTy5rmBP'
+
+SITE_HOST = 'transparencycorps.org'
\ No newline at end of file
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 8e5c8c2..ab73301 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -1,31 +1,33 @@
# Settings specified here will take precedence over those in config/environment.rb
# The production environment is meant for finished, "live" apps.
# Code is not reloaded between requests
config.cache_classes = true
# Full error reports are disabled and caching is turned on
config.action_controller.consider_all_requests_local = false
config.action_controller.perform_caching = true
config.action_view.cache_template_loading = true
# See everything in the log (default is :info)
# config.log_level = :debug
# Use a different logger for distributed setups
# config.logger = SyslogLogger.new
# Use a different cache store in production
# config.cache_store = :mem_cache_store
# Enable serving of images, stylesheets, and javascripts from an asset server
# config.action_controller.asset_host = "http://assets.example.com"
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
# Enable threaded mode
# config.threadsafe!
# TODO: eventually, change this to a production key
-CLICKPASS_SITE_KEY = 'ttaGIWTjWK'
\ No newline at end of file
+CLICKPASS_SITE_KEY = 'ttaGIWTjWK'
+
+SITE_HOST = 'tcorps.sunlightlabs.com'
\ No newline at end of file
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4957dae..f267574 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,30 +1,32 @@
# Settings specified here will take precedence over those in config/environment.rb
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!
config.cache_classes = true
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = false
config.action_view.cache_template_loading = true
# Disable request forgery protection in test environment
config.action_controller.allow_forgery_protection = false
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
# Use SQL instead of Active Record's schema dumper when creating the test database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
-CLICKPASS_SITE_KEY = nil # test env should never need one
\ No newline at end of file
+CLICKPASS_SITE_KEY = nil # test env should never need one
+
+SITE_HOST = 'test.host'
\ No newline at end of file
diff --git a/db/migrate/012_add_subscription_options_to_user.rb b/db/migrate/012_add_subscription_options_to_user.rb
new file mode 100644
index 0000000..b04d6a9
--- /dev/null
+++ b/db/migrate/012_add_subscription_options_to_user.rb
@@ -0,0 +1,11 @@
+class AddSubscriptionOptionsToUser < ActiveRecord::Migration
+ def self.up
+ add_column :users, :subscribe_campaigns, :boolean, :default => 0
+ add_index :users, :subscribe_campaigns
+ end
+
+ def self.down
+ remove_index :users, :subscribe_campaigns
+ remove_column :users, :subscribe_campaigns
+ end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index aefb3d6..5a05591 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,85 +1,87 @@
# This file is auto-generated from the current state of the database. Instead of editing this file,
# please use the migrations feature of Active Record to incrementally modify your database, and
# then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your database schema. If you need
# to create the application database on another system, you should be using db:schema:load, not running
# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 11) do
+ActiveRecord::Schema.define(:version => 12) do
create_table "campaigns", :force => true do |t|
t.string "name"
t.string "keyword"
t.string "url"
t.text "instructions"
t.text "description"
t.text "private_description"
t.text "template"
t.integer "points"
t.integer "runs", :default => 0
t.datetime "created_at"
t.datetime "updated_at"
t.integer "user_runs"
t.integer "creator_id"
t.datetime "start_at"
end
add_index "campaigns", ["creator_id"], :name => "index_campaigns_on_creator_id"
add_index "campaigns", ["keyword"], :name => "index_campaigns_on_keyword"
create_table "open_id_authentication_associations", :force => true do |t|
t.integer "issued"
t.integer "lifetime"
t.string "handle"
t.string "assoc_type"
t.binary "server_url"
t.binary "secret"
end
create_table "open_id_authentication_nonces", :force => true do |t|
t.integer "timestamp", :null => false
t.string "server_url"
t.string "salt", :null => false
end
create_table "tasks", :force => true do |t|
t.integer "user_id"
t.integer "campaign_id"
t.integer "points"
t.datetime "completed_at"
t.string "key"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "elapsed_seconds"
end
add_index "tasks", ["campaign_id"], :name => "index_tasks_on_campaign_id"
add_index "tasks", ["key"], :name => "index_tasks_on_key"
add_index "tasks", ["user_id", "campaign_id"], :name => "index_tasks_on_user_id_and_campaign_id"
create_table "users", :force => true do |t|
t.boolean "admin", :default => false
t.string "email"
t.datetime "created_at"
t.datetime "updated_at"
t.string "login", :null => false
t.string "crypted_password"
t.string "password_salt"
t.string "persistence_token", :null => false
t.string "openid_identifier"
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
t.datetime "avatar_updated_at"
t.string "organization_name"
+ t.boolean "subscribe_campaigns", :default => false
end
add_index "users", ["login"], :name => "index_users_on_login"
add_index "users", ["openid_identifier"], :name => "index_users_on_openid_identifier"
add_index "users", ["persistence_token"], :name => "index_users_on_persistence_token"
+ add_index "users", ["subscribe_campaigns"], :name => "index_users_on_subscribe_campaigns"
end
diff --git a/test/functional/admin/campaigns_controller_test.rb b/test/functional/admin/campaigns_controller_test.rb
index 74544d9..bdeae49 100644
--- a/test/functional/admin/campaigns_controller_test.rb
+++ b/test/functional/admin/campaigns_controller_test.rb
@@ -1,297 +1,311 @@
require 'test_helper'
class Admin::CampaignsControllerTest < ActionController::TestCase
setup :activate_authlogic
test '#index loads the campaigns for that user' do
user = Factory :manager
campaign1 = Factory :campaign, :creator => user
campaign2 = Factory :campaign, :creator => user
assert user.campaigns.any?
login user
get :index
assert_response :success
assert_layout 'admin'
assert_template 'index'
assert_equal assigns(:campaigns), user.campaigns
end
test '#index allows administrators as well' do
login Factory(:admin)
get :index
assert_response :success
end
test '#index requires login' do
get :index
assert_redirected_to register_path
end
test '#index requires login as at least a manager' do
login Factory(:user)
get :index
assert_redirected_to root_path
end
test '#new defaults the campaign to the recommended points' do
login Factory(:manager)
get :new
assert_equal RECOMMENDED_CAMPAIGN_POINTS, assigns(:campaign).points
end
test '#new requires login' do
get :new
assert_redirected_to register_path
end
test '#new requires login as at least a manager' do
login Factory(:user)
get :new
assert_redirected_to root_path
end
test '#create creates a campaign' do
count = Campaign.count
user = Factory :manager
login user
post :create, :campaign => Factory.attributes_for(:campaign, :creator => user)
assert_redirected_to admin_campaigns_path
assert_not_nil flash[:success]
assert_equal count + 1, Campaign.count
end
+ test '#create sends out a notification email to users who requested this' do
+ subscribed = Factory :user, :subscribe_campaigns => 1
+ unsubscribed = Factory :user, :subscribe_campaigns => 0
+ user = Factory :manager, :subscribe_campaigns => 1
+ login user
+
+ # should not notify the creator of the campaign
+ CampaignMailer.expects(:deliver_new_campaign).times(1).with(anything, subscribed)
+
+ post :create, :campaign => Factory.attributes_for(:campaign, :creator => user)
+ assert_redirected_to admin_campaigns_path
+ assert_not_nil flash[:success]
+ end
+
test '#create renders with errors if campaign is invalid' do
count = Campaign.count
user = Factory :manager
login user
post :create, :campaign => Factory.attributes_for(:campaign, :creator => user, :name => nil)
assert_response :success
assert assigns(:campaign).errors.any?
assert_equal count, Campaign.count
end
test '#create will only create a campaign for the logged in user' do
user = Factory :manager
login user
count = Campaign.count
my_count = user.campaigns.count
post :create, :campaign => Factory.attributes_for(:campaign, :creator_id => Factory(:manager).id)
assert_redirected_to admin_campaigns_path
assert_equal my_count + 1, user.campaigns.count
assert_equal count + 1, Campaign.count
end
test '#create requires login' do
count = Campaign.count
post :create, :campaign => Factory.attributes_for(:campaign)
assert_redirected_to register_path
assert_equal count, Campaign.count
end
test '#create requires login as at least a manager' do
count = Campaign.count
login Factory(:user)
post :create, :campaign => Factory.attributes_for(:campaign)
assert_redirected_to root_path
assert_equal count, Campaign.count
end
test '#edit loads a campaign for editing' do
user = Factory :manager
campaign = Factory :campaign, :creator => user
login user
get :edit, :id => campaign
assert_response :success
assert_template 'edit'
assert_equal campaign, assigns(:campaign)
end
test '#edit will not load campaigns owned by others' do
user = Factory :manager
campaign = Factory :campaign
login user
get :edit, :id => campaign
assert_redirected_to root_path
end
test '#edit requires login' do
campaign = Factory :campaign
logout
get :edit, :id => campaign
assert_redirected_to register_path
end
test '#edit requires login as at least a manager' do
user = Factory :user
campaign = Factory :campaign, :creator => user
login user
get :edit, :id => campaign
assert_redirected_to root_path
end
test '#update will update a campaign' do
user = Factory :manager
campaign = Factory :campaign, :creator => user
new_name = campaign.name.succ
login user
put :update, :id => campaign, :campaign => {:name => new_name}
assert_redirected_to admin_campaigns_path
assert_not_nil flash[:success]
assert_equal new_name, campaign.reload.name
end
test '#update renders with errors if the campaign is invalid' do
user = Factory :manager
campaign = Factory :campaign, :creator => user
login user
put :update, :id => campaign, :campaign => {:name => ''}
assert_response :success
assert assigns(:campaign).errors.any?
assert_not_equal '', campaign.reload.name
end
test '#update will not update campaigns owned by others' do
user = Factory :manager
campaign = Factory :campaign
new_name = campaign.name.succ
login user
put :update, :id => campaign, :campaign => {:name => new_name}
assert_redirected_to root_path
assert_nil flash[:success]
assert_not_equal new_name, campaign.reload.name
end
test '#update requires login' do
user = Factory :manager
campaign = Factory :campaign, :creator => user
new_name = campaign.name.succ
logout
put :update, :id => campaign, :campaign => {:name => new_name}
assert_redirected_to register_path
assert_nil flash[:success]
assert_not_equal new_name, campaign.reload.name
end
test '#update requires login as at least a manager' do
user = Factory :user
campaign = Factory :campaign, :creator => user
new_name = campaign.name.succ
login user
put :update, :id => campaign, :campaign => {:name => new_name}
assert_redirected_to root_path
assert_nil flash[:success]
assert_not_equal new_name, campaign.reload.name
end
test '#confirm_destroy renders correctly' do
user = Factory :manager
campaign = Factory :campaign, :creator => user
count = Campaign.count
login user
get :confirm_destroy, :id => campaign
assert_response :success
assert_template 'confirm_destroy'
assert_equal count, Campaign.count
end
test '#confirm_destroy requires login' do
campaign = Factory :campaign
logout
get :confirm_destroy, :id => campaign
assert_redirected_to register_path
end
test '#confirm_destroy requires login as a manager' do
user = Factory :user
campaign = Factory :campaign, :creator => user
login user
get :confirm_destroy, :id => campaign
assert_redirected_to root_path
end
test '#confirm_destroy requires login as the manager for this campaign' do
user = Factory :manager
campaign = Factory :campaign, :creator => Factory(:manager)
login user
get :confirm_destroy, :id => campaign
assert_redirected_to root_path
end
test '#destroy removes campaign' do
user = Factory :manager
campaign = Factory :campaign, :creator => user
count = Campaign.count
login user
delete :destroy, :id => campaign
assert_redirected_to admin_campaigns_path
assert_not_nil flash[:success]
assert_equal count - 1, Campaign.count
end
test '#destroy will not remove campaigns owned by others' do
user = Factory :admin
campaign = Factory :campaign
count = Campaign.count
login user
delete :destroy, :id => campaign
assert_redirected_to root_path
assert_nil flash[:success]
assert_equal count, Campaign.count
end
test '#destroy requires login' do
campaign = Factory :campaign
count = Campaign.count
logout
delete :destroy, :id => campaign
assert_redirected_to register_path
assert_nil flash[:success]
assert_equal count, Campaign.count
end
test '#destroy requires login as at least a manager' do
user = Factory :user
campaign = Factory :campaign, :creator => user
count = Campaign.count
login user
delete :destroy, :id => campaign
assert_redirected_to root_path
assert_nil flash[:success]
assert_equal count, Campaign.count
end
end
\ No newline at end of file
diff --git a/test/unit/campaign_mailer_test.rb b/test/unit/campaign_mailer_test.rb
new file mode 100644
index 0000000..1fd9540
--- /dev/null
+++ b/test/unit/campaign_mailer_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class CampaignMailerTest < ActionMailer::TestCase
+ # replace this with your real tests
+ test "the truth" do
+ assert true
+ end
+end
|
sunlightlabs/tcorps | 9d4d0c751797731cb8d36b12ddd94c50e18df9d3 | Extended the TransparencyCorps API to allow for new tasks to be generated, and for the client app to request the URL for this new task at the time of marking the first task as completed | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3061e17..da54c9c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,81 +1,100 @@
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will be available for all controllers.
class ApplicationController < ActionController::Base
helper :all
protect_from_forgery
filter_parameter_logging :password, :password_confirmation
-
before_filter :load_sidebar
def load_sidebar
@sidebar_campaigns = (logged_in? ? Campaign.active_for(current_user) : Campaign.active).all :limit => 5, :order => 'created_at DESC'
end
+ def remote_task_url(task, user)
+ options = {
+ :username => user.login,
+ :task_key => task.key,
+ :points => user.campaign_points(task.campaign)
+ }
+ "#{task.campaign.url}?#{query_string_for options}"
+ end
+ helper_method :remote_task_url
+
+ def query_string_for(options = {})
+ string = ""
+ options.keys.each do |key|
+ string << "&" unless key == options.keys.first
+ string << "#{key}=#{CGI::escape options[key].to_s}"
+ end
+ string
+ end
+ helper_method :query_string_for
+
def goto_path!
goto = session[:goto]
session[:goto] = nil
goto
end
def require_login
unless logged_in?
session[:goto] = params[:goto] || request.path
redirect_to register_path and return false
end
end
def require_manager
redirect_to root_path and return false unless current_user.manager? or current_user.admin?
end
def require_admin
redirect_to root_path and return false unless current_user.admin?
end
def logged_in?
!current_user.nil?
end
helper_method :logged_in?
def current_user
@current_user ||= current_session.user if current_session
end
helper_method :current_user
def current_session
@current_session ||= UserSession.find
end
helper_method :current_session
# clickpass
def clickpass_register_url(user)
params = {
:requested_fields => 'nickname,email',
:required_fields => 'nickname,email',
:nickname_label => 'Login',
:site_key => CLICKPASS_SITE_KEY,
:site_name => 'TransparencyCorps',
:process_openid_registration_url => process_openid_registration_url
}
if user.errors.on(:login)
params[:nickname_error] = "Login #{[user.errors.on(:login)].flatten.join(', and ')}"
end
if user.errors.on(:email)
params[:email_error] = "Email #{[user.errors.on(:email)].flatten.join(', and ')}"
end
"#{CLICKPASS_BASE_URL}?#{query_string_for params}"
end
def query_string_for(options = {})
string = ""
options.keys.each do |key|
string << "&" unless key == options.keys.first
string << "#{key}=#{CGI::escape options[key].to_s}"
end
string
end
end
\ No newline at end of file
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index 7fbd8f6..6b4e585 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -1,49 +1,53 @@
class TasksController < ApplicationController
before_filter :require_login, :except => :complete
before_filter :load_task, :only => :show
before_filter :load_campaign, :only => :create
skip_before_filter :verify_authenticity_token, :only => :complete
def complete
head :method_not_allowed and return false unless request.post?
-
head :not_found and return false unless @task = Task.find_by_key(params[:task_key])
now = Time.now
elapsed = Time.now - @task.created_at
@task.update_attributes :completed_at => now, :elapsed_seconds => elapsed
- head :ok
+ if params[:new_task] and params[:new_task].to_i == 1
+ task = @task.campaign.tasks.create! :user => @task.user
+ render :text => remote_task_url(task, @task.user)
+ else
+ head :ok
+ end
end
def show
if @task.complete?
redirect_to campaign_path(@task.campaign)
else
render :action => :show, :layout => 'task'
end
end
def create
@task = @campaign.tasks.new :user => current_user
if @task.save
redirect_to task_path(@task)
else
flash[:failure] = "You've already done more than enough for this campaign. Please try your hand at another of the campaigns below."
redirect_to root_path
end
end
private
def load_task
head :not_found and return false unless @task = Task.find_by_id(params[:id])
end
def load_campaign
head :not_found and return false unless @campaign = Campaign.find_by_id(params[:campaign_id])
end
end
\ No newline at end of file
diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb
index 5ec3975..5e22b83 100644
--- a/app/helpers/tasks_helper.rb
+++ b/app/helpers/tasks_helper.rb
@@ -1,21 +1,2 @@
module TasksHelper
-
- def task_url(task, user)
- options = {
- :username => user.login,
- :task_key => task.key,
- :points => user.campaign_points(task.campaign)
- }
- "#{task.campaign.url}?#{query_string_for options}"
- end
-
- def query_string_for(options = {})
- string = ""
- options.keys.each do |key|
- string << "&" unless key == options.keys.first
- string << "#{key}=#{CGI::escape options[key].to_s}"
- end
- string
- end
-
end
\ No newline at end of file
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb
index 29a4eca..5416c7f 100644
--- a/app/views/tasks/show.html.erb
+++ b/app/views/tasks/show.html.erb
@@ -1,24 +1,24 @@
<div class="header">
<div class="campaign">
<span class="title">
<%= h @task.campaign.name %>
</span>
<span class="instructions">
<%= simple_format @task.campaign.instructions %>
</span>
</div>
<div class="nav">
<% form_tag tasks_path, :method => :post do %>
<%= hidden_field_tag :campaign_id, @task.campaign.id %>
<%= submit_tag "I'd Like Another Task", :id => 'anotherTask' %>
<% end %>
<br/>
<a href="<%= root_path %>" class="back">Back to TransparencyCorps</a>
</div>
<div class="clear"></div>
</div>
-<iframe id="task_frame" name="task_frame" src="<%= task_url @task, current_user %>"></iframe>
\ No newline at end of file
+<iframe id="task_frame" name="task_frame" src="<%= remote_task_url @task, current_user %>"></iframe>
\ No newline at end of file
diff --git a/test/functional/tasks_controller_test.rb b/test/functional/tasks_controller_test.rb
index 1da8760..85919cb 100644
--- a/test/functional/tasks_controller_test.rb
+++ b/test/functional/tasks_controller_test.rb
@@ -1,165 +1,202 @@
require 'test_helper'
class TasksControllerTest < ActionController::TestCase
setup :activate_authlogic
test '#create should create a new valid task' do
count = Task.count
campaign = Factory :campaign
user = campaign.creator
login user
post :create, :campaign_id => campaign.id
assert_not_nil assigns(:task)
assert_equal assigns(:task).user, user
assert_redirected_to task_path(assigns(:task))
assert_equal count + 1, Task.count
end
test '#create should fail with no campaign given' do
count = Task.count
campaign = Factory :campaign
login campaign.creator
post :create
assert_response :not_found
assert_equal count, Task.count
end
test '#create should require login' do
count = Task.count
campaign = Factory :campaign
logout
post :create, :campaign_id => campaign.id
assert_redirected_to register_path
assert_equal count, Task.count
end
test '#create should fail if the campaign has hit its maximum runs' do
campaign = Factory :campaign, :runs => 1, :user_runs => 2
task = Factory :completed_task, :campaign => campaign
count = Task.count
assert campaign.complete?
login campaign.creator
post :create, :campaign_id => campaign.id
assert_redirected_to root_path
assert_not_nil flash[:failure]
assert_equal count, Task.count
end
test '#create should fail if the campaign has hits its maximum runs for that user' do
user = Factory :user
campaign = Factory :campaign, :runs => 2, :user_runs => 1
task = Factory :completed_task, :campaign => campaign, :user => campaign.creator
count = Task.count
assert !campaign.complete?
login campaign.creator
post :create, :campaign_id => campaign.id
assert_redirected_to root_path
assert_not_nil flash[:failure]
assert_equal count, Task.count
end
test '#show should render successfully' do
task = Factory :task
login task.user
get :show, :id => task
assert_equal task, assigns(:task)
assert_response :success
end
test '#show should use the task layout and render an iframe with the task url' do
task = Factory :task
login task.user
get :show, :id => task
assert_layout :task
assert_select 'iframe'
assert_match task.campaign.url, @response.body
+ assert_match /username=#{task.user.login}/, @response.body
+ assert_match /task_key=#{task.key}/, @response.body
+ assert_match /points=#{task.user.campaign_points(task.campaign)}/, @response.body
end
test '#show for a completed task should redirect out' do
task = Factory :completed_task
login task.user
get :show, :id => task
assert_redirected_to campaign_path(task.campaign)
end
test '#show for a missing task should return a 404' do
task = Factory :task
login task.user
get :show, :id => task.id.succ
assert_response :not_found
end
test '#show should require login' do
task = Factory :task
logout
get :show, :id => task
assert_redirected_to register_path
end
test '#complete with a valid task key updates the task to mark it as complete' do
task = Factory :task
assert !task.complete?
+ count = Task.count
+
post :complete, :task_key => task.key
+
+ assert_response :success
+ assert @response.body.strip.empty?
+
+ assert task.reload.complete?
+ assert_equal count, Task.count
+ end
+
+ test '#complete with new_task set to 1 should return a response body with the new valid task URL' do
+ task = Factory :task
+ assert !task.complete?
+ post :complete, :task_key => task.key, :new_task => 1
+
assert_response :success
+ assert [email protected]?
+ assert_match task.campaign.url, @response.body
+
assert task.reload.complete?
+
+ end
+
+ test '#complete with new_task set to 1 should create a new task' do
+ task = Factory :task
+ assert !task.complete?
+ count = Task.count
+
+ post :complete, :task_key => task.key, :new_task => 1
+ assert_response :success
+
+ assert_equal count + 1, Task.count
+ new_task = Task.all(:order => 'id desc').first
+ assert_match /username=#{new_task.user.login}/, @response.body
+ assert_match /task_key=#{new_task.key}/, @response.body
+ assert_match /points=#{new_task.user.campaign_points(new_task.campaign)}/, @response.body
end
test '#complete with a valid task key increases the amount of points a user has' do
user = Factory :user
task = Factory :task, :user => user
total_points = user.total_points
campaign_points = user.campaign_points(task.campaign)
post :complete, :task_key => task.key
assert_equal total_points + task.points, user.total_points
assert_equal campaign_points + task.points, user.campaign_points(task.campaign)
end
test '#complete with a valid task key records the time it took a user to complete the task' do
user = Factory :user
task = Factory :task, :user => user
ActiveRecord::Base.connection.execute "update tasks set created_at = '#{2.days.ago.to_s :db}' where id= #{task.id}"
assert task.reload.created_at <= 2.days.ago
assert_nil task.elapsed_seconds
post :complete, :task_key => task.key
assert_not_nil task.reload.elapsed_seconds
assert task.reload.elapsed_seconds >= 2.days.to_i
end
test '#complete with an invalid task key returns a 404' do
task = Factory :task
assert !task.complete?
post :complete, :task_key => task.key.succ
assert_response :not_found
assert !task.reload.complete?
end
test '#complete with a get returns 500' do
task = Factory :task
assert !task.complete?
get :complete, :task_key => task.key
assert_response :method_not_allowed
assert !task.reload.complete?
end
test '#complete route' do
assert_routing({:method => :post, :path => '/tasks/complete'}, {:controller => 'tasks', :action => 'complete'})
end
end
\ No newline at end of file
diff --git a/test/unit/helpers/tasks_helper_test.rb b/test/unit/helpers/tasks_helper_test.rb
index 4965133..1a7c22a 100644
--- a/test/unit/helpers/tasks_helper_test.rb
+++ b/test/unit/helpers/tasks_helper_test.rb
@@ -1,20 +1,4 @@
require 'test_helper'
class TasksHelperTest < ActionView::TestCase
-
- test 'task URL generator' do
- campaign = Factory :campaign, :points => 5
- user = Factory :user
- completed_task = Factory :completed_task, :campaign => campaign, :user => user
- assert_equal campaign.points, user.campaign_points(campaign)
-
- task = Factory :task, :key => 'example_key', :user => user, :campaign => campaign
- url = task_url task, user
-
- assert_match /username=#{user.login}/, url
- assert_match /task_key=#{task.key}/, url
- assert_match /points=#{user.campaign_points(campaign)}/, url
- assert_match campaign.url, url
- end
-
end
\ No newline at end of file
|
sunlightlabs/tcorps | b167b1acba0223eefc185dd57ac475264c360fe1 | Changed New Members to Top Members | diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 0c948e0..8ee2b29 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,22 +1,22 @@
class PagesController < ApplicationController
skip_before_filter :load_sidebar, :only => :index
def index
- @users = User.all :order => 'created_at DESC', :limit => 5
+ @users = User.by_points.all :limit => 5
@campaigns = (logged_in? ? Campaign.active_for(current_user) : Campaign.active).all :order => 'created_at DESC'
end
def contact
if request.post?
if params[:name].blank? or params[:email].blank? or params[:message].blank?
@error_messages = 'Please fill out all fields.'
else
ContactMailer.deliver_contact_form params[:name], params[:email], params[:message]
flash[:success] = 'Your message has been sent.'
redirect_to contact_path
end
end
end
end
\ No newline at end of file
diff --git a/app/views/layouts/partials/_user_sidebar.html.erb b/app/views/layouts/partials/_user_sidebar.html.erb
index 580a5c6..f382140 100644
--- a/app/views/layouts/partials/_user_sidebar.html.erb
+++ b/app/views/layouts/partials/_user_sidebar.html.erb
@@ -1,9 +1,9 @@
-<h3 class="space">New Members</h3>
+<h3 class="space">Top Members</h3>
<ul id="newMembers">
<% @users.each do |user| %>
<li>
<%= image_tag user.avatar.url(:normal) %>
<span class="leaderName"><%= h user.login %></span>
</li>
<% end %>
</ul>
\ No newline at end of file
diff --git a/test/functional/pages_controller_test.rb b/test/functional/pages_controller_test.rb
index 0728fb3..fefee5a 100644
--- a/test/functional/pages_controller_test.rb
+++ b/test/functional/pages_controller_test.rb
@@ -1,96 +1,97 @@
require 'test_helper'
class PagesControllerTest < ActionController::TestCase
setup :activate_authlogic
test '#index loads the most recent 5 users' do
user = Factory :user
- User.expects(:all).with(:order => 'created_at DESC', :limit => 5).returns [Factory(:user)]
+ User.expects(:by_points).returns User
+ User.expects(:all).with(:limit => 5).returns [Factory(:user)]
get :index
end
test '#index loads all active campaigns' do
Campaign.expects(:active).returns Campaign
get :index
assert_response :success
assert_template 'index'
end
test '#index loads all active campaigns relevant to the logged in user, if the user is logged in' do
user = Factory :user
Campaign.expects(:active_for).with(user).returns Campaign
login user
get :index
end
# every page should have these campaigns for the sidebar, but we'll just test it here
test '#about loads the most recent 5 active campaigns for the sidebar' do
Campaign.expects(:active).returns Campaign
get :about
end
test '#about loads the most recent 5 active campaigns for the logged in user for the sidebar, if logged in' do
user = Factory :user
Campaign.expects(:active_for).with(user).returns Campaign
login user
get :about
end
test '#contact with post and all data sends contact form email' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).with(name, email, message)
post :contact, :name => name, :email => email, :message => message
assert_redirected_to contact_path
assert_not_nil flash[:success]
end
test '#contact with post requires name' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :email => email, :message => message
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test '#contact with post requires email' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :name => name, :message => message
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test '#contact with post requires message' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :name => name, :email => email
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test 'page routes' do
[:about, :contact].each do |page|
assert_routing "/#{page}", :controller => 'pages', :action => page.to_s
end
assert_routing '/', :controller => 'pages', :action => 'index'
end
end
|
sunlightlabs/tcorps | a42671056953ac23c72dec9d65d9e8bd480f3223 | Rearranged home page layout, displaying tasks and users | diff --git a/app/controllers/campaigns_controller.rb b/app/controllers/campaigns_controller.rb
index 96e5ba9..018e309 100644
--- a/app/controllers/campaigns_controller.rb
+++ b/app/controllers/campaigns_controller.rb
@@ -1,26 +1,27 @@
class CampaignsController < ApplicationController
before_filter :load_campaign, :only => :show
+ skip_before_filter :load_sidebar, :only => :index
def show
end
def index
respond_to do |format|
format.html {
@campaigns = (logged_in? ? Campaign.active_for(current_user) : Campaign.active).all :order => 'created_at DESC'
}
format.xml {
#headers['Content-Type'] = 'application/rss+xml'
@campaigns = Campaign.active.all :order => 'created_at DESC'
}
end
end
private
def load_campaign
redirect_to campaigns_path and return false unless @campaign = Campaign.find_by_id(params[:id])
end
end
\ No newline at end of file
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 04c4c5d..0c948e0 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,19 +1,22 @@
class PagesController < ApplicationController
+ skip_before_filter :load_sidebar, :only => :index
+
def index
@users = User.all :order => 'created_at DESC', :limit => 5
+ @campaigns = (logged_in? ? Campaign.active_for(current_user) : Campaign.active).all :order => 'created_at DESC'
end
def contact
if request.post?
if params[:name].blank? or params[:email].blank? or params[:message].blank?
@error_messages = 'Please fill out all fields.'
else
ContactMailer.deliver_contact_form params[:name], params[:email], params[:message]
flash[:success] = 'Your message has been sent.'
redirect_to contact_path
end
end
end
end
\ No newline at end of file
diff --git a/app/views/campaigns/_index.html.erb b/app/views/campaigns/_index.html.erb
new file mode 100644
index 0000000..dc700df
--- /dev/null
+++ b/app/views/campaigns/_index.html.erb
@@ -0,0 +1,39 @@
+<ul id="taskList">
+ <% campaigns.each do |campaign| %>
+ <li>
+ <div class="taskTop">
+ <div class="taskHeader">
+ <h3><%= link_to h(campaign.name), campaign_path(campaign) %></h3>
+ <div class="taskMetadata">
+ <span>points</span>
+ <span class="taskValue"><%= campaign.points %></span>
+ </div>
+ <div class="clear"></div>
+ </div>
+ <div class="taskDetail">
+ <% percent = campaign.percent_complete %>
+ <div class="taskBar">
+ <span class="tagValue" style="width: <%= percent %>%"><%= percent %>%</span>
+ </div>
+ <span class="tagNumber"><%= 100 - percent %>% To Go</span>
+ <div class="clear"></div>
+ </div>
+ </div>
+
+ <p>
+ <%= simple_format campaign.description %>
+ </p>
+
+ <% form_tag tasks_path, :method => :post, :target => (logged_in? ? '_blank' : '') do %>
+ <% if !logged_in? %>
+ <%= hidden_field_tag :goto, campaign_path(campaign) %>
+ <% end %>
+
+ <%= hidden_field_tag :campaign_id, campaign.id %>
+ <%= submit_tag 'Start This Task', :id => 'startTask' %>
+ <% end %>
+
+
+ </li>
+ <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/campaigns/index.html.erb b/app/views/campaigns/index.html.erb
index 14754ff..d86fca0 100644
--- a/app/views/campaigns/index.html.erb
+++ b/app/views/campaigns/index.html.erb
@@ -1,48 +1,10 @@
<% content_for :class, :tasks %>
<% content_for :header, :scoreboard %>
<% content_for :hide_sidebar, true %>
<div class="mainTaskHeader">
<h2>Tasks</h2>
<div class="clear"></div>
</div>
-<ul id="taskList">
- <% @campaigns.each do |campaign| %>
- <li>
- <div class="taskTop">
- <div class="taskHeader">
- <h3><%= link_to h(campaign.name), campaign_path(campaign) %></h3>
- <div class="taskMetadata">
- <span>points</span>
- <span class="taskValue"><%= campaign.points %></span>
- </div>
- <div class="clear"></div>
- </div>
- <div class="taskDetail">
- <% percent = campaign.percent_complete %>
- <div class="taskBar">
- <span class="tagValue" style="width: <%= percent %>%"><%= percent %>%</span>
- </div>
- <span class="tagNumber"><%= 100 - percent %>% To Go</span>
- <div class="clear"></div>
- </div>
- </div>
-
- <p>
- <%= simple_format campaign.description %>
- </p>
-
- <% form_tag tasks_path, :method => :post, :target => (logged_in? ? '_blank' : '') do %>
- <% if !logged_in? %>
- <%= hidden_field_tag :goto, campaign_path(campaign) %>
- <% end %>
-
- <%= hidden_field_tag :campaign_id, campaign.id %>
- <%= submit_tag 'Start This Task', :id => 'startTask' %>
- <% end %>
-
-
- </li>
- <% end %>
-</ul>
\ No newline at end of file
+<%= render :partial => 'campaigns/index', :locals => {:campaigns => @campaigns} %>
\ No newline at end of file
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index da014bd..2ffe90b 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -1,16 +1,10 @@
<% content_for :class, :home %>
<% content_for :header, :banner %>
<% content_for :sidebar, :user_sidebar %>
<div class="mainTaskHeader">
<h2>Welcome</h2>
<div class="clear"></div>
</div>
-<p>
- Transparency Corps is the Sunlight Foundation's answer to the question, "How can I help?"
-</p>
-
-<p>
- There are many big problems that we can solve with technology, but we can't solve them all. For many of the projects that make government transparency a reality, human eyes and analysis are required. With Transparency Corps, we break those tasks down into short, small actions that make a BIG difference. Join the Corps, and let's get started!
-</p>
\ No newline at end of file
+<%= render :partial => 'campaigns/index', :locals => {:campaigns => @campaigns} %>
\ No newline at end of file
diff --git a/test/functional/campaigns_controller_test.rb b/test/functional/campaigns_controller_test.rb
index f5980c6..de3bf1c 100644
--- a/test/functional/campaigns_controller_test.rb
+++ b/test/functional/campaigns_controller_test.rb
@@ -1,46 +1,46 @@
require 'test_helper'
class CampaignsControllerTest < ActionController::TestCase
setup :activate_authlogic
test '#index loads all active campaigns' do
- Campaign.expects(:active).times(2).returns Campaign
+ Campaign.expects(:active).returns Campaign
get :index
assert_response :success
assert_template 'index'
end
test '#index loads all active campaigns relevant to the logged in user, if the user is logged in' do
user = Factory :user
- Campaign.expects(:active_for).with(user).times(2).returns Campaign
+ Campaign.expects(:active_for).with(user).returns Campaign
login user
get :index
end
test '#index.xml loads all active campaigns' do
- Campaign.expects(:active).times(2).returns Campaign
+ Campaign.expects(:active).returns Campaign
get :index, :format => 'xml'
assert_response :success
assert_template 'index.xml'
end
test '#show loads a campaign' do
campaign = Factory :campaign
get :show, :id => campaign
assert_response :success
assert_template 'show'
assert_equal assigns(:campaign), campaign
end
test '#show gives a 404 with an invalid campaign id' do
campaign = Factory :campaign
assert !Campaign.exists?(campaign.id.succ)
get :show, :id => campaign.id.succ
assert_redirected_to campaigns_path
end
end
\ No newline at end of file
diff --git a/test/functional/pages_controller_test.rb b/test/functional/pages_controller_test.rb
index 51b5e30..0728fb3 100644
--- a/test/functional/pages_controller_test.rb
+++ b/test/functional/pages_controller_test.rb
@@ -1,80 +1,96 @@
require 'test_helper'
class PagesControllerTest < ActionController::TestCase
setup :activate_authlogic
test '#index loads the most recent 5 users' do
user = Factory :user
User.expects(:all).with(:order => 'created_at DESC', :limit => 5).returns [Factory(:user)]
get :index
end
+ test '#index loads all active campaigns' do
+ Campaign.expects(:active).returns Campaign
+ get :index
+ assert_response :success
+ assert_template 'index'
+ end
+
+ test '#index loads all active campaigns relevant to the logged in user, if the user is logged in' do
+ user = Factory :user
+
+ Campaign.expects(:active_for).with(user).returns Campaign
+ login user
+
+ get :index
+ end
+
# every page should have these campaigns for the sidebar, but we'll just test it here
test '#about loads the most recent 5 active campaigns for the sidebar' do
Campaign.expects(:active).returns Campaign
get :about
end
test '#about loads the most recent 5 active campaigns for the logged in user for the sidebar, if logged in' do
user = Factory :user
Campaign.expects(:active_for).with(user).returns Campaign
login user
get :about
end
test '#contact with post and all data sends contact form email' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).with(name, email, message)
post :contact, :name => name, :email => email, :message => message
assert_redirected_to contact_path
assert_not_nil flash[:success]
end
test '#contact with post requires name' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :email => email, :message => message
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test '#contact with post requires email' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :name => name, :message => message
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test '#contact with post requires message' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :name => name, :email => email
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test 'page routes' do
[:about, :contact].each do |page|
assert_routing "/#{page}", :controller => 'pages', :action => page.to_s
end
assert_routing '/', :controller => 'pages', :action => 'index'
end
end
|
sunlightlabs/tcorps | 7f799f6ef1dae498c9f89c6a0732546c4867cabf | Added weird looking sidebar to the users | diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 9db62d5..04c4c5d 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,19 +1,19 @@
class PagesController < ApplicationController
def index
-
+ @users = User.all :order => 'created_at DESC', :limit => 5
end
def contact
if request.post?
if params[:name].blank? or params[:email].blank? or params[:message].blank?
@error_messages = 'Please fill out all fields.'
else
ContactMailer.deliver_contact_form params[:name], params[:email], params[:message]
flash[:success] = 'Your message has been sent.'
redirect_to contact_path
end
end
end
end
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0cd2059..0f5e25c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,107 +1,108 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang='en-US' xml:lang='en-US' xmlns='http://www.w3.org/1999/xhtml'>
<head>
<meta content='Sunlight Foundation, Sunlight Labs, Transparency, Community, Government, Transparency Corps, Citizen Engagement, Participation, Congress, Accountability' name='keywords' />
<meta content="There are many big problems that we can solve with technology, but we can't solve them all. For many of the projects that make government transparency a reality, human eyes and analysis are required. With Transparency Corps, we break those tasks down into short, small actions that make a BIG difference. Join the Corps, and let's get started!" name='description' />
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
<title>Transparency Corps</title>
<link rel="alternate" title="TransparencyCorps Campaigns - RSS" type="application/rss+xml" href="/campaigns.xml" />
<%= stylesheet_link_tag 'style' %>
<%= javascript_include_tag 'jquery' %>
<%= javascript_include_tag 'tcorps' %>
<script src="http://services.sunlightlabs.com/brandingbar/hat_js/tcorps/" type="text/javascript"></script>
<!--[if IE 6]><link rel="stylesheet" href="/stylesheets/buggy.css" type="text/css" media="screen" /><![endif]-->
<!--[if IE 7]><link rel="stylesheet" href="/stylesheets/buggy7.css" type="text/css" media="screen" /><![endif]-->
</head>
<body class="<%= yield :class %>">
<div id="headerWrapper">
<div id="pageMain">
<div id="header">
<h1>
<%= link_to 'Transparency Corps', root_path %>
</h1>
<div id="accountInfo">
<% if logged_in? %>
<%= link_to 'Sign Out', logout_path %>
<span class="bar">|</span>
<%= link_to 'Edit Profile', edit_user_path(current_user) %>
<%= link_to image_tag(current_user.avatar.url(:tiny)), edit_user_path(current_user), :id => 'smAvatar' %>
<% if current_user.manager? or current_user.admin? %>
<%= link_to 'Admin', admin_path %>
<% end %>
<span id="username">Welcome <%= current_user.login %>!</span>
<% else %>
<%= link_to 'Sign In', login_path %>
<span class="bar">|</span>
<%= link_to 'Join Us', register_path %>
<% end %>
</div>
<div class="clear"></div>
<div id="nav">
<ul>
<li id="nav_tasks">
<%= link_to 'Tasks', campaigns_path, :class => (yield(:class).to_s == 'tasks' ? 'active' : '') %>
</li>
<li id="nav_leaders">
<%= link_to 'Transparency Leaders', leaders_path, :class => (yield(:class).to_s == 'leaders' ? 'active' : '') %>
</li>
<li id="nav_about">
<%= link_to 'About', about_path, :class => (yield(:class).to_s == 'about' ? 'active' : '') %>
</li>
<li id="nav_contact">
<%= link_to 'Contact', contact_path, :class => (yield(:class).to_s == 'contact' ? 'active' : '') %>
</li>
</ul>
</div>
</div>
+
<% if yield :header %>
<%= render :partial => "layouts/partials/#{yield :header}" %>
<% end %>
<div id="mainContent">
<%= render :partial => 'layouts/partials/flash', :locals => {:flash => flash} %>
<div id="ltColumn">
<%= yield %>
</div>
<% unless yield(:hide_sidebar) %>
<div id="rtColumn">
- <%= render :partial => 'layouts/partials/sidebar', :locals => {:campaigns => @sidebar_campaigns} %>
+ <%= render :partial => "layouts/partials/#{yield(:sidebar) || 'sidebar'}", :locals => {:campaigns => @sidebar_campaigns} %>
</div>
<% end %>
<div class="clear"></div>
</div>
<div id="footer">
<div id="footerBrand">
<%= link_to 'Sunlight Foundation', 'http://www.sunlightfoundation.com' %>
</div>
<p>
Founded in 2006, the Sunlight Foundation supports, develops and deploys new Internet technologies to make information about Congress and the federal government more accessible to the American people. Through its projects and grant-making, Sunlight serves as a catalyst to create greater political transparency and to foster more openness and accountability in government. Visit SunlightFoundation.com to learn more.
</p>
</div>
</div>
</div>
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
try {
var pageTracker = _gat._getTracker("UA-1265484-42");
pageTracker._trackPageview();
} catch(err) {}</script>
</body>
</html>
\ No newline at end of file
diff --git a/app/views/layouts/partials/_user_sidebar.html.erb b/app/views/layouts/partials/_user_sidebar.html.erb
new file mode 100644
index 0000000..c2a506d
--- /dev/null
+++ b/app/views/layouts/partials/_user_sidebar.html.erb
@@ -0,0 +1,9 @@
+<h3 class="space">New Members</h3>
+<ul id="newMembers">
+ <% @users.each do |user| %>
+ <li>
+ <%= image_tag user.avatar.url(:normal) %>
+ <span class="leaderName"><%= h user.login %></span>
+ </li>
+ <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index e6883e7..da014bd 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -1,15 +1,16 @@
<% content_for :class, :home %>
<% content_for :header, :banner %>
+<% content_for :sidebar, :user_sidebar %>
<div class="mainTaskHeader">
<h2>Welcome</h2>
<div class="clear"></div>
</div>
<p>
Transparency Corps is the Sunlight Foundation's answer to the question, "How can I help?"
</p>
<p>
There are many big problems that we can solve with technology, but we can't solve them all. For many of the projects that make government transparency a reality, human eyes and analysis are required. With Transparency Corps, we break those tasks down into short, small actions that make a BIG difference. Join the Corps, and let's get started!
</p>
\ No newline at end of file
diff --git a/test/functional/pages_controller_test.rb b/test/functional/pages_controller_test.rb
index fb348d0..51b5e30 100644
--- a/test/functional/pages_controller_test.rb
+++ b/test/functional/pages_controller_test.rb
@@ -1,74 +1,80 @@
require 'test_helper'
class PagesControllerTest < ActionController::TestCase
setup :activate_authlogic
+ test '#index loads the most recent 5 users' do
+ user = Factory :user
+ User.expects(:all).with(:order => 'created_at DESC', :limit => 5).returns [Factory(:user)]
+ get :index
+ end
+
# every page should have these campaigns for the sidebar, but we'll just test it here
test '#about loads the most recent 5 active campaigns for the sidebar' do
Campaign.expects(:active).returns Campaign
get :about
end
test '#about loads the most recent 5 active campaigns for the logged in user for the sidebar, if logged in' do
user = Factory :user
Campaign.expects(:active_for).with(user).returns Campaign
login user
get :about
end
test '#contact with post and all data sends contact form email' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).with(name, email, message)
post :contact, :name => name, :email => email, :message => message
assert_redirected_to contact_path
assert_not_nil flash[:success]
end
test '#contact with post requires name' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :email => email, :message => message
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test '#contact with post requires email' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :name => name, :message => message
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test '#contact with post requires message' do
name = 'name'
email = 'email'
message = 'message'
ContactMailer.expects(:deliver_contact_form).never
post :contact, :name => name, :email => email
assert_response :success
assert_template 'contact'
assert_not_nil assigns(:error_messages)
end
test 'page routes' do
[:about, :contact].each do |page|
assert_routing "/#{page}", :controller => 'pages', :action => page.to_s
end
assert_routing '/', :controller => 'pages', :action => 'index'
end
end
|
sunlightlabs/tcorps | 3f5032d411079702e73fb5215a2d6dd20335aa52 | Added an email address to the contact page, with basic JavaScript obfuscation. | diff --git a/app/views/pages/contact.html.erb b/app/views/pages/contact.html.erb
index 2244265..b852260 100644
--- a/app/views/pages/contact.html.erb
+++ b/app/views/pages/contact.html.erb
@@ -1,44 +1,51 @@
<% content_for :class, :contact %>
<div class="mainTaskHeader">
<h2>Contact Us</h2>
<div class="clear"></div>
</div>
<p>
- Have an idea for how to make Transparency Corps better? Have a task related to government transparency that the Transparency Corps community could solve? Want to learn more about Transparency Corps or have a brilliant thought to share? Send us a note. We love new people and ideas!
+ Have an idea for how to make Transparency Corps better? Have a task related to government transparency that the Transparency Corps community could solve? Want to learn more about Transparency Corps or have a brilliant thought to share?
+ <% if_javascript do %>
+ Send us a note here, or email <% javascript_tag do %>mailtoLink('sunlightfoundation', 'com', 'tcorps')<% end %> directly.
+ <% end %>
+ <% no_javascript do %>
+ Send us a note.
+ <% end %>
+ We love new people and ideas!
</p>
<% form_tag '', :method => :post, :id => "contactForm" do %>
<% if @error_messages %>
<div class="contact_form_validation">
<%= @error_messages %>
</div>
<% end %>
<ul>
<li>
<label for='name'>Name</label>
<input id="name" class="text" type="text" name="name" size="32" />
</li>
<li>
<label for='email'>Email</label>
<input id="email" class="text" type="text" name="email" size="32" />
</li>
<li>
<label for="message">Your Inquiry</label>
<textarea id="message" class="textarea" name="message" cols="32" rows="5"></textarea>
</li>
</ul>
<button class="submitBtn" type="submit">
<span>Submit</span>
</button>
<% end %>
<p>
Are you a reporter? Probably don't want to fill out that form, huh. You should call our communications director:
<br/><br/>
Gabriela Schneider<br/>
(202) 742-1520 ext 236
</p>
\ No newline at end of file
diff --git a/public/javascripts/tcorps.js b/public/javascripts/tcorps.js
index a6f0b53..f547c83 100644
--- a/public/javascripts/tcorps.js
+++ b/public/javascripts/tcorps.js
@@ -1,34 +1,41 @@
var GB_ANIMATION = true;
$(document).ready(function(){
$('div#signin_nav li a, div#signup_nav li a').click(function() {
var name = $(this).parent('li')[0].id.split('_')[1];
var type = $(this).parents('div.nav')[0].id.split('_')[0];
return switch_nav(name, type);
});
});
function switch_nav(name, type) {
var nav_item = $('li#nav_' + name);
var other_navs = $('div#' + type + '_nav li:not(#nav_' + name + ')');
$('div.' + type + '_option').hide();
$('div#' + type + '_' + name).show();
other_navs.removeClass('active');
nav_item.addClass('active');
return false;
}
function setToNow(object, field) {
var base = object + "_" + field;
var now = new Date();
var minutes = now.getMinutes();
if (minutes < 10) minutes = "0" + minutes;
$("#" + base + "_1i").val(now.getYear() + 1900);
$("#" + base + "_2i").val(now.getMonth() + 1);
$("#" + base + "_3i").val(now.getDate());
$("#" + base + "_4i").val(now.getHours());
$("#" + base + "_5i").val(minutes);
+}
+
+// adapted from http://baxil.livejournal.com/266909.html
+function mailtoLink(rhs, tld, lhs) {
+ document.write("<a href=\"mailto");
+ document.write(":" + lhs + "@" + rhs + "." + tld + "\">");
+ document.write(lhs + "@" + rhs + "." + tld + "<\/a>");
}
\ No newline at end of file
|
mark-kubacki/ossdl-overlay | d1d979abeba3e15e799682185f7e764d0d176e40 | net-misc/youtube-dl-2015.10.13 | diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 89b7f63..dde8afb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 765 SHA256 74359a5967116a63443d35fc8b8014b70829a7e1d40695f22cb7666464c7edd9 SHA512 e0934cf72bb53a5e62aef12c245f6d1199b42256114890e2cb0e23b1778047d6ffc453943a4a34c774c2e0a8cc29b51ce1477e7433d8f071291fabef3d2e9551 WHIRLPOOL cce5d5048062fb9581ac63fe47d1c20db8b6a640c244bf7461ecdcaec2ffcd69a9f72b712a9fc3463acba7aa33b797674d09d171b3223424a688e777ca00ab5c
-DIST youtube-dl-2015.06.04.1.tar.gz 1562426 SHA256 cffb1edb9637962e6a2ea1d26284f52aa53c7f5cd2a3e1e94a21f414aa606566 SHA512 b0003c6d91c132fd5dcc7fb1b4c3870dc644cb20beb9e541bf90ab897828b31b4aa15582c984d9963e071b4160e0e334dbbb2cadc3a24aded52a78fbe8cc2959 WHIRLPOOL e027bb8b07be6f11ebb878719e3dcfd479255197cfa242b287a5a45118574e286e8d74a3cadb2856f6331aeae61a962be285230c7f4208e99367ebd8b74aa02a
-EBUILD youtube-dl-2015.06.04.1.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
+DIST youtube-dl-2015.10.13.tar.gz 1758950 SHA256 4588f98ecd082ac4d1574c6bbc386eaf625fe1b2b321f4f84a2eb6bea45b41f9 SHA512 c9bc2a0a7786467720d31c60d2b8319640d0e724ed1b2dd584553380f19714ad4351ea6051ad689252473aeb15524c096f2f2d89931dafdfd76d45bdca4d7fdb WHIRLPOOL 08c9652e606a7710a050aafdf5eadd3c183e9039d2a7947a766a6fd67696337d5156918f16e5341d3e1662798d1148e7dee1311c5626c845b2f11a89167f0d44
+EBUILD youtube-dl-2015.10.13.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
diff --git a/net-misc/youtube-dl/youtube-dl-2015.06.04.1.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.13.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2015.06.04.1.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.10.13.ebuild
|
mark-kubacki/ossdl-overlay | 9e2ac4abbbe073dd882b3eb642d7b1f6eba33c2b | dev-lang/gcc-5.0_alpha20150825 | diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index f9ab6ff..336a0ce 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,20 +1,20 @@
AUX 4.x/4.9-0x47-is-broadwell.patch 922 SHA256 12f2081c2325704ed6e899720649d2f33e59bfd4486eff5bd3c61c338b4fd8bf SHA512 0e54e2e22be131a8d9a69c24caf91cacd695104c1bcc32ed0e7f4205976e3987029d95a00aa136183b23cbe72f4b74ec157bfe800acddea55ab1e0a7d3e19f3f WHIRLPOOL f82a39b1b9169e3fa790f9415ffc76794c0c9ae0df3066a0083fb6373151a00fc5e8da499973e511dde18c90705b967753c65f01764f63edf1df73342342b860
AUX 4.x/4.9-add-skylake.patch 4388 SHA256 3ce05fff3003bf85e6a9d22d30ebd643b1b12dd2668b9ac580647e5ff6400b3d SHA512 29675e267e55efa96a220b82257bef6d75303499ce932d7b020d0627a920d422ab646f738eab5fdbb2b8635ae90879f45139579d2ef65ca7e27e454c4ce1fcbd WHIRLPOOL e1813796f360fe86faa228e512f0f20f39875f0be424213ea1466b0a0368fa82c328b38cd81b1ae40db9a8b8e6512b173bae688ae6b0c29e4c76b9b57f5063c4
AUX 4.x/4.9-haswell-float-optimize.patch 21243 SHA256 04e151f8b6cb1433efb94e8d139d9ab62140ffe88ec3c67e558adf4c112dd35c SHA512 84348701b5699b3964e1cc13335b1867178da315421c65d0de91a72e3b3355d8d86b4fe5edd5870878c875a1257357a4c91b429542d2b70ef5000db0da5651fd WHIRLPOOL 3243b848f0551cfadabee8274d115e122238334287e24fa5f6b687a506f617911fc787f01901ed5dbca5f003d2c266d96fd1bd1a31d003e298fea91885f455ec
AUX awk/fixlafiles.awk 7807 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c073e5c29433c3cdf9c5c SHA512 a39e09db4f34d1358de9e929b4c1e10b677d7e8aeffd6afb36d42543b18f1dfa77e3e26331e3fa1b556bae3d8c75ab4bd5796c7ccf2dda4eb365edb307828bed WHIRLPOOL 0cb6e5e96460514c17f3242d8fe936dc2545c07ca08c03ceb34730935435fde24d197300da54d4a19de86067f9e4bbc14178da2f7c03f4be57c89c81307f5d82
AUX awk/fixlafiles.awk-no_gcc_la 8596 SHA256 91e36c29133b6ff854bc84acd6cd2e9d07be6eaa73ef9b23e4f7bc6371107fab SHA512 a970ade3e0b57b3280dd01036a95338c4a7f0c7ec45e7aeb7255197df43e13a5fad8c565b4b345e3a0c8326f71ae7ab598b804eaeaa9d59eda8683195bccfe45 WHIRLPOOL e3da866b8902fbf639af545b43c3b6ccaca0f5d543647007f02e0b8bfc16a675463b8681e9fad11d6ce29517e099636f43708f880ef7a433e4578ee408c3b099
AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
AUX c99 446 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5 SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 WHIRLPOOL b888038b96615c7a0363555b407a3de2c1f17e34428fa16dfbf56fcf68875d6bcdecbc61b545d7f71842ff1909a3ffeff17165fa7f56b48f95adae22f5f8bff1
AUX fix_libtool_files.sh 1679 SHA256 0037e3f1303560f1ffadc61c7ed6bca13a41d6f2f70f196276938cda9dd158f0 SHA512 834beeb04f1057a0b1f79025fc9bbe0193ea8457055cc10b5b4c528a60e37ead7614a686aa6e7285e040161a91d4b5ff394539a33fc2f4b44be5c2514d0bb283 WHIRLPOOL c7e2f517e0c5c9a8930cd615f68222b44a6f227518ea71b5eb9b6436e1642be748d9cb4c0732f27df6c2ded2eb2c758d67ee9cb58e409f30814f988523dc649b
AUX gcc-configure-LANG.patch 2052 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 WHIRLPOOL 3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 WHIRLPOOL 39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb
DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad
DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
DIST gcc-4.9.3-patches-1.2.tar.bz2 23657 SHA256 1eb0b19e9f048ba30b897154aa51d4c84e5c65eeaa35faa2614af5219b06529b SHA512 05eeb60c7b8a99f3b283caea06a8e1a015c41756496b67ed912467cb437dcb9d3bcefc235e6e1dd79c6f7364f378af6a3ebf52b333610a25a6f85cb10c4394b6 WHIRLPOOL d457b4fe4257cc4ef57317187b979d0a97f5c55d8ba4ddd2133e37d1f63299bfe35c3e11ab4efecc5c4f0361789773e5035b216d7fbbe4cdf4bc0c41be0aa655
DIST gcc-4.9.3-piepatches-v0.6.2.tar.bz2 14261 SHA256 c92de44a4c79ffdd59fc78ebfb5262cd26171808e34f6cb77646c314fe4bc82e SHA512 26f273877926353758f922447c282a8bf30d42c3f34d35c04feee175506a1e06fe18cbc63bbb3a3f744cfa9b449feec3223af251c12f8784565ff90364dc65f2 WHIRLPOOL a9c5d1fc389630c4f46b82b9bccb0049fd3eefe77d11e2cb6f4227050df809932b12fa2ce9b6451d08af084ef03c003d007c5963ad99c26990a3fdfd801c7dbf
DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
-DIST gcc-5-20150818.tar.bz2 91281973 SHA256 5f65914dbf332fadafdc91c4682420c97b720b41d9ad5e8a083d1e5f2c7bfdb2 SHA512 862d1ce048403f431dd4a09e6a46d5be836ea87b1a543b66ce651ec89ed1d1a37f0b2ce48d92cdaf898402edf89e68fb4be1533d4206a21f10546714080048ad WHIRLPOOL 4c492ebf3dd8e0998bb3180fe9c4bb6828fc64c1c20ff8805da08a0d5c738fddc725c6b3c0177d2758a0322561a2871c0dbb49ea676e0f5db8c55bead3e9d5fd
+DIST gcc-5-20150825.tar.bz2 91284149 SHA256 8120112da0b5611e1d28e8899a6ea5f84ae058b9689ab8fb22a7845f4a5fb915 SHA512 2f8652056ce035525fe500fe2035888dcabb81a5cabc410c741d218cd8c53698cb308e67cab41872fdc76b7942811a793198081a007832e5199361e41ad67d34 WHIRLPOOL c5a2144895e10d4cb0de8a3f6f4add5d8f26964ad1d3a6cc234b9d5a111e36275943b1c7594cbea0e0f32cd06232482a0e8ed8fce1917e27cd7a4a9fe620a039
EBUILD gcc-4.9.3.ebuild 1472 SHA256 f97224556b16717418b6f198fa3ccfa6749a50bb6955c249a0de4381b4dc1fb3 SHA512 ac6f80851544dead5967464a4a63cd1bcaa5df132f6720e502b6de904d05d6151734c458bf9a461e6a38fcbbe8f9e3e18e79a03fdb7225fa7932e32c19aa1935 WHIRLPOOL 3414aa927b831e2b826672702271b6fb45612bb67945f01af91d3970cc0c5bbddbc128da9e08fd903ca0e475c0ec83e170c3fde8a45a8fd55eacd34c23381c79
-EBUILD gcc-5.0_alpha20150818.ebuild 1300 SHA256 14251ddd4be1de4211cb46b1984345acd31191900fd3801e2eafd5217fc45650 SHA512 420aa0ff8c85aa425f792ff8b56f0d7a0fcecb1da46ffe6cc52d28a5daebcbc89f1d53689a27c810d583655cc5c500aeec5c847fccb830d08eed846119ad2764 WHIRLPOOL c5a1faaf5a293a5d00de05567beea7351a610c9315c563941aa3902ce354e58aaf5d51f5eb819ab61b8424cee8cf000f0d4a3049916f327d21e62db31da892a2
+EBUILD gcc-5.0_alpha20150825.ebuild 1300 SHA256 14251ddd4be1de4211cb46b1984345acd31191900fd3801e2eafd5217fc45650 SHA512 420aa0ff8c85aa425f792ff8b56f0d7a0fcecb1da46ffe6cc52d28a5daebcbc89f1d53689a27c810d583655cc5c500aeec5c847fccb830d08eed846119ad2764 WHIRLPOOL c5a1faaf5a293a5d00de05567beea7351a610c9315c563941aa3902ce354e58aaf5d51f5eb819ab61b8424cee8cf000f0d4a3049916f327d21e62db31da892a2
diff --git a/sys-devel/gcc/gcc-5.0_alpha20150818.ebuild b/sys-devel/gcc/gcc-5.0_alpha20150825.ebuild
similarity index 100%
rename from sys-devel/gcc/gcc-5.0_alpha20150818.ebuild
rename to sys-devel/gcc/gcc-5.0_alpha20150825.ebuild
|
mark-kubacki/ossdl-overlay | adbfbb8f0e507d93fe6337cad0edd939cacdb9d1 | net-p2p/rtorrent-0.9.4-r1: fixes for semi-static builds | diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
deleted file mode 100644
index 89925a4..0000000
--- a/net-p2p/rtorrent/ChangeLog
+++ /dev/null
@@ -1,770 +0,0 @@
-# ChangeLog for net-p2p/rtorrent
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.178 2012/09/10 02:43:00 ottxor Exp $
-
- 10 Sep 2012; Christoph Junghans <[email protected]> rtorrent-0.9.2.ebuild:
- added prefix support (bug #431160)
-
-*rtorrent-0.9.2 (09 Jun 2012)
-
- 09 Jun 2012; Justin Lecher <[email protected]> +rtorrent-0.9.2.ebuild:
- Version BUmp, move to EAPI=4
-
- 04 May 2012; Jeff Horelick <[email protected]> rtorrent-0.8.6-r1.ebuild,
- rtorrent-0.8.6-r4.ebuild, rtorrent-0.8.7-r4.ebuild, rtorrent-0.8.9.ebuild,
- rtorrent-0.9.1.ebuild:
- dev-util/pkgconfig -> virtual/pkgconfig
-
- 10 Apr 2012; Stanislav Ochotnicky <[email protected]>
- rtorrent-0.8.9.ebuild, rtorrent-0.9.1.ebuild:
- Fix to depend on exact minor version of net-libs/libtorrent to prevent
- incompatible versions. Each minor version of rtorrent has minor version of
- net-libs/libtorrent associated with it
-
-*rtorrent-0.9.1 (08 Apr 2012)
-
- 08 Apr 2012; Stanislav Ochotnicky <[email protected]>
- -rtorrent-0.9.0.ebuild, -files/rtorrent-0.9.0-canvas-fix.patch,
- -files/rtorrent-0.9.0-clang.patch, -files/rtorrent-0.9.0-gold.patch,
- +rtorrent-0.9.1.ebuild, +files/rtorrent-0.9.1-ncurses.patch:
- Version bump (#411041), drop upstreamed patches and support for color. Too
- much work to keep working and delays updates.
-
- 09 Mar 2012; Stanislav Ochotnicky <[email protected]>
- rtorrent-0.9.0.ebuild, +files/rtorrent-0.9.0-clang.patch:
- Fix build problems with clang
-
- 08 Mar 2012; Stanislav Ochotnicky <[email protected]>
- rtorrent-0.9.0.ebuild:
- Add correct minimal version of net-libs/libtorrent
-
- 08 Mar 2012; Justin Lecher <[email protected]> rtorrent-0.9.0.ebuild,
- +files/rtorrent-0.9.0-gold.patch:
- Add patch to link with gold
-
-*rtorrent-0.9.0 (08 Mar 2012)
-
- 08 Mar 2012; Patrick Lauer <[email protected]>
- +files/rtorrent-0.9.0-canvas-fix.patch, +files/rtorrent-0.9.0-ncurses.patch,
- +rtorrent-0.9.0.ebuild:
- Bump for #396243
-
- 07 Mar 2012; Brent Baude <[email protected]> rtorrent-0.8.9.ebuild:
- Marking rtorrent-0.8.9 ppc64 for bug 389817
-
- 11 Dec 2011; Markus Meier <[email protected]> rtorrent-0.8.9.ebuild:
- x86 stable, bug #389817
-
- 28 Nov 2011; Tony Vroon <[email protected]> rtorrent-0.8.9.ebuild:
- Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo &
- Elijah "Armageddon" El Lazkani in bug #389817.
-
- 25 Nov 2011; Jeroen Roovers <[email protected]> rtorrent-0.8.9.ebuild:
- Stable for HPPA (bug #389817).
-
- 07 Nov 2011; Jeremy Olexa <[email protected]> files/rtorrentd.init:
- remove deprecated init option, bug 384541 (no revbump on purpose)
-
- 18 Sep 2011; MichaŠGórny <[email protected]> rtorrent-0.8.9.ebuild:
- Fix implicit $(use_enable debug).
-
-*rtorrent-0.8.9 (10 Sep 2011)
-
- 10 Sep 2011; MichaŠGórny <[email protected]> rtorrent-0.8.7-r4.ebuild,
- +rtorrent-0.8.9.ebuild, +files/rtorrent-0.8.9-canvas-fix.patch,
- +files/rtorrent-0.8.9-ncurses.patch:
- Version bump per bug #366623. Bump EAPI, migrate to autotools-utils. Fix
- libtorrent dep in previous version
-
-*rtorrent-0.8.7-r4 (15 Aug 2011)
-
- 15 Aug 2011; Stanislav Ochotnicky <[email protected]>
- -rtorrent-0.8.7-r3.ebuild, +rtorrent-0.8.7-r4.ebuild:
- Install man page manually(default target skips this now)
-
-*rtorrent-0.8.7-r3 (09 May 2011)
-*rtorrent-0.8.6-r4 (09 May 2011)
-
- 09 May 2011; Stanislav Ochotnicky <[email protected]>
- -rtorrent-0.8.6-r3.ebuild, +rtorrent-0.8.6-r4.ebuild,
- -rtorrent-0.8.7-r2.ebuild, +rtorrent-0.8.7-r3.ebuild, files/rtorrentd.init:
- Fixed up init script for daemon mode (problems when using baselayout-2)
-
-*rtorrent-0.8.7-r2 (18 Apr 2011)
-
- 18 Apr 2011; Stanislav Ochotnicky <[email protected]>
- -rtorrent-0.8.7-r1.ebuild, +rtorrent-0.8.7-r2.ebuild,
- +files/rtorrent-0.8.7-canvas-fix.patch, metadata.xml:
- Added optional support for color torrent listing
-
-*rtorrent-0.8.7-r1 (11 Apr 2011)
-*rtorrent-0.8.6-r3 (11 Apr 2011)
-
- 11 Apr 2011; Stanislav Ochotnicky <[email protected]>
- -rtorrent-0.8.5.ebuild, -rtorrent-0.8.6.ebuild, -rtorrent-0.8.6-r2.ebuild,
- +rtorrent-0.8.6-r3.ebuild, -rtorrent-0.8.7.ebuild,
- +rtorrent-0.8.7-r1.ebuild, files/rtorrentd.init:
- Fixed up init script a bit
- Removed old ~arch ebuilds that have been superseded
-
-*rtorrent-0.8.7 (03 Apr 2011)
-
- 03 Apr 2011; Patrick Lauer <[email protected]> +rtorrent-0.8.7.ebuild:
- Bump to match libtorrent
-
-*rtorrent-0.8.6-r2 (28 Mar 2011)
-
- 28 Mar 2011; Alex Alexander <[email protected]> +rtorrent-0.8.6-r2.ebuild,
- +files/rtorrent-0.8.6-ncurses.patch:
- fixed bug #358271
-
- 18 Aug 2010; Jeroen Roovers <[email protected]> rtorrent-0.8.6-r1.ebuild:
- Stable for HPPA (bug #311143).
-
- 04 Jul 2010; Samuli Suominen <[email protected]>
- rtorrent-0.8.6-r1.ebuild:
- ppc64 stable wrt #311143
-
- 04 May 2010; <[email protected]> rtorrent-0.8.6-r1.ebuild:
- amd64 stable, thanks to Roeland Douma (bug #311143)
-
- 18 Apr 2010; <[email protected]> rtorrent-0.8.6-r1.ebuild:
- ppc stable #311143
-
- 08 Apr 2010; Jeroen Roovers <[email protected]> metadata.xml:
- No need for "empty" maintainer tag when herd tag is present.
-
- 03 Apr 2010; Pawel Hajdan jr <[email protected]>
- rtorrent-0.8.6-r1.ebuild:
- x86 stable wrt bug #311143
-
- 18 Mar 2010; Dror Levin <[email protected]> files/rtorrentd.init:
- Fix screen invocation in initd script, bug 294435.
-
- 22 Jan 2010; Dawid WÄgliÅski <[email protected]> rtorrent-0.8.6-r1.ebuild:
- Add some elog instructions messages
-
-*rtorrent-0.8.6-r1 (22 Jan 2010)
-
- 22 Jan 2010; Dawid WÄgliÅski <[email protected]> +rtorrent-0.8.6-r1.ebuild:
- Revision bump, so users can rebuild rtorrent with canvas colour patch.
-
- 21 Jan 2010; Dawid WÄgliÅski <[email protected]> rtorrent-0.8.6.ebuild,
- +files/rtorrent-0.8.6-canvas-fix.patch:
- Add canvas colour patch. Bug #295373.
-
- 28 Dec 2009; Raúl Porcel <[email protected]> rtorrent-0.8.5.ebuild,
- rtorrent-0.8.6.ebuild:
- Add ~arm
-
-*rtorrent-0.8.6 (22 Dec 2009)
-
- 22 Dec 2009; Samuli Suominen <[email protected]>
- +rtorrent-0.8.6.ebuild:
- Version bump.
-
- 09 Dec 2009; nixnut <[email protected]> rtorrent-0.8.5.ebuild:
- ppc stable #291036
-
- 08 Dec 2009; Jeroen Roovers <[email protected]> rtorrent-0.8.5.ebuild:
- Stable for HPPA (bug #291036).
-
- 23 Nov 2009; Markus Meier <[email protected]> rtorrent-0.8.5.ebuild:
- x86 stable, bug #291036
-
- 18 Nov 2009; Brent Baude <[email protected]> rtorrent-0.8.5.ebuild:
- Marking rtorrent-0.8.5 ppc64 for bug 291036
-
- 27 Oct 2009; Patrick Lauer <[email protected]> rtorrent-0.8.5.ebuild:
- Readding 0.8.2-gcc34.patch for #224031
-
-*rtorrent-0.8.5 (10 Sep 2009)
-
- 10 Sep 2009; Patrick Lauer <[email protected]> +rtorrent-0.8.5.ebuild:
- Bump to 0.8.5, fixes other half of #278660. Thanks to Shark for testing.
-
- 28 Jul 2009; Robin H. Johnson <[email protected]> files/rtorrentd.init:
- Bug #262046: If used with a non-local NSS source, we need to start after
- those.
-
- 05 Jun 2009; Peter Alfredsen <[email protected]> metadata.xml:
- Retiring, bug 220219.
-
- 20 May 2009; Jeremy Olexa <[email protected]> files/rtorrentd.init,
- -rtorrent-0.7.9.ebuild, -rtorrent-0.8.2-r3.ebuild,
- -rtorrent-0.8.2-r5.ebuild:
- Allow init script to find homedir instead of hardcoding it, patch by MichaÅ
- Górny, bug 265969
-
- 06 Mar 2009; Jeroen Roovers <[email protected]> rtorrent-0.8.4-r1.ebuild:
- Stable for HPPA (bug #255756).
-
- 05 Mar 2009; Peter Alfredsen <[email protected]>
- files/rtorrent-0.8.4-gcc44.patch:
- Fix dos line-endings in patch. Bug 261253. Thanks to Aelia
- <[email protected]> for reporting.
-
- 04 Mar 2009; Peter Alfredsen <[email protected]>
- +files/rtorrent-0.8.4-gcc44.patch, rtorrent-0.8.4-r1.ebuild:
- Trivial gcc-4.4 fix, bug 257643. Thanks to Mike Mullen <[email protected]>.
-
- 01 Mar 2009; Peter Alfredsen <[email protected]> rtorrent-0.7.9.ebuild,
- rtorrent-0.8.2-r3.ebuild, rtorrent-0.8.2-r5.ebuild, rtorrent-0.8.3.ebuild,
- rtorrent-0.8.4-r1.ebuild:
- Fix description of rtorrent.rc location to take into account compression
- of doc files. Bug 260772. Thanks to Victor Ostorga <[email protected]>.
-
- 15 Feb 2009; Brent Baude <[email protected]> rtorrent-0.8.4-r1.ebuild:
- Marking rtorrent-0.8.4-r1 ppc for bug 255756
-
- 15 Feb 2009; Markus Meier <[email protected]> rtorrent-0.8.4-r1.ebuild:
- amd64/x86 stable, bug #255756
-
- 12 Feb 2009; Brent Baude <[email protected]> rtorrent-0.8.4-r1.ebuild:
- Marking rtorrent-0.8.4-r1 ppc64 for bug 255756
-
-*rtorrent-0.8.4-r1 (26 Dec 2008)
-
- 26 Dec 2008; Jeremy Olexa <[email protected]> +files/rtorrentd.conf,
- +files/rtorrentd.init, metadata.xml, -rtorrent-0.8.4.ebuild,
- +rtorrent-0.8.4-r1.ebuild:
- Add a new USE=daemon flag to provide init scripts. bug #250578
-
-*rtorrent-0.8.4 (19 Nov 2008)
-
- 19 Nov 2008; Peter Alfredsen <[email protected]> +rtorrent-0.8.4.ebuild:
- Bumb
-
- 04 Oct 2008; Peter Alfredsen <[email protected]> rtorrent-0.7.9.ebuild,
- rtorrent-0.8.2-r3.ebuild, rtorrent-0.8.3.ebuild:
- Propagate fix to other versions. Hrmm...
-
- 04 Oct 2008; Peter Alfredsen <[email protected]>
- rtorrent-0.8.2-r5.ebuild:
- Fix bug 239666, missing pkgconfig. Thanks to Evil Compile Person
- <[email protected]>.
-
- 04 Oct 2008; Brent Baude <[email protected]> rtorrent-0.8.2-r5.ebuild:
- Marking rtorrent-0.8.2-r5 ppc64 for bug 238611
-
- 27 Sep 2008; Dawid WÄgliÅski <[email protected]> rtorrent-0.8.2-r5.ebuild:
- Stable on x86 (bug #238611)
-
- 27 Sep 2008; nixnut <[email protected]> rtorrent-0.8.2-r5.ebuild:
- Stable on ppc wrt bug 238611
-
- 26 Sep 2008; Jeroen Roovers <[email protected]> rtorrent-0.8.2-r5.ebuild:
- Stable for HPPA (bug #238611).
-
- 25 Sep 2008; Kenneth Prugh <[email protected]> rtorrent-0.8.2-r5.ebuild:
- amd64 stable, bug #238611
-
-*rtorrent-0.8.3 (16 Sep 2008)
-
- 16 Sep 2008; Peter Alfredsen <[email protected]>
- rtorrent-0.8.2-r3.ebuild, -rtorrent-0.8.2-r4.ebuild,
- rtorrent-0.8.2-r5.ebuild, +rtorrent-0.8.3.ebuild:
- rtorrent-0.8.3/libtorrent-0.12.3 bump
-
-*rtorrent-0.8.2-r5 (26 Aug 2008)
-
- 26 Aug 2008; Peter Alfredsen <[email protected]>
- +files/rtorrent-0.8.2-fix_scgi_crash.patch, +rtorrent-0.8.2-r5.ebuild:
- Fix a crash in scgi_local or scgi_port when calling freeaddrinfo with a
- NULL pointer. Patch by Josef Drexler.
-
- 25 Aug 2008; Jeroen Roovers <[email protected]> rtorrent-0.8.2-r3.ebuild:
- Stable for HPPA (bug #233122).
-
-*rtorrent-0.8.2-r4 (07 Aug 2008)
-
- 07 Aug 2008; Peter Alfredsen <[email protected]>
- +files/rtorrent-0.8.2-fix-configure-execinfo.patch,
- +files/rtorrent-0.8.2-fix_utf8_filenames.patch, rtorrent-0.8.2-r3.ebuild,
- +rtorrent-0.8.2-r4.ebuild:
- Add new revision with fix for upstream ticket 1416 and quick autoconf fix
- to avoid segfault when execinfo.h exists, by Josef Drexler. Remove
- enable-aligned from rtorrent ebuild, since that is only used by libtorrent
- ebuild. Add ewarn w.r.t. bug #212299.
-
- 02 Aug 2008; Markus Rothe <[email protected]> rtorrent-0.8.2-r3.ebuild:
- Stable on ppc64; bug #233122
-
- 01 Aug 2008; Peter Alfredsen <[email protected]>
- +files/rtorrent-0.8.2-gcc34.patch, rtorrent-0.8.2-r3.ebuild:
- Add patch for gcc-3.4, bug #224031. Thanks goes to Herbie Hopkins
- <[email protected]>. Upstream http://libtorrent.rakshasa.no/ticket/1271 .
- Verified with Josef Drexler via IRC that this is the correct solution.
-
- 01 Aug 2008; nixnut <[email protected]> rtorrent-0.8.2-r3.ebuild:
- Stable on ppc wrt bug 233122
-
- 30 Jul 2008; Dawid WÄgliÅski <[email protected]> rtorrent-0.8.2-r3.ebuild:
- Stable on amd64 (bug #233122)
-
- 29 Jul 2008; Raúl Porcel <[email protected]> rtorrent-0.8.2-r3.ebuild:
- x86 stable wrt #233122
-
-*rtorrent-0.8.2-r3 (28 Jun 2008)
-
- 28 Jun 2008; Peter Alfredsen <[email protected]>
- +files/rtorrent-0.8.2-fix_conn_type_seed.patch,
- +files/rtorrent-0.8.2-fix_load_cache.patch, -rtorrent-0.8.2-r2.ebuild,
- +rtorrent-0.8.2-r3.ebuild:
- Revision bump to update patchset with newest fixes from Josef Drexler.
-
-*rtorrent-0.8.2-r2 (05 Jun 2008)
-
- 05 Jun 2008; Peter Alfredsen <[email protected]>
- +files/rtorrent-0.8.2-fix_start_stop_filter.patch, metadata.xml,
- -rtorrent-0.8.0.ebuild, -rtorrent-0.8.2.ebuild, +rtorrent-0.8.2-r2.ebuild:
- Adding bugfix patch recommended by upstream.
-
-*rtorrent-0.8.2 (27 May 2008)
-
- 27 May 2008; Samuli Suominen <[email protected]> +rtorrent-0.8.2.ebuild:
- Version bump.
-
- 21 Apr 2008; Diego Pettenò <[email protected]>
- +files/rtorrent-0.8.0+gcc-4.3.patch, rtorrent-0.8.0.ebuild:
- Add patch by Philipp to build with GCC 4.3 (bug #212833).
-
-*rtorrent-0.8.0 (01 Mar 2008)
-
- 01 Mar 2008; Timothy Redaelli <[email protected]> +rtorrent-0.8.0.ebuild:
- Version Bump wrt bug #209361
- Add ipv6 use flag wrt bug #207581
-
- 06 Feb 2008; nixnut <[email protected]> rtorrent-0.7.9.ebuild:
- stable on ppc wrt bug #209140
-
- 06 Feb 2008; Christoph Mende <[email protected]> rtorrent-0.7.9.ebuild:
- Stable on amd64, bug #209140
-
- 06 Feb 2008; Raúl Porcel <[email protected]> -rtorrent-0.7.1.ebuild,
- -rtorrent-0.7.2.ebuild, -rtorrent-0.7.3.ebuild, -rtorrent-0.7.4.ebuild,
- rtorrent-0.7.9.ebuild:
- x86 stable, remove old
-
- 05 Feb 2008; Markus Rothe <[email protected]> rtorrent-0.7.9.ebuild:
- Stable on ppc64
-
- 10 Jan 2008; Guy Martin <[email protected]> rtorrent-0.7.9.ebuild:
- Added hppa to KEYWORDS.
-
- 06 Jan 2008; Timothy Redaelli <[email protected]> rtorrent-0.7.9.ebuild:
- Add xmlrpc use flag, please test and report.
- Bug #182816
-
- 13 Nov 2007; Samuli Suominen <[email protected]> rtorrent-0.7.8.ebuild:
- amd64 stable wrt #198558, thanks to Angelo Arrifano for testing.
-
- 13 Nov 2007; Raúl Porcel <[email protected]> rtorrent-0.7.9.ebuild:
- Add ~ia64 wrt #198844
-
- 10 Nov 2007; Markus Rothe <[email protected]> rtorrent-0.7.8.ebuild:
- Stable on ppc64; bug #198558
-
- 09 Nov 2007; nixnut <[email protected]> rtorrent-0.7.8.ebuild:
- Stable on ppc wrt bug 198558
-
- 09 Nov 2007; Dawid WÄgliÅski <[email protected]> rtorrent-0.7.8.ebuild:
- Stable on x86 (bug #198558)
-
-*rtorrent-0.7.9 (25 Oct 2007)
-
- 25 Oct 2007; Timothy Redaelli <[email protected]> +rtorrent-0.7.9.ebuild:
- Version bump, thanks to Flameeyes for poking me.
-
- 08 Sep 2007; Hanno Boeck <[email protected]> ChangeLog:
- Place comment below econf-line, else it breaks.
-
-*rtorrent-0.7.8 (08 Sep 2007)
-
- 08 Sep 2007; Timothy Redaelli <[email protected]> +rtorrent-0.7.8.ebuild:
- Version bump wrt bug #182816.
-
- 24 May 2007; Timothy Redaelli <[email protected]> rtorrent-0.7.4.ebuild:
- append-flags -fno-strict-aliasing wrt bug #179554
-
- 05 Apr 2007; Timothy Redaelli <[email protected]> rtorrent-0.7.2.ebuild:
- Stable on ppc wrt bug #172469
- Thanks to Nathan Smith for testing.
-
-*rtorrent-0.7.4 (04 Apr 2007)
-
- 04 Apr 2007; Timothy Redaelli <[email protected]> +rtorrent-0.7.4.ebuild:
- Version bump (thx to Flameeyes for reporting on irc)
-
- 29 Mar 2007; Markus Rothe <[email protected]> rtorrent-0.7.2.ebuild:
- Stable on ppc64; bug #172469
-
- 29 Mar 2007; Daniel Gryniewicz <[email protected]> rtorrent-0.7.2.ebuild:
- Marked stable on amd64 for bug #172469
-
- 28 Mar 2007; Christian Faulhammer <[email protected]>
- rtorrent-0.7.2.ebuild:
- stable x86, bug 172469
-
- 27 Mar 2007; Timothy Redaelli <[email protected]> rtorrent-0.7.2.ebuild,
- rtorrent-0.7.3.ebuild:
- Fix bug #170422
- Thanks to arj
-
-*rtorrent-0.7.3 (27 Mar 2007)
-
- 27 Mar 2007; Timothy Redaelli <[email protected]> +rtorrent-0.7.3.ebuild:
- Version bump
-
- 19 Mar 2007; Bryan Ãstergaard <[email protected]> metadata.xml:
- Remove flameeyes from metadata.xml due to retirement.
-
- 23 Feb 2007; Timothy Redaelli <[email protected]> -rtorrent-0.6.4.ebuild:
- Remove unused version.
-
- 05 Feb 2007; Timothy Redaelli <[email protected]> rtorrent-0.7.2.ebuild:
- Remove sys-devel/bc dep since 0.7.2 does not need it anymore.
- Thanks to Sascha Geschwandtner for reporting wrt bug #165393.
-
- 03 Feb 2007; nixnut <[email protected]> rtorrent-0.7.1.ebuild:
- Stable on ppc wrt bug 164235
-
- 01 Feb 2007; Markus Rothe <[email protected]> rtorrent-0.7.1.ebuild:
- Stable on ppc64; bug #164235
-
- 01 Feb 2007; Timothy Redaelli <[email protected]> rtorrent-0.7.1.ebuild:
- Stable on amd64 wrt bug #164235
-
- 31 Jan 2007; Markus Rothe <[email protected]> ChangeLog:
- Stable on ppc64; bug #164235
-
- 28 Jan 2007; Raúl Porcel <[email protected]> rtorrent-0.7.1.ebuild:
- x86 stable wrt bug 164235
-
-*rtorrent-0.7.2 (27 Jan 2007)
-
- 27 Jan 2007; Timothy Redaelli <[email protected]> +rtorrent-0.7.2.ebuild:
- Version bump
-
- 05 Jan 2007; Diego Pettenò <[email protected]> rtorrent-0.6.4.ebuild,
- rtorrent-0.7.1.ebuild:
- Convert to use elog.
-
- 29 Dec 2006; Timothy Redaelli <[email protected]> rtorrent-0.7.1.ebuild:
- Fixed libtorrent dep as reported by Ville Salomäki wrt bug #159353
-
-*rtorrent-0.7.1 (28 Dec 2006)
-
- 28 Dec 2006; Diego Pettenò <[email protected]> -rtorrent-0.6.0.ebuild,
- -rtorrent-0.7.0.ebuild, +rtorrent-0.7.1.ebuild:
- Version bump and old versions cleanup.
-
- 21 Dec 2006; Markus Rothe <[email protected]> rtorrent-0.6.4.ebuild:
- Stable on ppc64; bug #158007
-
- 17 Dec 2006; Tobias Scherbaum <[email protected]>
- rtorrent-0.6.4.ebuild:
- Stable on ppc wrt bug #158007.
-
- 14 Dec 2006; Brent Baude <[email protected]> ChangeLog:
- Marking rtorrent-0.6.4 ppc64 stable for bug 158007
-
- 13 Dec 2006; Christian Faulhammer <[email protected]>
- rtorrent-0.6.4.ebuild:
- stable x86, bug #158007
-
- 13 Dec 2006; Michael Cummings <[email protected]>
- rtorrent-0.6.4.ebuild:
- amd64 stable, bug 158007
-
-*rtorrent-0.7.0 (13 Dec 2006)
-
- 13 Dec 2006; Diego Pettenò <[email protected]> -rtorrent-0.5.3.ebuild,
- -rtorrent-0.6.1.ebuild, -rtorrent-0.6.3.ebuild, -rtorrent-0.6.3-r1.ebuild,
- +rtorrent-0.7.0.ebuild:
- Version bump, and remove old versions.
-
- 21 Nov 2006; Timothy Redaelli <[email protected]> metadata.xml:
- Added myself as co-maintainer.
-
- 20 Nov 2006; Christian Faulhammer <[email protected]>
- rtorrent-0.6.4.ebuild:
- filtered -fforce-addr on x86, as reported by [email protected] in bug
- #155679
-
-*rtorrent-0.6.4 (27 Oct 2006)
-
- 27 Oct 2006; Diego Pettenò <[email protected]> +rtorrent-0.6.4.ebuild:
- Version bump.
-
-*rtorrent-0.6.3-r1 (19 Oct 2006)
-
- 19 Oct 2006; Diego Pettenò <[email protected]>
- +rtorrent-0.6.3-r1.ebuild:
- Replace -O2 with -O3 on x86 systems running GCC 4.1. Closes bug #151221.
-
-*rtorrent-0.6.3 (05 Oct 2006)
-
- 05 Oct 2006; Diego Pettenò <[email protected]> -rtorrent-0.6.2.ebuild,
- +rtorrent-0.6.3.ebuild:
- Version bump, remove old broken release.
-
- 24 Sep 2006; Michael Hanselmann <[email protected]> rtorrent-0.6.0.ebuild:
- Stable on ppc.
-
-*rtorrent-0.6.2 (14 Sep 2006)
-
- 14 Sep 2006; Diego Pettenò <[email protected]> +rtorrent-0.6.2.ebuild:
- Version bump.
-
- 09 Sep 2006; Diego Pettenò <[email protected]> rtorrent-0.6.0.ebuild,
- rtorrent-0.6.1.ebuild:
- Add missing build-time dependency on bc as per bug #146845.
-
- 09 Sep 2006; Torsten Veller <[email protected]> rtorrent-0.6.0.ebuild:
- Stable on x86 (#146845)
-
- 09 Sep 2006; Thomas Cort <[email protected]> rtorrent-0.6.0.ebuild:
- Stable on amd64 wrt Bug #146845.
-
- 08 Sep 2006; Markus Rothe <[email protected]> rtorrent-0.6.0.ebuild:
- Stable on ppc64; bug #146845
-
- 02 Sep 2006; Diego Pettenò <[email protected]> rtorrent-0.6.1.ebuild:
- Correct dependency on libtorrent version, thanks to jieryn in bug #145837.
-
-*rtorrent-0.6.1 (31 Aug 2006)
-
- 31 Aug 2006; Diego Pettenò <[email protected]> +rtorrent-0.6.1.ebuild:
- Version bump, thanks to Daniel Webert and CJ Kucera, bug #144926 and #145384.
-
- 21 Jul 2006; Diego Pettenò <[email protected]> -rtorrent-0.4.3.ebuild:
- Drop old version.
-
- 20 Jul 2006; Markus Rothe <[email protected]> rtorrent-0.5.3.ebuild:
- Stable on ppc64; bug #139716
-
- 10 Jul 2006; Joshua Jackson <[email protected]> rtorrent-0.5.3.ebuild:
- Stable x86; bug #139716
-
- 10 Jul 2006; Daniel Gryniewicz <[email protected]> rtorrent-0.5.3.ebuild:
- Marked stable on amd64 per bug #139716
-
- 09 Jul 2006; Joseph Jezak <[email protected]> rtorrent-0.5.3.ebuild:
- Marked ppc stable for bug #139716.
-
-*rtorrent-0.6.0 (08 Jul 2006)
-
- 08 Jul 2006; Diego Pettenò <[email protected]>
- -files/rtorrent-0.5.1-template.patch, -rtorrent-0.5.0.ebuild,
- -rtorrent-0.5.1.ebuild, -rtorrent-0.5.2.ebuild, +rtorrent-0.6.0.ebuild:
- Version bump to latest version, drop old version.
-
-*rtorrent-0.5.3 (23 May 2006)
-
- 23 May 2006; Diego Pettenò <[email protected]> +rtorrent-0.5.3.ebuild:
- Version bump.
-
-*rtorrent-0.5.2 (19 May 2006)
-
- 19 May 2006; Diego Pettenò <[email protected]> +rtorrent-0.5.2.ebuild:
- Version bump.
-
- 05 May 2006; Diego Pettenò <[email protected]>
- -files/rtorrent-0.5.1-build.patch, +files/rtorrent-0.5.1-template.patch,
- rtorrent-0.5.1.ebuild:
- Update patch for GCC 4.1 from upstream.
-
-*rtorrent-0.5.1 (05 May 2006)
-
- 05 May 2006; Diego Pettenò <[email protected]>
- +files/rtorrent-0.5.1-build.patch, +rtorrent-0.5.1.ebuild:
- Version bump.
-
- 23 Apr 2006; Diego Pettenò <[email protected]> rtorrent-0.5.0.ebuild:
- Add ~x86-fbsd keyword.
-
- 20 Apr 2006; Diego Pettenò <[email protected]>
- -files/rtorrent-0.4.4-inttypes.patch, -rtorrent-0.3.6.ebuild,
- -rtorrent-0.4.4.ebuild, -rtorrent-0.4.5.ebuild:
- Drop old versions.
-
-*rtorrent-0.5.0 (06 Apr 2006)
-
- 06 Apr 2006; Diego Pettenò <[email protected]> +rtorrent-0.5.0.ebuild:
- Version bump.
-
- 17 Feb 2006; Joseph Jezak <[email protected]> rtorrent-0.4.3.ebuild:
- Marked ppc stable for bug #121600.
-
- 16 Feb 2006; Luis Medinas <[email protected]> rtorrent-0.4.3.ebuild:
- Stable on amd64. See bug #121600.
-
-*rtorrent-0.4.5 (16 Feb 2006)
-
- 16 Feb 2006; Diego Pettenò <[email protected]> +rtorrent-0.4.5.ebuild:
- New upstream version.
-
- 15 Feb 2006; Markus Rothe <[email protected]> rtorrent-0.4.3.ebuild:
- Stable on ppc64; bug #121600
-
- 09 Feb 2006; Joshua Jackson <[email protected]> rtorrent-0.4.3.ebuild:
- Stable on x86; bug #121600
-
- 06 Feb 2006; Diego Pettenò <[email protected]>
- +files/rtorrent-0.4.4-inttypes.patch, rtorrent-0.4.4.ebuild:
- Add patch to fix building on some systems, bug #121771.
-
- 04 Feb 2006; Diego Pettenò <[email protected]> -rtorrent-0.4.0.ebuild,
- -rtorrent-0.4.1.ebuild, -rtorrent-0.4.2.ebuild:
- Drop old non-stable-candidate versions.
-
-*rtorrent-0.4.4 (04 Feb 2006)
-
- 04 Feb 2006; Diego Pettenò <[email protected]> +rtorrent-0.4.4.ebuild:
- Bump following upstream.
-
-*rtorrent-0.4.3 (17 Jan 2006)
-
- 17 Jan 2006; Diego Pettenò <[email protected]> +rtorrent-0.4.3.ebuild:
- Bump to latest version.
-
- 17 Jan 2006; Diego Pettenò <[email protected]> rtorrent-0.4.2.ebuild:
- -Os seems to create bad exception handling, replace with -O2.
-
-*rtorrent-0.4.2 (09 Jan 2006)
-
- 09 Jan 2006; Diego Pettenò <[email protected]> +rtorrent-0.4.2.ebuild:
- Bump to last version.
-
- 26 Dec 2005; Jason Wever <[email protected]> rtorrent-0.4.1.ebuild:
- Added ~sparc keyword wrt bug #116604.
-
-*rtorrent-0.4.1 (20 Dec 2005)
-
- 20 Dec 2005; Diego Pettenò <[email protected]> +rtorrent-0.4.1.ebuild:
- Bump to latest version.
-
- 29 Nov 2005; Diego Pettenò <[email protected]> -rtorrent-0.3.0.ebuild:
- Remove old version.
-
- 25 Nov 2005; Markus Rothe <[email protected]> rtorrent-0.4.0.ebuild:
- Added ~ppc64 keyword
-
- 25 Nov 2005; Mark Loeser <[email protected]> rtorrent-0.3.6.ebuild:
- Stable on x86; bug #112928
-
-*rtorrent-0.4.0 (21 Nov 2005)
-
- 21 Nov 2005; Diego Pettenò <[email protected]> +rtorrent-0.4.0.ebuild:
- Bump following upstream.
-
- 19 Nov 2005; <[email protected]> rtorrent-0.3.6.ebuild:
- Marked stable on amd64
-
- 05 Nov 2005; Diego Pettenò <[email protected]> -rtorrent-0.3.5.ebuild:
- Remove old version.
-
-*rtorrent-0.3.6 (18 Oct 2005)
-
- 18 Oct 2005; Diego Pettenò <[email protected]> +rtorrent-0.3.6.ebuild:
- Bumped following upstream.
-
- 13 Oct 2005; Mark Loeser <[email protected]> rtorrent-0.3.0.ebuild:
- Stable on x86
-
- 11 Oct 2005; Diego Pettenò <[email protected]> -rtorrent-0.3.2.ebuild,
- -rtorrent-0.3.3.ebuild, -rtorrent-0.3.4.ebuild:
- Remove old versions.
-
-*rtorrent-0.3.5 (28 Sep 2005)
-
- 28 Sep 2005; Diego Pettenò <[email protected]> +rtorrent-0.3.5.ebuild:
- Version bump.
-
-*rtorrent-0.3.4 (18 Sep 2005)
-
- 18 Sep 2005; Diego Pettenò <[email protected]> rtorrent-0.3.3.ebuild,
- +rtorrent-0.3.4.ebuild:
- Updated to latest upstream version. rtorrent-0.3.3 can work with libtorrent
- 0.7.4.
-
- 02 Sep 2005; Diego Pettenò <[email protected]>
- -files/rtorrent-0.2.3-fix.patch, -rtorrent-0.2.4.ebuild,
- -rtorrent-0.2.7-r1.ebuild, rtorrent-0.3.0.ebuild:
- Marked 0.3.0 stable on amd64. Removed old ebuilds.
-
-*rtorrent-0.3.3 (02 Sep 2005)
-
- 02 Sep 2005; Diego Pettenò <[email protected]> +rtorrent-0.3.3.ebuild:
- Updated to latest upstream version.
-
-*rtorrent-0.3.2 (16 Aug 2005)
-
- 16 Aug 2005; Diego Pettenò <[email protected]> -rtorrent-0.3.1.ebuild,
- +rtorrent-0.3.2.ebuild:
- Update to bugfix release 0.3.2.
-
-*rtorrent-0.3.1 (13 Aug 2005)
-
- 13 Aug 2005; Diego Pettenò <[email protected]> +rtorrent-0.3.1.ebuild:
- Updated to latest upstream version.
-
- 31 Jul 2005; Diego Pettenò <[email protected]> -rtorrent-0.2.5.ebuild,
- -rtorrent-0.2.6.ebuild, -rtorrent-0.2.7.ebuild:
- Removed old versions.
-
-*rtorrent-0.3.0 (19 Jul 2005)
-
- 19 Jul 2005; Diego Pettenò <[email protected]> +rtorrent-0.3.0.ebuild:
- New upstream version.
-
-*rtorrent-0.2.7-r1 (16 Jul 2005)
-
- 16 Jul 2005; Diego Pettenò <[email protected]>
- +rtorrent-0.2.7-r1.ebuild:
- Filter -fomit-frame-pointer on x86 as it clash with execeptions handling.
-
-*rtorrent-0.2.7 (07 Jul 2005)
-
- 07 Jul 2005; Diego Pettenò <[email protected]> -rtorrent-0.2.2.ebuild,
- -rtorrent-0.2.3.ebuild, rtorrent-0.2.4.ebuild, +rtorrent-0.2.7.ebuild:
- New upstream version.
- Marked stable the last version with big bugs fixes.
- Removed previous versions.
-
-*rtorrent-0.2.6 (26 Jun 2005)
-
- 26 Jun 2005; Diego Pettenò <[email protected]> +rtorrent-0.2.6.ebuild:
- New upstream version.
-
-*rtorrent-0.2.5 (15 Jun 2005)
-
- 15 Jun 2005; Diego Pettenò <[email protected]> rtorrent-0.2.2.ebuild,
- rtorrent-0.2.3.ebuild, rtorrent-0.2.4.ebuild, +rtorrent-0.2.5.ebuild:
- New upstream version. Also make all rtorrent version depend on the
- libtorrent version they are released with.
-
-*rtorrent-0.2.4 (08 Jun 2005)
-
- 08 Jun 2005; Diego Pettenò <[email protected]> +rtorrent-0.2.4.ebuild:
- Added latest upstream version (with notice about new configuration file).
-
- 31 May 2005; David Holm <[email protected]> rtorrent-0.2.3.ebuild:
- Added to ~ppc.
-
-*rtorrent-0.2.3 (30 May 2005)
-
- 30 May 2005; Diego Pettenò <[email protected]>
- +files/rtorrent-0.2.3-fix.patch, +rtorrent-0.2.3.ebuild:
- Update to latest upstream version. Close #94532.
-
- 26 May 2005; Sven Wegener <[email protected]> metadata.xml:
- 'no-herd' instead of empty herd tag
-
-*rtorrent-0.2.2 (05 May 2005)
-
- 05 May 2005; Diego Pettenò <[email protected]> +metadata.xml,
- +rtorrent-0.2.2.ebuild:
- Added rtorrent client based on libtorrent as now is packaged standalone.
- Closes #86259.
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 540e76a..bf3e5f2 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,14 +1,8 @@
-AUX rtorrent-0.8.2-gcc34.patch 659 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d SHA512 7d16623aef8dd006b8ec722eb4fa0488994942f10b5cb29c808c6a36877b5ffa5ce710d8d34ccf8ea4fc6ca3ac22ab1e789b0cd12fddfb66fa68a68caf2c4f3c WHIRLPOOL 3072395d6abb375ad2c3f245c69a7aa63858b447798ae9808c5ffd230a48a8e0fe7793a3e38904acf8be127d828cae07ebbb694078711efda0ade4f07d62096b
-AUX rtorrent-0.8.6-canvas-fix.patch 11607 SHA256 a843dcd8c3b7fe0179c24d53cb485d2f11156a189e58911bbd14e5e30db71925 SHA512 10980273c5272ce3dd2888734bb27f9871d1266923c8a59a06442db5f2cb76ecc938227637834bb3ee7b937847b06a938887bd371bb2d1267bfbe0344fdc5e7c WHIRLPOOL 250dd2cadf7e6ec741a9ad56532065f04714c45949fa8536a6e47cdae4247df4c9844839a9fceaf1dc5e43fddc095b43de4120236b4442a0307d2600a2f7776a
-AUX rtorrent-0.8.6-ncurses.patch 572 SHA256 4bcc6f33fad67d14f44cfdc63409fc94ef917dc120c46e60ce175d36af3fcb02 SHA512 1c153f591383489c3c703bc44323d6f1f3e3b0fe5e822289227f88e9c4e9f4c3d18dde4026e81cacb3d1bc52dd8ae9dc356fb9aa91050a69568eab32d2341ce4 WHIRLPOOL 211bbaee44904e72fe23030694d8dffb4cbef0feb42c28371c367929e4422f5a295f6a341c81888a6f0e9675b2f2eb5b430bbad2f8e2e7aa5fa8103ba25b3d49
-AUX rtorrent-0.8.7-canvas-fix.patch 10095 SHA256 a40a88d17e3090d3a7244ae701b049687b3646f8cbecfe40a1456306b6b56fd7 SHA512 4441f64a069bc2980d71410f99115fe10c07d98f28852186079227f66fae7c0aa25672e9c6bd5184fcb66233a6c331b156581e7f5241614839343a9387a76589 WHIRLPOOL cd5e3bd12459a3d4db9beeff323ceaf2f0323c86689f079177019f9f39c8a714d73f9f1513cf76b1e9f39910f8dd32458e942bf55d7b733247f29eb152972f7d
-AUX rtorrent-0.8.9-canvas-fix.patch 9995 SHA256 f53eca85da4800f123f1f482dd49e07d40fcc4055e84f9450f3894cc51259415 SHA512 40d93ff3bc80268ddbda9355b2c1b6aa0234991c8cfc8613c5711e16c5de4ae83e681c3e9b0b4f902daa6ab198dd5b8f96ca7f71dbabdf1a3b0d8761e747f714 WHIRLPOOL ee300ce00dbcb93238bd958089774910d21dde0485b9af997b133198f2af4fe007f279076e45c635545027637ff5590cfd48f8a99f95e4bfd8278acff7079924
-AUX rtorrent-0.8.9-ncurses.patch 618 SHA256 67002221b79bb5e43e8ed05ae0ebb22130c10eaf5739acbb1fb424050f2e2a05 SHA512 cc71e44cf748d6548cffc66b7a6d9f0873ef009fd028fe1f885933100eb01da80232443ba01f8968402c63c17b224f8ce8dc3cb6ad749bb4f0f7f932b8539c5c WHIRLPOOL 3ffee3947bd3c81b35b96a4063bbbab79138da1752943e7a26d3bb4d53d8cc16c332c7df33ed1714700a45c51a01474df090c2dedbf64a559c22fc2be99bb301
-AUX rtorrent-0.9.0-ncurses.patch 416 SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 WHIRLPOOL 211bff140ee9094fde6b9f21a0a853c26d79f79a9727203ee7d96b010795620d5d7eb01d683cfceee0a31c5d0c0701a85054b259f7c21c35ebac0ccd9de4fe53
AUX rtorrent-0.9.1-ncurses.patch 416 SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 WHIRLPOOL 211bff140ee9094fde6b9f21a0a853c26d79f79a9727203ee7d96b010795620d5d7eb01d683cfceee0a31c5d0c0701a85054b259f7c21c35ebac0ccd9de4fe53
-AUX rtorrent-0.9.2-no_private_torrents.patch 4313 SHA256 3f56faff635b872c0368004131a84a04bb1add6af4df4f580579522c7db80918 SHA512 ca0e7523a080e0e16003670c040b2af55dad1ece11aae718873eebeabdaac66b0c70a39eacc39eaf26ff0cf56e16534651bf9bffe1394945e71e8b02c5e65732 WHIRLPOOL dee2df0cbc2584e3f318447c0e9aa45c18b4d32c9d2ef74f7bb196dbb9b739af1c83bc89fce897e9a2da8291d1e6f39a5c12c9dbb6c6b823c365e1d4eb4c9c1c
+AUX rtorrent-0.9.4-tinfo.patch 1137 SHA256 8c12b5715baec6afc362fa82743b3660ce1ab92edd1bc47048e4af3478f63318 SHA512 5f571daa1bdaa8823bbbf52c66df3ff88be487e3fdaa8ea4f45c26b13336995a4a81a712766a8181bc85746e458652bb11c4dcc28d76da3137025e52e614c179 WHIRLPOOL d44ec1195fb41e43683313083d1f90276f080515cb2e0be68d132a2c1874326b5db23e8dbc0c5063f5a19ecafbb42ea0f09fa551850346e37ab5bf63038bd0a6
+AUX rtorrent.1 18204 SHA256 bac10215777c9a22826f56f6218b21734306e30e179deeab47164a845b01dae9 SHA512 f2d3fb87fd7c321822ce9e61cc334682f9692e3f86b42cb3d7d5826dec53d56e631e20455e0ea1e53448c11386988a6e7a70a91ed2923f90852956ad3fdafcfe WHIRLPOOL 6e98f2ce7660cf00fd8a7fb8d9cfcb2f44867a18d3376c6434aef0cf61703c5939743f7194ee76de3bb7b1dccf5fd8a4461047f96c210c5b13afee58048ee76e
AUX rtorrentd.conf 13 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b SHA512 f241452b812a1837660f9ad52881feacc02825e82ea7ac19acc662b4219dd58997ea908275b8c9ee78ed791babf79c1a91069dc6d5b5fb3c461e3026cdeab73f WHIRLPOOL 11f799ee54cc3f4ae535fca30d4f41748149c6869a2217f7c67e03ffab87792e5d5679d6fcc69697b8ffab60690e7187262e57bc68afea0a3244a24095db2235
-AUX rtorrentd.init 815 SHA256 f05e05330276de79ddb8e37effd3acd6060c10a30d8fb3e6bb1e6768ed942d56 SHA512 71a49feaf80348d27f4854976f1cceab07081c11a332c636399dc42a0d7665b26f3a2d6f5799f09b25b151ec44b8f01dbbae4c9d1a8335496de68047ce16f77c WHIRLPOOL 4cc76dbb45691b7282908cdf445701b62f8f082279981d312b6f47c474d3c2c7122ac19bee05e7d12a5775521e833d137bd0ade5967442810daafa97f37a3175
-DIST rtorrent-0.9.2.tar.gz 591837 SHA256 5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d SHA512 8b170021ca28ebe6c9bfd1405fe38962828a21eb0020460786115ff360ef62d325b745976fb29996a80387e763465f7b3ef0c47ca30b185a5c98a060cc151c38 WHIRLPOOL 757e6752da6b68e8b753d1a2599172fd3d8e14116c18c9906a8eb458799e856d510a578499ef7ed0ad98573825048a3e6ba37f37570b2b5556054fdc02003f55
-EBUILD rtorrent-0.9.2.ebuild 1358 SHA256 8da7cd75cfc206c62c8658f01a136748aa6dd82aaecd609b02d2ad4ba36daa2e SHA512 d1775cf9d6a9561991e34f29bf24911703282104e6b6ddfbcf9574096b4b28fe429508f2aa49a485ecaf2232717c54981a318571bb5c2b6ec7ee2800a66c8c72 WHIRLPOOL ce5eb58c1b82dcc56f349260bd8b616658320724472899c62c9faa3693bb4093178de5be560087630e020cfeca1faab85e81b9d1c4c350b7778b6d958abfa05b
-MISC ChangeLog 27044 SHA256 ecae293628b265b334ae1bbec210a11417327e3f8bf17f9a8704679e554d5816 SHA512 532ef5d537f0615ac8bd923e66eaf54428f25f1dc9c6d4eb10f4d6f3b21d6453a12e2a841315804493fe5a959e682a71c8954a589c02486a85078ac09382e271 WHIRLPOOL 7511dcf9306f772e10827d743120deefd2140c6a57f733793cc80a885739aa5f8b78f311413a819f52b847c938b1941f52458f32db0eb96a0f7ec0bd9361a4ba
+AUX rtorrentd.init 708 SHA256 0f5ff42d517ca7b378379b10af327cbb3fc39c10e1c5ff018c6186a39532bcbd SHA512 09912462b1359023c64024175cbdee5b5188798daa21b213086b68e1c0234279129a28a4c4ac564e058bca7afa2a9404db355feb4c579183a864954a5f390d59 WHIRLPOOL 188c1788e7711d7c171b51a17e458e7ca0abd984852f0a36820c9c59b1f529a0820aea5a14d49249066df448355c449cfb70e4478427b58efcabd9601367e41b
+AUX rtorrentd_at.service 308 SHA256 f3de3506146e3dac6698028378d51a9f62a2fa8957173b250bf607bc6ceb57e8 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615 WHIRLPOOL 8060403740dec4d92c8527c1b5b5d5902fbcdb43f20d2639e3fc644bc7bbd73c890c76d1f85c3bec9ab9e8a7d5fe74e779b8bdaaa3f8a52c234e8ce4de417778
+DIST rtorrent-0.9.4.tar.gz 601913 SHA256 bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84 SHA512 ae243d0336acff50e91e4ed9d306beb4705559775518e6dc122ec18a1530e59e2c531cf54f4b79899a1569ca18d343fce255071b45c41df1357bddfe926692aa WHIRLPOOL 03eb3cff0f7d490ada2199310fd2ba7576de8e20557e532df49be17f84aa2afb9cb8137b2eb317bc0fb4ce8ce035e900c65c32e81dc5d5d215923d91e8c0612a
+EBUILD rtorrent-0.9.4-r1.ebuild 1764 SHA256 08a9da20ce511fc837adfc73561dea7b0b2cb3d946bb1a73273ae4ce35262f4d SHA512 1d8ce9207bdefa2c5b69d6242d2d9e67260e54ef3149317024741adaa717e698b5f15c08d04bcce3919954c46d0ccce17e68fce658e0bb5ed73fbf0ce890b533 WHIRLPOOL c1393e456069591f57ea7214fdadc2dfcac0b205f6c9a392a77f09814bf524637f6485565bdfee997cb355d42379c6ba0018e4c348fde25de74a0651180776a8
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch
deleted file mode 100644
index 1e761b2..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rwud rtorrent-0.8.2/src/rpc/command.h rtorrent-0.8.2-my/src/rpc/command.h
---- rtorrent-0.8.2/src/rpc/command.h 2008-05-07 14:19:10.000000000 +0200
-+++ rtorrent-0.8.2-my/src/rpc/command.h 2008-06-09 02:23:34.000000000 +0200
-@@ -73,10 +73,8 @@
- rt_triple(const T1& a, const T2& b, const T3& c) :
- base_type(a, b), third(c) {}
-
-- template <typename U1, typename U2>
-- rt_triple(const std::pair<U1, U2>& b) : base_type(b), third() {}
-+ rt_triple(const base_type& b) : base_type(b), third() {}
-
-- template <typename U1, typename U2, typename U3>
- rt_triple(const rt_triple& src) :
- base_type(src.first, src.second), third(src.third) {}
- };
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.6-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.8.6-canvas-fix.patch
deleted file mode 100644
index 02b8a18..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.6-canvas-fix.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/command_network.cc ./src/command_network.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/command_network.cc 2009-11-12 09:19:40.000000000 +0100
---- ./src/command_network.cc 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 495,498 ****
---- 495,502 ----
- // Not really network stuff:
- ADD_VARIABLE_BOOL ("handshake_log", false);
- ADD_VARIABLE_STRING("log.tracker", "");
-+ ADD_COMMAND_VALUE_TRI("done_fg_color", rak::make_mem_fun(control->ui(), &ui::Root::set_done_fg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_done_fg_color));
-+ ADD_COMMAND_VALUE_TRI("done_bg_color", rak::make_mem_fun(control->ui(), &ui::Root::set_done_bg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_done_bg_color));
-+ ADD_COMMAND_VALUE_TRI("active_fg_color", rak::make_mem_fun(control->ui(), &ui::Root::set_active_fg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_active_fg_color));
-+ ADD_COMMAND_VALUE_TRI("active_bg_color", rak::make_mem_fun(control->ui(), &ui::Root::set_active_bg_color), rak::make_mem_fun(control->ui(), &ui::Root::get_active_bg_color));
- }
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/canvas.cc ./src/display/canvas.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/canvas.cc 2009-11-12 09:03:47.000000000 +0100
---- ./src/display/canvas.cc 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 92,97 ****
---- 92,101 ----
- m_isInitialized = true;
-
- initscr();
-+ start_color();
-+ use_default_colors();
-+ init_pair(2, -1, -1);
-+ init_pair(1, -1, -1);
- raw();
- noecho();
- nodelay(stdscr, TRUE);
-Only in ./src/display: canvas.cc.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.cc ./src/display/window_download_list.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.cc 2009-11-12 09:03:47.000000000 +0100
---- ./src/display/window_download_list.cc 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 37,42 ****
---- 37,43 ----
- #include "config.h"
-
- #include <rak/algorithm.h>
-+ #include <torrent/rate.h>
-
- #include "core/download.h"
- #include "core/view.h"
-***************
-*** 96,107 ****
- char* position;
- char* last = buffer + m_canvas->width() - 2 + 1;
-
- position = print_download_title(buffer, last, *range.first);
-! m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
- position = print_download_info(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
- position = print_download_status(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
---- 97,126 ----
- char* position;
- char* last = buffer + m_canvas->width() - 2 + 1;
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_title(buffer, last, *range.first);
-! m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-! if( (*range.first)->is_done() ) {
-! if( (*range.first)->download()->up_rate()->rate() != 0 ) {
-! m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 2);
-! } else {
-! m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 2);
-! }
-! } else if( (*range.first)->download()->is_active() ) {
-! if( (*range.first)->download()->down_rate()->rate() != 0 ) {
-! m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 1);
-! } else {
-! m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 1);
-! }
-! }
-! pos++;
-
-+ if( pos >= m_canvas->height() ) break;
-+
- position = print_download_info(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_status(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-***************
-*** 109,112 ****
---- 128,167 ----
- }
- }
-
-+ void
-+ WindowDownloadList::set_done_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, (short)color, bg);
-+ }
-+
-+ void
-+ WindowDownloadList::set_done_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, fg, (short)color);
-+ }
-+
-+ void
-+ WindowDownloadList::set_active_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, (short)color, bg);
-+ }
-+
-+ void
-+ WindowDownloadList::set_active_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, fg, (short)color);
-+ }
-+
- }
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.h ./src/display/window_download_list.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/display/window_download_list.h 2009-11-12 09:03:47.000000000 +0100
---- ./src/display/window_download_list.h 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 59,64 ****
---- 59,68 ----
- virtual void redraw();
-
- void set_view(core::View* l);
-+ void set_done_fg_color(int64_t color);
-+ void set_done_bg_color(int64_t color);
-+ void set_active_fg_color(int64_t color);
-+ void set_active_bg_color(int64_t color);
-
- private:
- core::View* m_view;
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.cc ./src/ui/download_list.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.cc 2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/download_list.cc 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 137,142 ****
---- 137,147 ----
- current_view()->next_focus();
- }
-
-+ display::WindowDownloadList*
-+ DownloadList::current_window_list() {
-+ return dynamic_cast<ElementDownloadList*>(m_uiArray[DISPLAY_DOWNLOAD_LIST])->window();
-+ }
-+
- void
- DownloadList::activate_display(Display displayType) {
- if (!is_active())
-Only in ./src/ui: download_list.cc.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.h ./src/ui/download_list.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/download_list.h 2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/download_list.h 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 101,106 ****
---- 101,107 ----
- void activate_display(Display d);
-
- core::View* current_view();
-+ display::WindowDownloadList* current_window_list();
- void set_current_view(const std::string& name);
-
- void slot_open_uri(SlotOpenUri s) { m_slotOpenUri = s; }
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/element_download_list.h ./src/ui/element_download_list.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/element_download_list.h 2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/element_download_list.h 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 60,65 ****
---- 60,66 ----
- void disable();
-
- core::View* view() { return m_view; }
-+ WDownloadList* window() { return m_window; }
- void set_view(core::View* l);
-
- void receive_command(const char* cmd);
-Only in ./src/ui: element_download_list.h.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.cc ./src/ui/root.cc
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.cc 2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/root.cc 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 44,49 ****
---- 44,50 ----
-
- #include "core/manager.h"
- #include "display/frame.h"
-+ #include "display/window_download_list.h"
- #include "display/window_http_queue.h"
- #include "display/window_title.h"
- #include "display/window_input.h"
-***************
-*** 65,71 ****
- m_windowTitle(NULL),
- m_windowHttpQueue(NULL),
- m_windowInput(NULL),
-! m_windowStatusbar(NULL) {
- }
-
- void
---- 66,76 ----
- m_windowTitle(NULL),
- m_windowHttpQueue(NULL),
- m_windowInput(NULL),
-! m_windowStatusbar(NULL),
-! done_fg_color(-1),
-! done_bg_color(-1),
-! active_fg_color(-1),
-! active_bg_color(-1) {
- }
-
- void
-***************
-*** 97,102 ****
---- 102,111 ----
- setup_keys();
-
- m_downloadList->activate(rootFrame->frame(1));
-+ m_downloadList->current_window_list()->set_done_fg_color(done_fg_color);
-+ m_downloadList->current_window_list()->set_done_bg_color(done_bg_color);
-+ m_downloadList->current_window_list()->set_active_fg_color(active_fg_color);
-+ m_downloadList->current_window_list()->set_active_bg_color(active_bg_color);
- }
-
- void
-***************
-*** 219,224 ****
---- 228,273 ----
- torrent::set_max_unchoked(maxUnchoked);
- }
-
-+ int
-+ Root::get_done_fg_color() {
-+ return done_fg_color;
-+ }
-+
-+ void
-+ Root::set_done_fg_color(int64_t color) {
-+ done_fg_color = color;
-+ }
-+
-+ int
-+ Root::get_done_bg_color() {
-+ return done_bg_color;
-+ }
-+
-+ void
-+ Root::set_done_bg_color(int64_t color) {
-+ done_bg_color = color;
-+ }
-+
-+ int
-+ Root::get_active_fg_color() {
-+ return active_fg_color;
-+ }
-+
-+ void
-+ Root::set_active_fg_color(int64_t color) {
-+ active_fg_color = color;
-+ }
-+
-+ int
-+ Root::get_active_bg_color() {
-+ return active_bg_color;
-+ }
-+
-+ void
-+ Root::set_active_bg_color(int64_t color) {
-+ active_bg_color = color;
-+ }
-+
- void
- Root::adjust_down_throttle(int throttle) {
- set_down_throttle(std::max<int>(torrent::down_throttle_global()->max_rate() / 1024 + throttle, 0));
-Only in ./src/ui: root.cc.orig
-diff -crB /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.h ./src/ui/root.h
-*** /home/regj/misc/rtorrent-color-orig/src/rtorrent-0.8.6/src/ui/root.h 2009-11-12 09:03:48.000000000 +0100
---- ./src/ui/root.h 2009-12-17 19:27:05.783955715 +0100
-***************
-*** 82,87 ****
---- 82,95 ----
- // Rename to raw or something, make base function.
- void set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); }
- void set_up_throttle_i64(int64_t throttle) { set_up_throttle(throttle >> 10); }
-+ int get_done_fg_color();
-+ void set_done_fg_color(int64_t color);
-+ int get_done_bg_color();
-+ void set_done_bg_color(int64_t color);
-+ int get_active_fg_color();
-+ void set_active_fg_color(int64_t color);
-+ int get_active_bg_color();
-+ void set_active_bg_color(int64_t color);
-
- void adjust_down_throttle(int throttle);
- void adjust_up_throttle(int throttle);
-***************
-*** 105,110 ****
---- 113,122 ----
- WStatusbar* m_windowStatusbar;
-
- input::Bindings m_bindings;
-+ int64_t done_fg_color;
-+ int64_t done_bg_color;
-+ int64_t active_fg_color;
-+ int64_t active_bg_color;
- };
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch
deleted file mode 100644
index 0dabca3..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.6-ncurses.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-rtorrent segfaults with latest ncurses (5.8).
-this patch fixes the issue.
-
-https://bugs.gentoo.org/show_bug.cgi?id=358271
-https://bugzilla.redhat.com/show_bug.cgi?id=682454
-http://libtorrent.rakshasa.no/ticket/2518
---- src/display/canvas.h
-+++ src/display/canvas.h
-@@ -48,7 +48,7 @@ class Canvas {
- public:
- typedef std::vector<Attributes> attributes_list;
-
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
- m_window(newwin(height, width, y, x)) {}
- ~Canvas() { delwin(m_window); }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch
deleted file mode 100644
index 9fa32a4..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-Index: rtorrent/src/display/window_download_list.h
-===================================================================
---- rtorrent/src/display/window_download_list.h (revision 1163)
-+++ rtorrent/src/display/window_download_list.h (working copy)
-@@ -59,6 +59,10 @@
- virtual void redraw();
-
- void set_view(core::View* l);
-+ void set_done_fg_color(int64_t color);
-+ void set_done_bg_color(int64_t color);
-+ void set_active_fg_color(int64_t color);
-+ void set_active_bg_color(int64_t color);
-
- private:
- core::View* m_view;
-Index: rtorrent/src/display/canvas.cc
-===================================================================
---- rtorrent/src/display/canvas.cc (revision 1163)
-+++ rtorrent/src/display/canvas.cc (working copy)
-@@ -92,6 +92,10 @@
- m_isInitialized = true;
-
- initscr();
-+ start_color();
-+ use_default_colors();
-+ init_pair(2, -1, -1);
-+ init_pair(1, -1, -1);
- raw();
- noecho();
- nodelay(stdscr, TRUE);
-Index: rtorrent/src/display/window_download_list.cc
-===================================================================
---- rtorrent/src/display/window_download_list.cc (revision 1163)
-+++ rtorrent/src/display/window_download_list.cc (working copy)
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <rak/algorithm.h>
-+#include <torrent/rate.h>
-
- #include "core/download.h"
- #include "core/view.h"
-@@ -96,12 +97,30 @@
- char* position;
- char* last = buffer + m_canvas->width() - 2 + 1;
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_title(buffer, last, *range.first);
-- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+ m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+ if( (*range.first)->is_done() ) {
-+ if( (*range.first)->info()->up_rate()->rate() != 0 ) {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 2);
-+ } else {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 2);
-+ }
-+ } else if( (*range.first)->info()->is_active() ) {
-+ if( (*range.first)->info()->down_rate()->rate() != 0 ) {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 1);
-+ } else {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 1);
-+ }
-+ }
-+ pos++;
-+
-+ if( pos >= m_canvas->height() ) break;
-
- position = print_download_info(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_status(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-@@ -109,4 +128,41 @@
- }
- }
-
-+void
-+WindowDownloadList::set_done_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, (short)color, bg);
- }
-+
-+void
-+WindowDownloadList::set_done_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, fg, (short)color);
-+}
-+
-+void
-+WindowDownloadList::set_active_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, (short)color, bg);
-+}
-+
-+void
-+WindowDownloadList::set_active_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, fg, (short)color);
-+}
-+
-+}
-+
-Index: rtorrent/src/command_network.cc
-===================================================================
---- rtorrent/src/command_network.cc (revision 1163)
-+++ rtorrent/src/command_network.cc (working copy)
-@@ -506,4 +506,15 @@
- CMD2_ANY ("dht.statistics", std::tr1::bind(&core::DhtManager::dht_statistics, control->dht_manager()));
- CMD2_ANY ("dht.throttle.name", std::tr1::bind(&core::DhtManager::throttle_name, control->dht_manager()));
- CMD2_ANY_STRING_V("dht.throttle.name.set", std::tr1::bind(&core::DhtManager::set_throttle_name, control->dht_manager(), std::tr1::placeholders::_2));
-+
-+
-+ CMD2_ANY ("set_done_fg_color", std::tr1::bind(&ui::Root::get_done_fg_color, control->ui()));
-+ CMD2_ANY_VALUE_V ("done_fg_color", std::tr1::bind(&ui::Root::set_done_fg_color, control->ui(), std::tr1::placeholders::_2));
-+ CMD2_ANY ("set_done_bg_color", std::tr1::bind(&ui::Root::get_done_bg_color, control->ui()));
-+ CMD2_ANY_VALUE_V ("done_bg_color", std::tr1::bind(&ui::Root::set_done_bg_color, control->ui(), std::tr1::placeholders::_2));
-+ CMD2_ANY ("set_active_fg_color", std::tr1::bind(&ui::Root::get_active_fg_color, control->ui()));
-+ CMD2_ANY_VALUE_V ("active_fg_color", std::tr1::bind(&ui::Root::set_active_fg_color, control->ui(), std::tr1::placeholders::_2));
-+ CMD2_ANY ("set_active_bg_color", std::tr1::bind(&ui::Root::get_active_bg_color, control->ui()));
-+ CMD2_ANY_VALUE_V ("active_bg_color", std::tr1::bind(&ui::Root::set_active_bg_color, control->ui(), std::tr1::placeholders::_2));
-+
- }
-Index: rtorrent/src/ui/download_list.cc
-===================================================================
---- rtorrent/src/ui/download_list.cc (revision 1163)
-+++ rtorrent/src/ui/download_list.cc (working copy)
-@@ -137,6 +137,11 @@
- current_view()->next_focus();
- }
-
-+display::WindowDownloadList*
-+DownloadList::current_window_list() {
-+ return dynamic_cast<ElementDownloadList*>(m_uiArray[DISPLAY_DOWNLOAD_LIST])->window();
-+}
-+
- void
- DownloadList::activate_display(Display displayType) {
- if (!is_active())
-Index: rtorrent/src/ui/download_list.h
-===================================================================
---- rtorrent/src/ui/download_list.h (revision 1163)
-+++ rtorrent/src/ui/download_list.h (working copy)
-@@ -101,6 +101,7 @@
- void activate_display(Display d);
-
- core::View* current_view();
-+ display::WindowDownloadList* current_window_list();
- void set_current_view(const std::string& name);
-
- void slot_open_uri(SlotOpenUri s) { m_slotOpenUri = s; }
-Index: rtorrent/src/ui/element_download_list.h
-===================================================================
---- rtorrent/src/ui/element_download_list.h (revision 1163)
-+++ rtorrent/src/ui/element_download_list.h (working copy)
-@@ -60,6 +60,7 @@
- void disable();
-
- core::View* view() { return m_view; }
-+ WDownloadList* window() { return m_window; }
- void set_view(core::View* l);
-
- void receive_command(const char* cmd);
-Index: rtorrent/src/ui/root.cc
-===================================================================
---- rtorrent/src/ui/root.cc (revision 1163)
-+++ rtorrent/src/ui/root.cc (working copy)
-@@ -44,6 +44,7 @@
-
- #include "core/manager.h"
- #include "display/frame.h"
-+#include "display/window_download_list.h"
- #include "display/window_http_queue.h"
- #include "display/window_title.h"
- #include "display/window_input.h"
-@@ -65,7 +66,11 @@
- m_windowTitle(NULL),
- m_windowHttpQueue(NULL),
- m_windowInput(NULL),
-- m_windowStatusbar(NULL) {
-+ m_windowStatusbar(NULL),
-+ done_fg_color(-1),
-+ done_bg_color(-1),
-+ active_fg_color(-1),
-+ active_bg_color(-1) {
- }
-
- void
-@@ -97,6 +102,10 @@
- setup_keys();
-
- m_downloadList->activate(rootFrame->frame(1));
-+ m_downloadList->current_window_list()->set_done_fg_color(done_fg_color);
-+ m_downloadList->current_window_list()->set_done_bg_color(done_bg_color);
-+ m_downloadList->current_window_list()->set_active_fg_color(active_fg_color);
-+ m_downloadList->current_window_list()->set_active_bg_color(active_bg_color);
- }
-
- void
-@@ -219,7 +228,47 @@
- torrent::set_max_unchoked(maxUnchoked);
- }
-
-+int
-+Root::get_done_fg_color() {
-+ return done_fg_color;
-+}
-+
- void
-+Root::set_done_fg_color(int64_t color) {
-+ done_fg_color = color;
-+}
-+
-+int
-+Root::get_done_bg_color() {
-+ return done_bg_color;
-+}
-+
-+void
-+Root::set_done_bg_color(int64_t color) {
-+ done_bg_color = color;
-+}
-+
-+int
-+Root::get_active_fg_color() {
-+ return active_fg_color;
-+}
-+
-+void
-+Root::set_active_fg_color(int64_t color) {
-+ active_fg_color = color;
-+}
-+
-+int
-+Root::get_active_bg_color() {
-+ return active_bg_color;
-+}
-+
-+void
-+Root::set_active_bg_color(int64_t color) {
-+ active_bg_color = color;
-+}
-+
-+void
- Root::adjust_down_throttle(int throttle) {
- set_down_throttle(std::max<int>(torrent::down_throttle_global()->max_rate() / 1024 + throttle, 0));
- }
-Index: rtorrent/src/ui/root.h
-===================================================================
---- rtorrent/src/ui/root.h (revision 1163)
-+++ rtorrent/src/ui/root.h (working copy)
-@@ -82,7 +82,16 @@
- // Rename to raw or something, make base function.
- void set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); }
- void set_up_throttle_i64(int64_t throttle) { set_up_throttle(throttle >> 10); }
-+ int get_done_fg_color();
-+ void set_done_fg_color(int64_t color);
-+ int get_done_bg_color();
-+ void set_done_bg_color(int64_t color);
-+ int get_active_fg_color();
-+ void set_active_fg_color(int64_t color);
-+ int get_active_bg_color();
-+ void set_active_bg_color(int64_t color);
-
-+
- void adjust_down_throttle(int throttle);
- void adjust_up_throttle(int throttle);
-
-@@ -93,6 +102,11 @@
-
- input::TextInput* current_input();
-
-+ int64_t done_fg_color;
-+ int64_t done_bg_color;
-+ int64_t active_fg_color;
-+ int64_t active_bg_color;
-+
- private:
- void setup_keys();
-
-@@ -105,6 +119,7 @@
- WStatusbar* m_windowStatusbar;
-
- input::Bindings m_bindings;
-+
- };
-
- }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch
deleted file mode 100644
index f95efd7..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-Index: rtorrent/src/display/window_download_list.h
-===================================================================
---- rtorrent/src/display/window_download_list.h (revision 1163)
-+++ rtorrent/src/display/window_download_list.h (working copy)
-@@ -59,6 +59,10 @@
- virtual void redraw();
-
- void set_view(core::View* l);
-+ void set_done_fg_color(int64_t color);
-+ void set_done_bg_color(int64_t color);
-+ void set_active_fg_color(int64_t color);
-+ void set_active_bg_color(int64_t color);
-
- private:
- core::View* m_view;
-Index: rtorrent/src/display/canvas.cc
-===================================================================
---- rtorrent/src/display/canvas.cc (revision 1163)
-+++ rtorrent/src/display/canvas.cc (working copy)
-@@ -92,6 +92,10 @@
- m_isInitialized = true;
-
- initscr();
-+ start_color();
-+ use_default_colors();
-+ init_pair(2, -1, -1);
-+ init_pair(1, -1, -1);
- raw();
- noecho();
- nodelay(stdscr, TRUE);
-Index: rtorrent/src/display/window_download_list.cc
-===================================================================
---- rtorrent/src/display/window_download_list.cc (revision 1163)
-+++ rtorrent/src/display/window_download_list.cc (working copy)
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <rak/algorithm.h>
-+#include <torrent/rate.h>
-
- #include "core/download.h"
- #include "core/view.h"
-@@ -96,12 +97,30 @@
- char* position;
- char* last = buffer + m_canvas->width() - 2 + 1;
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_title(buffer, last, *range.first);
-- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+ m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+ if( (*range.first)->is_done() ) {
-+ if( (*range.first)->info()->up_rate()->rate() != 0 ) {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 2);
-+ } else {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 2);
-+ }
-+ } else if( (*range.first)->info()->is_active() ) {
-+ if( (*range.first)->info()->down_rate()->rate() != 0 ) {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 1);
-+ } else {
-+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 1);
-+ }
-+ }
-+ pos++;
-+
-+ if( pos >= m_canvas->height() ) break;
-
- position = print_download_info(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-+ if( pos >= m_canvas->height() ) break;
- position = print_download_status(buffer, last, *range.first);
- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-
-@@ -109,4 +128,41 @@
- }
- }
-
-+void
-+WindowDownloadList::set_done_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, (short)color, bg);
- }
-+
-+void
-+WindowDownloadList::set_done_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(2, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(2, fg, (short)color);
-+}
-+
-+void
-+WindowDownloadList::set_active_fg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, (short)color, bg);
-+}
-+
-+void
-+WindowDownloadList::set_active_bg_color(int64_t color) {
-+ short fg, bg;
-+ pair_content(1, &fg, &bg);
-+ if( color < 0 ) color = -1;
-+ color = color % 8;
-+ init_pair(1, fg, (short)color);
-+}
-+
-+}
-+
-Index: rtorrent/src/command_network.cc
-===================================================================
---- rtorrent/src/command_network.cc (revision 1163)
-+++ rtorrent/src/command_network.cc (working copy)
-@@ -742,4 +742,13 @@
- CMD2_ANY ("dht.statistics", std::bind(&core::DhtManager::dht_statistics, control->dht_manager()));
- CMD2_ANY ("dht.throttle.name", std::bind(&core::DhtManager::throttle_name, control->dht_manager()));
- CMD2_ANY_STRING_V("dht.throttle.name.set", std::bind(&core::DhtManager::set_throttle_name, control->dht_manager(), std::placeholders::_2));
-+
-+ CMD2_ANY ("set_done_fg_color", std::bind(&ui::Root::get_done_fg_color, control->ui()));
-+ CMD2_ANY_VALUE_V("done_fg_color", std::bind(&ui::Root::set_done_fg_color, control->ui(), std::placeholders::_2));
-+ CMD2_ANY ("set_done_bg_color", std::bind(&ui::Root::get_done_bg_color, control->ui()));
-+ CMD2_ANY_VALUE_V("done_bg_color", std::bind(&ui::Root::set_done_bg_color, control->ui(), std::placeholders::_2));
-+ CMD2_ANY ("set_active_fg_color", std::bind(&ui::Root::get_active_fg_color, control->ui()));
-+ CMD2_ANY_VALUE_V("active_fg_color", std::bind(&ui::Root::set_active_fg_color, control->ui(), std::placeholders::_2));
-+ CMD2_ANY ("set_active_bg_color", std::bind(&ui::Root::get_active_bg_color, control->ui()));
-+ CMD2_ANY_VALUE_V("active_bg_color", std::bind(&ui::Root::set_active_bg_color, control->ui(), std::placeholders::_2));
- }
-Index: rtorrent/src/ui/download_list.cc
-===================================================================
---- rtorrent/src/ui/download_list.cc (revision 1163)
-+++ rtorrent/src/ui/download_list.cc (working copy)
-@@ -137,6 +137,11 @@
- current_view()->next_focus();
- }
-
-+display::WindowDownloadList*
-+DownloadList::current_window_list() {
-+ return dynamic_cast<ElementDownloadList*>(m_uiArray[DISPLAY_DOWNLOAD_LIST])->window();
-+}
-+
- void
- DownloadList::activate_display(Display displayType) {
- if (!is_active())
-Index: rtorrent/src/ui/download_list.h
-===================================================================
---- rtorrent/src/ui/download_list.h (revision 1163)
-+++ rtorrent/src/ui/download_list.h (working copy)
-@@ -101,6 +101,7 @@
- void activate_display(Display d);
-
- core::View* current_view();
-+ display::WindowDownloadList* current_window_list();
- void set_current_view(const std::string& name);
-
- void slot_open_uri(SlotOpenUri s) { m_slotOpenUri = s; }
-Index: rtorrent/src/ui/element_download_list.h
-===================================================================
---- rtorrent/src/ui/element_download_list.h (revision 1163)
-+++ rtorrent/src/ui/element_download_list.h (working copy)
-@@ -60,6 +60,7 @@
- void disable();
-
- core::View* view() { return m_view; }
-+ WDownloadList* window() { return m_window; }
- void set_view(core::View* l);
-
- void receive_command(const char* cmd);
-Index: rtorrent/src/ui/root.cc
-===================================================================
---- rtorrent/src/ui/root.cc (revision 1163)
-+++ rtorrent/src/ui/root.cc (working copy)
-@@ -44,6 +44,7 @@
-
- #include "core/manager.h"
- #include "display/frame.h"
-+#include "display/window_download_list.h"
- #include "display/window_http_queue.h"
- #include "display/window_title.h"
- #include "display/window_input.h"
-@@ -65,7 +66,11 @@
- m_windowTitle(NULL),
- m_windowHttpQueue(NULL),
- m_windowInput(NULL),
-- m_windowStatusbar(NULL) {
-+ m_windowStatusbar(NULL),
-+ done_fg_color(-1),
-+ done_bg_color(-1),
-+ active_fg_color(-1),
-+ active_bg_color(-1) {
- }
-
- void
-@@ -97,6 +102,10 @@
- setup_keys();
-
- m_downloadList->activate(rootFrame->frame(1));
-+ m_downloadList->current_window_list()->set_done_fg_color(done_fg_color);
-+ m_downloadList->current_window_list()->set_done_bg_color(done_bg_color);
-+ m_downloadList->current_window_list()->set_active_fg_color(active_fg_color);
-+ m_downloadList->current_window_list()->set_active_bg_color(active_bg_color);
- }
-
- void
-@@ -219,7 +228,47 @@
- torrent::set_max_unchoked(maxUnchoked);
- }
-
-+int
-+Root::get_done_fg_color() {
-+ return done_fg_color;
-+}
-+
- void
-+Root::set_done_fg_color(int64_t color) {
-+ done_fg_color = color;
-+}
-+
-+int
-+Root::get_done_bg_color() {
-+ return done_bg_color;
-+}
-+
-+void
-+Root::set_done_bg_color(int64_t color) {
-+ done_bg_color = color;
-+}
-+
-+int
-+Root::get_active_fg_color() {
-+ return active_fg_color;
-+}
-+
-+void
-+Root::set_active_fg_color(int64_t color) {
-+ active_fg_color = color;
-+}
-+
-+int
-+Root::get_active_bg_color() {
-+ return active_bg_color;
-+}
-+
-+void
-+Root::set_active_bg_color(int64_t color) {
-+ active_bg_color = color;
-+}
-+
-+void
- Root::adjust_down_throttle(int throttle) {
- set_down_throttle(std::max<int>(torrent::down_throttle_global()->max_rate() / 1024 + throttle, 0));
- }
-Index: rtorrent/src/ui/root.h
-===================================================================
---- rtorrent/src/ui/root.h (revision 1163)
-+++ rtorrent/src/ui/root.h (working copy)
-@@ -82,7 +82,16 @@
- // Rename to raw or something, make base function.
- void set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); }
- void set_up_throttle_i64(int64_t throttle) { set_up_throttle(throttle >> 10); }
-+ int get_done_fg_color();
-+ void set_done_fg_color(int64_t color);
-+ int get_done_bg_color();
-+ void set_done_bg_color(int64_t color);
-+ int get_active_fg_color();
-+ void set_active_fg_color(int64_t color);
-+ int get_active_bg_color();
-+ void set_active_bg_color(int64_t color);
-
-+
- void adjust_down_throttle(int throttle);
- void adjust_up_throttle(int throttle);
-
-@@ -93,6 +102,11 @@
-
- input::TextInput* current_input();
-
-+ int64_t done_fg_color;
-+ int64_t done_bg_color;
-+ int64_t active_fg_color;
-+ int64_t active_bg_color;
-+
- private:
- void setup_keys();
-
-@@ -105,6 +119,7 @@
- WStatusbar* m_windowStatusbar;
-
- input::Bindings m_bindings;
-+
- };
-
- }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch
deleted file mode 100644
index 49a008e..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-rtorrent segfaults with latest ncurses (5.8).
-this patch fixes the issue.
-
-https://bugs.gentoo.org/show_bug.cgi?id=358271
-https://bugzilla.redhat.com/show_bug.cgi?id=682454
-http://libtorrent.rakshasa.no/ticket/2518
---- src/display/canvas.h
-+++ src/display/canvas.h
-@@ -48,7 +48,7 @@
- public:
- typedef std::vector<Attributes> attributes_list;
-
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
- ~Canvas() { delwin(m_window); }
-
- void refresh() { wnoutrefresh(m_window); }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch
deleted file mode 100644
index 260cd9a..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/display/canvas.h
-+++ src/display/canvas.h
-@@ -48,5 +48,5 @@ class Canvas {
- public:
- typedef std::vector<Attributes> attributes_list;
-
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
- ~Canvas() { delwin(m_window); }
- void refresh() { wnoutrefresh(m_window); }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.2-no_private_torrents.patch b/net-p2p/rtorrent/files/rtorrent-0.9.2-no_private_torrents.patch
deleted file mode 100644
index 312b514..0000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.2-no_private_torrents.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -uNr rtorrent-0.9.2.orig/src/command_dynamic.cc rtorrent-0.9.2/src/command_dynamic.cc
---- rtorrent-0.9.2.orig/src/command_dynamic.cc 2012-03-20 17:25:05.000000000 +0100
-+++ rtorrent-0.9.2/src/command_dynamic.cc 2012-10-24 13:46:38.683880926 +0200
-@@ -147,8 +147,7 @@
-
- if (!(flags & rpc::object_storage::flag_static))
- cmd_flags |= rpc::CommandMap::flag_modifiable;
-- if (!(flags & rpc::object_storage::flag_private))
-- cmd_flags |= rpc::CommandMap::flag_public_xmlrpc;
-+ cmd_flags |= rpc::CommandMap::flag_public_xmlrpc;
-
- control->object_storage()->insert_str(rawKey, value, flags);
-
-@@ -245,8 +244,7 @@
-
- const std::string& options = itrArgs->as_string();
-
-- if (options.find("private") != std::string::npos)
-- flags &= ~rpc::CommandMap::flag_public_xmlrpc;
-+ flags &= ~rpc::CommandMap::flag_public_xmlrpc;
- if (options.find("const") != std::string::npos)
- flags &= ~rpc::CommandMap::flag_modifiable;
-
-@@ -259,8 +257,6 @@
-
- if (options.find("static") != std::string::npos)
- new_flags |= rpc::object_storage::flag_static;
-- if (options.find("private") != std::string::npos)
-- new_flags |= rpc::object_storage::flag_private;
- if (options.find("const") != std::string::npos)
- new_flags |= rpc::object_storage::flag_constant;
- if (options.find("rlookup") != std::string::npos)
-@@ -277,8 +273,6 @@
-
- if (options.find("static") != std::string::npos)
- new_flags |= rpc::object_storage::flag_static;
-- if (options.find("private") != std::string::npos)
-- new_flags |= rpc::object_storage::flag_private;
- if (options.find("const") != std::string::npos)
- new_flags |= rpc::object_storage::flag_constant;
-
-@@ -312,8 +306,6 @@
-
- if (options.find("static") != std::string::npos)
- new_flags |= rpc::object_storage::flag_static;
-- if (options.find("private") != std::string::npos)
-- new_flags |= rpc::object_storage::flag_private;
- if (options.find("const") != std::string::npos)
- new_flags |= rpc::object_storage::flag_constant;
-
-diff -uNr rtorrent-0.9.2.orig/src/core/dht_manager.cc rtorrent-0.9.2/src/core/dht_manager.cc
---- rtorrent-0.9.2.orig/src/core/dht_manager.cc 2012-03-13 13:10:49.000000000 +0100
-+++ rtorrent-0.9.2/src/core/dht_manager.cc 2012-10-24 13:42:19.813881004 +0200
-@@ -193,7 +193,7 @@
- DownloadList::const_iterator itr, end;
-
- for (itr = control->core()->download_list()->begin(), end = control->core()->download_list()->end(); itr != end; ++itr)
-- if ((*itr)->download()->info()->is_active() && !(*itr)->download()->info()->is_private())
-+ if ((*itr)->download()->info()->is_active())
- break;
-
- if (itr == end) {
-diff -uNr rtorrent-0.9.2.orig/src/core/download_list.cc rtorrent-0.9.2/src/core/download_list.cc
---- rtorrent-0.9.2.orig/src/core/download_list.cc 2012-02-22 08:50:48.000000000 +0100
-+++ rtorrent-0.9.2/src/core/download_list.cc 2012-10-24 13:41:05.693880995 +0200
-@@ -408,8 +408,7 @@
- }
-
- // If the DHT server is set to auto, start it now.
-- if (!download->download()->info()->is_private())
-- control->dht_manager()->auto_start();
-+ control->dht_manager()->auto_start();
-
- // Update the priority to ensure it has the correct
- // seeding/unfinished modifiers.
-diff -uNr rtorrent-0.9.2.orig/src/ui/download.cc rtorrent-0.9.2/src/ui/download.cc
---- rtorrent-0.9.2.orig/src/ui/download.cc 2012-01-19 11:18:01.000000000 +0100
-+++ rtorrent-0.9.2/src/ui/download.cc 2012-10-24 13:43:35.613881287 +0200
-@@ -164,7 +164,7 @@
- element->push_column("Chunks:", te_command("cat=(d.completed_chunks),\" / \",(d.size_chunks),\" * \",(d.chunk_size),\" (\",(d.wanted_chunks),\")\""));
- element->push_column("Priority:", te_command("d.priority="));
- element->push_column("Peer exchange:", te_command("cat=$if=$d.peer_exchange=\\,enabled\\,disabled,\\ ,"
-- "$if=$d.is_pex_active=\\,active\\,$d.is_private=\\,private\\,inactive,"
-+ "$if=$d.is_pex_active=\\,active\\,inactive,"
- "\\ (,$d.size_pex=,/,$d.max_size_pex=,)"));
-
- element->push_column("State changed:", te_command("convert.elapsed_time=$d.state_changed="));
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch
new file mode 100644
index 0000000..21ee708
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch
@@ -0,0 +1,37 @@
+bug 462788
+
+ configure.ac | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 430c15d..50ce687 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,15 +31,21 @@ TORRENT_WITHOUT_STATVFS()
+ TORRENT_WITHOUT_STATFS()
+
+ AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
+-AX_WITH_CURSES()
+-
+-if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
+- AC_MSG_ERROR([requires either NcursesW or Ncurses library])
+-fi
++PKG_CHECK_MODULES([CURSES],[ncursesw],[
++ AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
++ ],
++ [PKG_CHECK_MODULES([CURSES],[ncurses],[
++ AC_DEFINE(HAVE_NCURSES_H, 1)
++ ],
++ [AX_WITH_CURSES()
++ if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
++ AC_MSG_ERROR([requires either NcursesW or Ncurses library])
++ fi])
++ ])
+
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+-LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS"
++LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS"
+
+ PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
+ CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
diff --git a/net-p2p/rtorrent/files/rtorrent.1 b/net-p2p/rtorrent/files/rtorrent.1
new file mode 100644
index 0000000..9ad1208
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent.1
@@ -0,0 +1,560 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <[email protected]>.
+.TH "RTORRENT" "1" "14 May 2009" "BitTorrent client for ncurses" ""
+
+.SH NAME
+rtorrent \- a BitTorrent client for ncurses
+.SH SYNOPSIS
+
+\fBrtorrent\fR [ \fB-h\fR ] [ \fB-n\fR ] [ \fB-o key1=opt1,...\fR ] [ \fB-O key=opt\fR ] [ \fBURL | FILE\fR\fI ...\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBrtorrent\fR is a BitTorrent client for ncurses, using
+the \fBlibtorrent\fR library. The client and library is
+written in C++ with emphasis on speed and efficiency, while delivering
+equivalent features to those found in GUI based clients in an ncurses
+client.
+.PP
+Most of the options below have their own default unit in addition to
+supporting B, K, M and G suffixes.
+.SH "KEYBOARD CONTROL"
+.PP
+.SS "GLOBAL KEYS"
+.TP
+\fB^q\fR
+Initiate shutdown, press again to force the shutdown and
+skip sending the stop signal to trackers.
+.TP
+\fBup | down | left | right arrow keys\fR
+.TP
+\fB^P | ^N | ^B | ^F\fR
+Select entries or change windows. The right arrow key or ^F is often
+used for viewing details about the selected entry, while the left
+arrow key or ^B often returns to the previous screen.
+.TP
+\fBa | s | d\fR
+Increase the upload throttle by 1/5/50 KB.
+.TP
+\fBA | S | D\fR
+Increase the download throttle by 1/5/50 KB.
+.TP
+\fBz | x | c\fR
+Decrease the upload throttle by 1/5/50 KB.
+.TP
+\fBZ | X | C\fR
+Decrease the download throttle by 1/5/50 KB.
+.SS "MAIN VIEW KEYS"
+.TP
+\fB->\fR
+View download.
+.TP
+\fB1 - 7\fR
+Change view.
+.TP
+\fB^S\fR
+Start download.
+.TP
+\fB^D\fR
+Stop an active download, or remove a stopped download.
+.TP
+\fB^K\fR
+Close a torrent and its files.
+.TP
+\fB^E\fR
+Set the 'create/resize queued' flags on all files in a torrent. This
+is necessary if the underlying files in a torrent have been deleted or
+truncated, and thus rtorrent must recreate them.
+.TP
+\fB^R\fR
+Initiate hash check of torrent.
+.TP
+\fB^O\fR
+Change the destination directory of the download. The torrent must be
+closed.
+.TP
+\fB^X\fR
+Call commands or change settings.
+.TP
+\fB^B\fR
+Set download to perform initial seeding. Only use when
+you are the first and only seeder so far for the download.
+.TP
+\fB+ | -\fR
+Change the priority of the download.
+.TP
+\fBbackspace\fR
+Add torrent using a URL or file path. Use
+\fBtab\fR to view directory content and do
+auto-complete.
+.TP
+\fBl\fR
+View log. Exit by pressing the space-bar.
+.TP
+\fBU\fR
+Delete the file the torrent is tied to, and clear the association.
+.TP
+\fBI\fR
+Toggle whether torrent ignores ratio settings.
+.SS "DOWNLOAD VIEW KEYS"
+.TP
+\fB->\fR
+View torrent file list. Use the space-bar to change the file priority
+and \fB*\fR to change the priority of all
+files. Use \fB/\fR to collapse the directories. OUTDATED
+.TP
+\fB1 | 2\fR
+Adjust max uploads.
+.TP
+\fB3 | 4\fR
+Adjust min peers.
+.TP
+\fB5 | 6\fR
+Adjust max peers.
+.TP
+\fBu\fR
+Display transfering blocks.
+.TP
+\fBi\fR
+Display chunk rarity.
+.TP
+\fBo\fR
+Display the tracker list. Cycle the trackers in a group with the
+space-bar.
+.TP
+\fBp\fR
+View peer and torrent information.
+.TP
+\fBt | T\fR
+Initiate tracker request. Use capital T to force the request, ignoring
+the "min interval" set by the tracker.
+.TP
+\fBk\fR
+Disconnect peer.
+.TP
+\fB*\fR
+Choke/Snub peer.
+.SH "OPTIONS"
+.TP
+\fB-b \fIa.b.c.d\fB\fR
+Bind listening socket and outgoing connections to this network
+interface address.
+.TP
+\fB-d \fIdirectory\fB\fR
+Set the default download directory. Defaults to "./".
+.TP
+\fB-h\fR
+Display help and exit.
+.TP
+\fB-i \fIa.b.c.d\fB\fR
+Set the address reported to the tracker.
+.TP
+\fB-n\fR
+Don't load ~/.rtorrent.rc on startup.
+.TP
+\fB-o key1=opt1,...\fR
+.TP
+\fB-O key=opt\fR
+Set any number of options, see the SETTINGS section. The options given
+here override the resource files. Use capital \fB-O\fR
+to allow comma in the option.
+.TP
+\fB-p \fIa-b\fB\fR
+Try to open a listening port in the range \fBa\fR up to
+and including \fBb\fR\&.
+.TP
+\fB-s \fIdirectory\fB\fR
+Session management will be enabled and the torrent files for all open
+downloads will be stored in this directory. Only one instance of
+rtorrent should be used with each session directory, though at the
+moment no locking is done. An empty string will disable the session
+directory.
+.SH "GENERAL SETTINGS"
+.PP
+.TP
+\fBbind = \fIa.b.c.d\fB\fR
+Bind listening socket and outgoing connections to this network
+interface address.
+.TP
+\fBip = \fIa.b.c.d\fB\fR
+.TP
+\fBip = \fIhostname\fB\fR
+Set the address reported to the tracker.
+.TP
+\fBport_range = \fIa-b\fB\fR
+Try to open a listening port in the range \fBa\fR up to
+and including \fBb\fR\&.
+.TP
+\fBport_random = \fIyes | no\fB\fR
+Open the listening port at a random position in the port range.
+.TP
+\fBcheck_hash = \fIyes | no\fB\fR
+Perform hash check on torrents that have finished downloading.
+.TP
+\fBdirectory = \fIdirectory\fB\fR
+Set the default download directory. Defaults to "./".
+.TP
+\fBsession = \fIdirectory\fB\fR
+Session management will be enabled and the torrent files for all open
+downloads will be stored in this directory. Only one instance of
+rtorrent can be used per session directory. An empty string will
+disable the session directory.
+.TP
+\fBhttp_proxy = \fIurl\fB\fR
+Use a http proxy. Use an empty string to disable.
+.TP
+\fBencoding_list = \fIencoding\fB\fR
+Add a preferred filename encoding to the list. The encodings are
+attempted in the order they are inserted, if none match the torrent
+default is used.
+.TP
+\fBencryption = \fIoption\fB,\fI\&...\fB\fR
+Set how rtorrent should deal with encrypted Bittorrent connections. By
+default, encryption is disabled, equivalent to specifying the option
+\fBnone\fR\&. Alternatively, any number of the following
+options may be specified:
+
+\fBallow_incoming\fR (allow incoming encrypted connections),
+\fBtry_outgoing\fR (use encryption for outgoing connections),
+\fBrequire\fR (disable unencrypted handshakes),
+\fBrequire_RC4\fR (also disable plaintext transmission after the
+initial encrypted handshake),
+\fBenable_retry\fR (if the initial outgoing connection fails, retry
+with encryption turned on if it was off or off if it was on),
+\fBprefer_plaintext\fR (choose plaintext when peer offers a choice
+between plaintext transmission and RC4 encryption, otherwise RC4 will be used).
+.TP
+\fBpeer_exchange = \fIyes | no\fB\fR
+Enable/disable peer exchange for torrents that aren't marked private. Disabled by default.
+.TP
+\fBschedule = \fIid\fB,\fIstart\fB,\fIinterval\fB,\fIcommand\fB\fR
+Call \fBcommand\fR every \fBinterval\fR
+seconds, starting from \fBstart\fR\&. An
+\fBinterval\fR of zero calls the task once, while a
+\fBstart\fR of zero calls it immediately. Currently
+\fBcommand\fR is forwarded to the option handler.
+\fBstart\fR and \fBinterval\fR may
+optionally use a time format, \fBdd:hh:mm:ss\fR\&. F.ex to
+start a task every day at \fB18:00\fR, use
+\fB18:00:00,24:00:00\fR\&.
+.TP
+\fBschedule_remove = \fIid\fB\fR
+Delete \fBid\fR from the scheduler.
+.TP
+\fBstart_tied =\fR
+Start torrents that are tied to filenames that have been re-added.
+.TP
+\fBstop_untied =\fR
+.TP
+\fBclose_untied =\fR
+.TP
+\fBremove_untied =\fR
+Stop, close or remove the torrents that are tied to filenames that
+have been deleted. Clear the association with the 'U' key.
+.TP
+\fBclose_low_diskspace = \fIspace\fB\fR
+Close any active torrents on filesystems with less than
+\fBspace\fR diskspace left. Use with
+the \fBschedule\fR option. A default scheduled event
+with id \fBlow_diskspace\fR is set to 500Mb.
+.TP
+\fBload = \fIfile\fB\fR
+.TP
+\fBload_verbose = \fIfile\fB\fR
+.TP
+\fBload_start = \fIfile\fB\fR
+.TP
+\fBload_start_verbose = \fIfile\fB\fR
+Load and possibly start a file, or possibly multiple files by using the
+wild-card "*". This is meant for use with
+\fBschedule\fR, though ensure that the
+\fBstart\fR is non-zero. The loaded file will be tied
+to the filename provided.
+.TP
+\fBimport = \fIfile\fB\fR
+.TP
+\fBtry_import = \fIfile\fB\fR
+Load a resource file. \fBtry_import\fR does not throw
+torrent::input_error exception on bad input.
+.TP
+\fBstop_on_ratio = \fImin_ratio\fB\fR
+.TP
+\fBstop_on_ratio = \fImin_ratio\fB,\fImin_upload\fB\fR
+.TP
+\fBstop_on_ratio = \fImin_ratio\fB,\fImin_upload\fB,\fImax_ratio\fB\fR
+Stop torrents when they reach the given upload ratio
+\fBmin_ratio\fR in percent. If the optional
+\fBmin_upload\fR is given, require a total
+upload amount of this many bytes as well. If the optional
+\fBmax_ratio\fR is given, stop the torrent
+when reaching this ratio regardless of the total upload
+amount. Exclude certain torrent by pressing
+\fBShift+I\fR in the downlist list.
+Use with the \fBschedule\fR option.
+.TP
+\fBon_insert = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_erase = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_open = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_close = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_start = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_stop = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_hash_queued = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_hash_removed = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_hash_done = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_finished = \fIid\fB,\fIcommand\fB\fR
+Call a command on a download when its state changes. Only a subset of
+commands are available.
+.SH "THROTTLE SETTINGS"
+.TP
+\fBupload_rate = \fIKB\fB\fR
+.TP
+\fBdownload_rate = \fIKB\fB\fR
+Set the maximum global uploand and download rates.
+.TP
+\fBmin_peers = \fIvalue\fB\fR
+.TP
+\fBmax_peers = \fIvalue\fB\fR
+Set the minimum and maximum number of peers to allow in each download.
+.TP
+\fBmin_peers_seed = \fIvalue\fB\fR
+.TP
+\fBmax_peers_seed = \fIvalue\fB\fR
+Set the minimum nad maximum number of peers to allow while seeding, or
+-1 (default) to use max_peers.
+.TP
+\fBmax_uploads = \fIvalue\fB\fR
+Set the maximum number of simultaneous uploads per download.
+.TP
+\fBmax_uploads_div = \fIvalue\fB\fR
+.TP
+\fBmax_downloads_div = \fIvalue\fB\fR
+Change the divider used to calculate the max upload and download slots
+to use when the throttle is changed. Disable by
+setting \fB0\fR\&.
+.TP
+\fBmax_uploads_global = \fIvalue\fB\fR
+.TP
+\fBmax_downloads_global = \fIvalue\fB\fR
+Max upload and download slots allowed. Disable by
+setting \fB0\fR\&.
+.TP
+\fBthrottle_up = \fIname\fB, \fIupload_rate\fB\fR
+.TP
+\fBthrottle_down = \fIname\fB, \fIdownload_rate\fB\fR
+Define secondary throttle and/or set the given upload or download rate. Attach to a download with the d.set_throttle_name=name command
+or switch throttles with Ctrl-T. Download must be stopped when changing throttles. Note that secondary throttles only work if the
+global upload/download is throttled. Setting a download to use the \fBNULL\fR throttle makes the download unthrottled
+even when there is a global throttle. Note that this special case bypasses the global throttle entirely, and as such its rate and
+transfer amounts are not included in the global statistics.
+.TP
+\fBthrottle_ip = \fIname\fB, \fIhost\fB\fR
+.TP
+\fBthrottle_ip = \fIname\fB, \fInetwork/prefix\fB\fR
+.TP
+\fBthrottle_ip = \fIname\fB, \fIstart\fB, \fIend\fB\fR
+Use the given secondary throttle for a host, CIDR network or IP range. All peers with a matching IP will use this throttle instead
+of the global throttle or a custom download throttle. The name may be \fBNULL\fR to make these peers unthrottled, with
+the same caveats as explained above.
+.SH "TRACKER RELATED SETTINGS"
+.PP
+Tracker related settings.
+.TP
+\fBenable_trackers = \fIyes\fB\fR
+Set to \fBno\fR to disable all tracker requests. Useful
+for disabling rtorrent with the \fBschedule\fR command.
+.TP
+\fBtracker_dump = \fIfilename\fB\fR
+Dump tracker requests to \fBfilename\fR, disable by
+supplying an empty string. Only torrents loaded while
+\fBtracker_dump\fR contains a non-empty string will be
+logged at the moment, although disabling it will work as expected.
+.TP
+\fBtracker_numwant = \fInumber\fB\fR
+Set the numwant field sent to the tracker, which indicates how many
+peers we want. A negative value disables this feature.
+.TP
+\fBuse_udp_trackers = \fIyes\fB\fR
+Use UDP trackers. Disable if you are behind a firewall, etc, that does
+not allow connections to UDP trackers.
+.TP
+\fBdht = \fIdisabled|off|auto|on\fB\fR
+Support for querying the distributed hash table (DHT) to find peers for trackerless
+torrents or when all trackers are down. Set to \fBdisable\fR to completely
+disable DHT, \fBoff\fR (default) to enable DHT but to not start the
+DHT server, \fBauto\fR to automatically start and stop the DHT server
+as needed or \fBon\fR for permanently keeping the DHT server running.
+When set to automatic, the DHT server will start up when the first non-private torrent
+is started, and will stop 15-30 minutes after the last non-private torrent is
+stopped (or when rTorrent quits). For DHT to work, a session directory must be set (for
+saving the DHT cache).
+.TP
+\fBdht_port = \fInumber\fB\fR
+Set the UDP listen port for DHT. Defaults to 6881.
+.TP
+\fBdht_add_node = \fIhost[:port]\fB\fR
+Not intended for use in the configuration file but as one-time option in the
+client or on the command line to bootstrap an empty DHT node table. Contacts
+the given node and attempts to bootstrap from it if it replies.
+The port is optional, with port 6881 being used by default.
+.TP
+\fBhttp_capath = \fIpath\fB\fR
+.TP
+\fBhttp_cacert = \fIfilename\fB\fR
+Set the certificates to use in http requests. See Curl's
+CURLOPT_CAPATH and CURLOPT_CAINFO options for further information.
+.SH "USER-INTERFACE SETTINGS"
+.PP
+Display related settings.
+.TP
+\fBview_add = \fIname\fB\fR
+Create a new view.
+.TP
+\fBview_sort = \fIname\fB\fR
+.TP
+\fBview_sort = \fIname\fB,\fIseconds\fB\fR
+Sort a view according the the criteria set by
+\fBview_sort_current\fR\&. If the optional argument is
+supplied, the view is not sorted if a change happened during the last
+\fBseconds\fR\&. This command is meant to be used with
+\fBschedule\fR\&.
+.TP
+\fBview_sort_new = \fIname\fB,\fI\&...\fB\fR
+.TP
+\fBview_sort_current = \fIname\fB,\fI\&...\fB\fR
+Set the sorting criteria for when new elements inserted or
+\fBview_sort\fR is called. The list can contain any
+number of criteria, including zero, from the following:
+
+\fBname\fR, \fBname_reverse\fR,
+\fBstopped\fR, \fBstarted\fR,
+\fBcomplete\fR, \fBincomplete\fR,
+\fBstate_changed\fR,
+\fBstate_changed_reverse\fR
+.TP
+\fBkey_layout = \fIqwerty|azerty|qwertz|dvorak\fB\fR
+Change the key-bindings.
+.SH "FILE-SYSTEM SETTINGS"
+.PP
+File-system related settings.
+.TP
+\fBmax_file_size = \fIsize\fB\fR
+Set the maximum size a file can have. Disable by
+passing \fB-1\fR\&.
+.TP
+\fBsplit_file_size = \fIsize\fB\fR
+Split files in a torrent larger than \fBsize\fR into
+seperate files. Disable by passing \fB-1\fR\&.
+.TP
+\fBsplit_suffix = \fIstring\fB\fR
+Set the suffix used on split files. Defaults
+to \fB\&.part\fR\&.
+.SH "DOWNLOAD SETTINGS"
+.PP
+Settings that require a download as a target, the options need to be
+called through f.ex \fBon_finished\fR\&.
+.TP
+\fBcreate_link = \fItype\fB,\fIpath\fB,\fIsuffix\fB\fR
+.TP
+\fBdelete_link = \fItype\fB,\fIpath\fB,\fIsuffix\fB\fR
+Create or delete a symbolic link. The link path is the concatenation
+of \fBpath\fR, the result of
+the \fBtype\fR on the download,
+and \fBsuffix\fR\&.
+
+Available types are; \fBbase_path\fR uses the base path
+of the download, \fBbase_filename\fR uses the base
+filename of the download, \fBtied\fR uses the path of
+the file the download is tied to, see \fBstart_tied\fR\&.
+.SH "ADVANCED SETTINGS"
+.PP
+This list contains settings users shouldn't need to touch, some may
+even cause crashes or similar if incorrectly set.
+.TP
+\fBhash_read_ahead = \fIMB\fB\fR
+Configure how far ahead we ask the kernel to read when doing hash
+checking. The hash checker uses madvise(..., MADV_WILLNEED) for the
+requests.
+.TP
+\fBhash_interval = \fIms\fB\fR
+Interval between attempts to check the hash when the chunk is not in
+memory, in milliseconds.
+.TP
+\fBhash_max_tries = \fItries\fB\fR
+Number of attempts to check the hash while using the mincore status,
+before forcing. Overworked systems might need lower values to get a
+decent hash checking rate.
+.TP
+\fBsafe_sync = \fIyes|no\fB\fR
+Always use MS_SYNC rather than MS_ASYNC when syncing chunks. This may
+be nessesary in case of filesystem bugs like NFS in linux ~2.6.13.
+.TP
+\fBmax_open_files = \fIvalue\fB\fR
+Number of files to simultaneously keep open. LibTorrent dynamically
+opens and closes files as necessary when mapping files to
+memory. Default is based on sysconf(_SC_OPEN_MAX).
+You probably only think you know what this option does, so don't touch
+it.
+.TP
+\fBmax_open_sockets = \fIvalue\fB\fR
+Number of network sockets to simultaneously keep open. This value is
+set to a reasonable value based on \fBsysconf(_SC_OPEN_MAX)\fR\&.
+.TP
+\fBmax_open_http = \fIvalue\fB\fR
+Number of sockets to simultaneously keep open. This value is set
+to \fB32\fR by default.
+.TP
+\fBmax_memory_usage = \fIbytes\fB\fR
+Set the max amount of memory space used to mapping file chunks. This
+may also be set using \fBulimit -m\fR where 3/4 will be
+allocated to file chunks.
+.TP
+\fBsend_buffer_size = \fIvalue\fB\fR
+.TP
+\fBreceive_buffer_size = \fIvalue\fB\fR
+Adjust the send and receive buffer size for socket.
+.TP
+\fBumask = \fI0022\fB\fR
+Set the umask for this process, which is applied to all files created
+by the program.
+.TP
+\fBcwd = \fIdirectory\fB\fR
+Changes the working directory of the process using
+\fBchdir\fR\&.
+.TP
+\fBsession_on_completion = \fIyes\fB\fR
+Controls if the session torrent is saved when a torrent finishes. By
+default on.
+.TP
+\fBsession_lock = \fIyes\fB\fR
+Controls if a lock file is created in the session directory on startup.
+.TP
+\fBsession_save = \fR
+Save the session files for all downloads.
+.TP
+\fBtos = \fIdefault|lowdelay|throughput|reliability|mincost\fB\fR
+.TP
+\fBtos = \fIhex\fB\fR
+Change the TOS of peer connections, by default set to
+\fBthroughput\fR\&. If the option is set to
+\fBdefault\fR then the system default TOS is used. A
+hex value may be used for non-standard settings.
+.TP
+\fBhandshake_log = \fIyes\fB\fR
+Enable logging of the peer handshake. This generates a large number of
+log messages, but may be useful to debug connection problems.
+.SH "AUTHORS"
+.PP
+
+Jari "Rakshasa" Sundell <[email protected]>
diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
index bd1fc05..8f4db96 100644
--- a/net-p2p/rtorrent/files/rtorrentd.init
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -1,33 +1,33 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.8 2011/11/07 15:46:30 darkside Exp $
+# $Id$
depend() {
use net ypbind nis
after slapd mysqld postgresql
}
start() {
PWHOME="$(getent passwd $USER | awk -F: '{ print $6 }')"
ebegin "Starting rtorrent"
env TERM="xterm" \
start-stop-daemon \
--start \
--make-pidfile \
--pidfile /var/run/rtorrentd.pid \
--background \
--user $USER \
--env HOME="${PWHOME:-/home/$USER}" \
--name rtorrent \
--exec /usr/bin/screen -- -D -m -S rtorrentd /usr/bin/rtorrent
eend $?
}
stop() {
ebegin "Stopping rtorrent"
start-stop-daemon --stop --signal 15 \
--pidfile /var/run/rtorrentd.pid
eend $?
}
diff --git a/net-p2p/rtorrent/files/rtorrentd_at.service b/net-p2p/rtorrent/files/rtorrentd_at.service
new file mode 100644
index 0000000..991ba93
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrentd_at.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=rTorrent
+Requires=network.target local-fs.target
+
+[Service]
+Type=forking
+RemainAfterExit=yes
+KillMode=none
+User=%I
+ExecStart=/usr/bin/screen -d -m -S rtorrentd /usr/bin/rtorrent
+ExecStop=/usr/bin/screen -S rtorrentd -X quit
+WorkingDirectory=/home/%I/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/rtorrent/rtorrent-0.9.2.ebuild b/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild
similarity index 51%
rename from net-p2p/rtorrent/rtorrent-0.9.2.ebuild
rename to net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild
index 44c3057..ebe4997 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.2.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.4-r1.ebuild
@@ -1,53 +1,68 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=4
+EAPI=5
-inherit eutils
+inherit autotools eutils systemd
DESCRIPTION="BitTorrent Client using libtorrent"
HOMEPAGE="http://libtorrent.rakshasa.no/"
SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="daemon debug ipv6 test xmlrpc"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="daemon debug ipv6 selinux test xmlrpc"
COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
>=dev-libs/libsigc++-2.2.2:2
>=net-misc/curl-7.19.1
- sys-libs/ncurses
+ sys-libs/ncurses:5=
xmlrpc? ( dev-libs/xmlrpc-c )"
RDEPEND="${COMMON_DEPEND}
- daemon? ( app-misc/screen )"
+ daemon? ( app-misc/screen )
+ selinux? ( sec-policy/selinux-rtorrent )
+"
DEPEND="${COMMON_DEPEND}
- test? ( dev-util/cppunit )
+ dev-util/cppunit
virtual/pkgconfig"
DOCS=( doc/rtorrent.rc )
src_prepare() {
# bug #358271
- epatch "${FILESDIR}"/${PN}-0.9.1-ncurses.patch
- epatch "${FILESDIR}"/${PN}-0.9.2-no_private_torrents.patch
+ epatch \
+ "${FILESDIR}"/${PN}-0.9.1-ncurses.patch \
+ "${FILESDIR}"/${P}-tinfo.patch
+
+ # upstream forgot to include
+ cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
+
+ eautoreconf
}
src_configure() {
# configure needs bash or script bombs out on some null shift, bug #291229
CONFIG_SHELL=${BASH} econf \
--disable-dependency-tracking \
$(use_enable debug) \
$(use_enable ipv6) \
$(use_with xmlrpc xmlrpc-c)
+
+ # libtool "optimizes" away curl's dependencies
+ sed -i \
+ -e '/^LIBS/s@-lcurl@-lcurl -lidn -lssl@' \
+ -e '/^LIBS/s@-ltorrent@-ltorrent -lcrypto -lz -ldl@' \
+ src/Makefile
}
src_install() {
default
+ doman doc/rtorrent.1
if use daemon; then
newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
+ systemd_newunit "${FILESDIR}/rtorrentd_at.service" "[email protected]"
fi
}
|
mark-kubacki/ossdl-overlay | 47adccbd48cbe1c1586573aeb4bb195cdccb330b | net-misc/curl-7.44.0: add -ldl and retain the *.la for semi-static builds | diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 05104a3..47537da 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,11 +1,11 @@
AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5
AUX curl-7.34.0-deselect-weak-ciphers.patch 2242 SHA256 059ed102b05d69b8863a5cefaa1406b1528d55cd0f27351b87dc410f4674a87d SHA512 1637bb248385573f91126badc66750573434f71e457b4366d311ef29c885a2f58b95f69445377e8ce6ce173e9558d4cf85641284dc26ea8c17530afbfdee9ec8 WHIRLPOOL 7ab89485f696155d50c18026fab5176a6422c6917e190af5fada4bd546c8e15ce7a1e017c50f2f35181c228679c1dfc23452ee55a819b22626265bbccc9122e4
AUX curl-7.34.0-fix-ipv6-failover.patch 960 SHA256 8907994a7fbae7e652f33a4c6a04a1dbc73cf992d8495e21b79e7dd224191e99 SHA512 be345aaa8d9cc044957c0aadcb1b5348911055227593f9df53bca3e8a6dad16abe73f4b7a1c161c3bb3b2f1196691e14b6e69115ad78aa8c61d71d77aa6b66ed WHIRLPOOL fc6c2d66933e066ea4e0921fc4dd4d2e8a8bf83324976effc7913d8dfeced75263d4980d90bc2e52ce0111c26462fff2cdb464ff7ea45b71fcf9a955e4ed39cd
AUX curl-7.36.0-demote-weak-ciphers.patch 917 SHA256 d1958b32b8c932a921ca46a50d30f5d5fd8585bb1afe22d14ee00b3e265a8dac SHA512 cd30f3df6a71fe76dcd22aa400e0592e5760399480f715721eaa7f5adf565663652f32d15c691c85c85f9177212488a2acb4ade5577a8011a250417f872f4f08 WHIRLPOOL 53b5bdf841a6b546af7282e07bdcfc14db1523fa3daf0f0cf57f179fa3681742a3abdcbda465be8ab708b7d37f470ba7ea4013a07ee2eaf92f871a118bb5c128
AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548baec4d392e2d7bb059a7551b5f65d7 SHA512 49810a5bc4554a694d4c684aaa400d791098d50a14b0d5146c762e83ea25f18408d1e3382e3d26d76b19785c1ac0314c346e74d6bb37a408489d22243fbae9dd WHIRLPOOL b98e37de05cfe75c7be84712f641a9968528cb7f060462381031d8187e3d47cf183d87481b29ac63df8f22afd18d7ed49c89079e842acdd7c199350aaf70e8fe
AUX curl-7.38.0-openssl-detect-rsa-dsa-dh.patch 1871 SHA256 3c8ac887bb3e233b5cf00dc7bf16d4fa84374823b7c96d1b68f75f6a1ff7e46b SHA512 ad274e4c9b905112d11686a039cb7d59199ce44f231bc5a0f02bc943976e5da5f11766ee9b580e3c206d617145f3106594ec702b04ed303531636e9120bc93fc WHIRLPOOL 9b4c5ae590aa7d73264cb07c7ab37324b88895609e4e10f17e33560080d50ec4e53b981e06e53ebfc5cb2164b0c6d246bceef872d8eba74a175a09403f4271d7
AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
AUX pre/7.37.1-compile-with-latest-nghttp2.patch 6317 SHA256 c4a9daf32fa2c79cd251da0281ea786271657aea23e81a97e3af1288fac12db5 SHA512 3bbe23b9335b9b8f0a262c75794c4e237e95d4d73e369d25fa4dd1d355a1cc37b83288aeb04ffd76500b14b6ab2f521204fffc77b958a85e5563a97e45549ece WHIRLPOOL 977514736d973002714fc970fcf35ff6e3c9807aea4d53fa243ccc55fb1430170803e64de26edd077fb774979f375b12088ef4daf8e9855a366dcab578929e20
DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd
-EBUILD curl-7.44.0.ebuild 7311 SHA256 8f9de7727eadf4cf93ecc18a5dcb8f134b98b62bd700c44bf6c84aa17c97e592 SHA512 bdb24b44a2f5d7ad356832d02d1de4faec02ddc48f4865cb3df3fdb829fcec50fd2ff6ed3c5fdb58e9ee4901b8bc2499028b236930ae2a78c299faa268cb8683 WHIRLPOOL 3125c5307b454b109ee35a6400f90c5e41ad48d82c911903fd40c565caa216d3af3ccd4930f6cefcef87bc03949559894b06b7f40fb6d50318b618fa93b1f6fc
+EBUILD curl-7.44.0.ebuild 7366 SHA256 98dbe2036761da1fb7331619c242f8cca4165ee5c180c89250c57103498aaa77 SHA512 a175f017c9fb333ec8e4ed7751d1d718e6f071ac5cd25bef240dd98267543ec8b8b57c1f15ba0dbc0fcc427cab31127f8d9beb57993561d54dc3007d2594d879 WHIRLPOOL 6749a4a40805b49a77b05a00ce9efb4a890b23e0652c88db9d90c682a00e9226eec3217ed3df471df5b2b25ff243bb8052bf9c9501e3a4d59f1c7a8dba3d1269
diff --git a/net-misc/curl/curl-7.44.0.ebuild b/net-misc/curl/curl-7.44.0.ebuild
index a2ba010..ba7283c 100644
--- a/net-misc/curl/curl-7.44.0.ebuild
+++ b/net-misc/curl/curl-7.44.0.ebuild
@@ -1,234 +1,236 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 2014 W. Mark Kubacki
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
-inherit autotools eutils prefix
+inherit autotools eutils prefix flag-o-matic
DESCRIPTION="A Client that groks URLs"
HOMEPAGE="http://curl.haxx.se/"
SRC_URI="http://curl.haxx.se/download/${P/_*}.tar.bz2"
S="${WORKDIR}/${P/_*}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh samba ssl static-libs test threads"
-IUSE+=" http2"
+IUSE+=" +http2"
IUSE+=" curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
IUSE+=" elibc_Winnt"
IUSE+=" rc4 +des dsa +rsa +diffie-hellman ntlm"
#lead to lots of false negatives, bug #285669
RESTRICT="test"
RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1 )
ssl? (
app-misc/ca-certificates
curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-r1 )
curl_ssl_gnutls? (
|| (
( >=net-libs/gnutls-3.3.0[static-libs?] >=dev-libs/nettle-2.6 )
( =net-libs/gnutls-2.12*[nettle,static-libs?] >=dev-libs/nettle-2.6 )
( =net-libs/gnutls-2.12*[-nettle,static-libs?] >=dev-libs/libgcrypt-1.5.3[static-libs?] )
)
)
curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2:=[static-libs?,rc4(+)?,des(+)?,dsa(+)?,rsa(+)?,diffie-hellman(+)?] )
curl_ssl_nss? ( >=dev-libs/nss-3.15.4 )
curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:= )
)
http2? ( net-libs/nghttp2 )
idn? ( >=net-dns/libidn-1.28[static-libs?] )
adns? ( >=net-dns/c-ares-1.10.0-r1 )
kerberos? ( >=virtual/krb5-0-r1 )
metalink? ( >=media-libs/libmetalink-0.1.1 )
rtmp? ( >=media-video/rtmpdump-2.4_p20131018 )
ssh? ( >=net-libs/libssh2-1.4.3[static-libs?] )
ntlm? ( curl_ssl_openssl? ( dev-libs/openssl[des(+)] ) )
sys-libs/zlib"
# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
# rtmp? (
# media-video/rtmpdump
# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
# )
# ssl providers to be added:
# fbopenssl $(use_with spnego)
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
DEPEND="${RDEPEND}
>=virtual/pkgconfig-0-r1
test? (
sys-apps/diffutils
dev-lang/perl
)"
# c-ares must be disabled for threads
# only one ssl provider can be enabled
REQUIRED_USE="
curl_ssl_winssl? ( elibc_Winnt )
threads? ( !adns )
ntlm? ( des )
ssl? (
^^ (
curl_ssl_axtls
curl_ssl_cyassl
curl_ssl_gnutls
curl_ssl_openssl
curl_ssl_nss
curl_ssl_polarssl
curl_ssl_winssl
)
)"
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
"${FILESDIR}"/${PN}-respect-cflags-3.patch \
"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
sed -i -e "s:${PV/_*}:${PV/_p/.}:" \
include/curl/curlver.h \
src/tool_version.h \
lib/libcurl.plist
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
if use rc4 ; then
epatch "${FILESDIR}"/${PN}-7.36.0-demote-weak-ciphers.patch
else
sed -i \
-e 's/"ALL!EXPORT!EXPORT40!EXPORT56!aNULL!LOW!RC4"/"EECDH+HIGH+TLSv1.2:EECDH+HIGH:EDH+HIGH+TLSv1.2:-AES256:HIGH:-3DES:!aNULL:!eNULL:!RC4"/' \
-e 's/ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH/EECDH+HIGH+TLSv1.2:EECDH+HIGH:EDH+HIGH+TLSv1.2:-AES256:HIGH:-3DES:!aNULL:!eNULL:!RC4/' \
lib/vtls/openssl.h
fi
if ! use ntlm; then
elog "Removing support for NTLM..."
sed -i -e "s:#define USE_NTLM::" \
lib/curl_setup.h
fi
epatch "${FILESDIR}"/${PN}-7.38.0-openssl-detect-rsa-dsa-dh.patch
epatch_user
eprefixify curl-config.in
eautoreconf
}
src_configure() {
einfo "\033[1;32m**************************************************\033[00m"
# We make use of the fact that later flags override earlier ones
# So start with all ssl providers off until proven otherwise
local myconf=()
myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
if use ssl ; then
if use curl_ssl_axtls; then
einfo "SSL provided by axtls"
einfo "NOTE: axtls is meant for embedded systems and"
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-axtls )
fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
if has_version ">=net-libs/gnutls-3.2.15" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
einfo "gnutls compiled with dev-libs/nettle"
myconf+=( --with-gnutls --with-nettle )
else
einfo "gnutls compiled with dev-libs/libgcrypt"
myconf+=( --with-gnutls --without-nettle )
fi
fi
if use curl_ssl_nss; then
einfo "SSL provided by nss"
myconf+=( --with-nss )
fi
if use curl_ssl_polarssl; then
einfo "SSL provided by polarssl"
einfo "NOTE: polarssl is meant for embedded systems and"
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-polarssl )
fi
if use curl_ssl_openssl; then
einfo "SSL provided by openssl"
myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
fi
if use curl_ssl_winssl; then
einfo "SSL provided by Windows"
myconf+=( --with-winssl )
fi
else
einfo "SSL disabled"
fi
einfo "\033[1;32m**************************************************\033[00m"
+ append-ldflags -ldl
+
# These configuration options are organized alphabetically
# within each category. This should make it easier if we
# ever decide to make any of them contingent on USE flags:
# 1) protocols first. To see them all do
# 'grep SUPPORT_PROTOCOLS configure.ac'
# 2) --enable/disable options second.
# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
# 3) --with/without options third.
# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
ECONF_SOURCE="${S}" \
econf \
--enable-dict \
--enable-file \
--enable-ftp \
--enable-gopher \
--enable-http \
--enable-imap \
$(use_enable ldap) \
$(use_enable ldap ldaps) \
--enable-pop3 \
--enable-rt \
--enable-rtsp \
$(use_enable samba smb) \
$(use_with ssh libssh2) \
--enable-smtp \
--enable-telnet \
--enable-tftp \
$(use_enable adns ares) \
--enable-cookies \
--enable-hidden-symbols \
$(use_enable ipv6) \
--enable-largefile \
--enable-manual \
--enable-proxy \
--disable-soname-bump \
--disable-sspi \
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
--without-cyassl \
--without-darwinssl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
--without-krb4 \
$(use_with metalink libmetalink) \
$(use_with http2 nghttp2) \
$(use_with rtmp librtmp) \
--without-spnego \
--without-winidn \
--with-zlib \
"${myconf[@]}"
}
src_install() {
default
- find "${ED}" -name '*.la' -delete
+ use static-libs || find "${ED}" -name '*.la' -delete
rm -rf "${ED}"/etc/
# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
insinto /usr/share/aclocal
doins docs/libcurl/libcurl.m4
}
|
mark-kubacki/ossdl-overlay | 419b35adcf4e493972c59c2e4981cc1e2e4c7be4 | net-misc/curl-7.44.0 | diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ba998d0..05104a3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,12 +1,11 @@
AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5
AUX curl-7.34.0-deselect-weak-ciphers.patch 2242 SHA256 059ed102b05d69b8863a5cefaa1406b1528d55cd0f27351b87dc410f4674a87d SHA512 1637bb248385573f91126badc66750573434f71e457b4366d311ef29c885a2f58b95f69445377e8ce6ce173e9558d4cf85641284dc26ea8c17530afbfdee9ec8 WHIRLPOOL 7ab89485f696155d50c18026fab5176a6422c6917e190af5fada4bd546c8e15ce7a1e017c50f2f35181c228679c1dfc23452ee55a819b22626265bbccc9122e4
AUX curl-7.34.0-fix-ipv6-failover.patch 960 SHA256 8907994a7fbae7e652f33a4c6a04a1dbc73cf992d8495e21b79e7dd224191e99 SHA512 be345aaa8d9cc044957c0aadcb1b5348911055227593f9df53bca3e8a6dad16abe73f4b7a1c161c3bb3b2f1196691e14b6e69115ad78aa8c61d71d77aa6b66ed WHIRLPOOL fc6c2d66933e066ea4e0921fc4dd4d2e8a8bf83324976effc7913d8dfeced75263d4980d90bc2e52ce0111c26462fff2cdb464ff7ea45b71fcf9a955e4ed39cd
-AUX curl-7.35.0-deselect-weak-ciphers.patch 954 SHA256 a0961cc94dc2213ef87f5cbfc62471d797404c05eb1830e5e940b2232d64696f SHA512 9f4eafd3e849ebe3937894c760dfcc4d4cba7527eabf40b58eaa7d197a0a88785db634a7511c49fe17226d9ea4052ac424f6d770f3393845ffa3d21ea3a6f172 WHIRLPOOL 902e8efcf4e3a24edcd850af18f0f332464371b3c3683aceba186709d397e4bc654623de46ed073f482f93c26b8666509782eec5a95038315a8647651c3c4e2e
AUX curl-7.36.0-demote-weak-ciphers.patch 917 SHA256 d1958b32b8c932a921ca46a50d30f5d5fd8585bb1afe22d14ee00b3e265a8dac SHA512 cd30f3df6a71fe76dcd22aa400e0592e5760399480f715721eaa7f5adf565663652f32d15c691c85c85f9177212488a2acb4ade5577a8011a250417f872f4f08 WHIRLPOOL 53b5bdf841a6b546af7282e07bdcfc14db1523fa3daf0f0cf57f179fa3681742a3abdcbda465be8ab708b7d37f470ba7ea4013a07ee2eaf92f871a118bb5c128
AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548baec4d392e2d7bb059a7551b5f65d7 SHA512 49810a5bc4554a694d4c684aaa400d791098d50a14b0d5146c762e83ea25f18408d1e3382e3d26d76b19785c1ac0314c346e74d6bb37a408489d22243fbae9dd WHIRLPOOL b98e37de05cfe75c7be84712f641a9968528cb7f060462381031d8187e3d47cf183d87481b29ac63df8f22afd18d7ed49c89079e842acdd7c199350aaf70e8fe
AUX curl-7.38.0-openssl-detect-rsa-dsa-dh.patch 1871 SHA256 3c8ac887bb3e233b5cf00dc7bf16d4fa84374823b7c96d1b68f75f6a1ff7e46b SHA512 ad274e4c9b905112d11686a039cb7d59199ce44f231bc5a0f02bc943976e5da5f11766ee9b580e3c206d617145f3106594ec702b04ed303531636e9120bc93fc WHIRLPOOL 9b4c5ae590aa7d73264cb07c7ab37324b88895609e4e10f17e33560080d50ec4e53b981e06e53ebfc5cb2164b0c6d246bceef872d8eba74a175a09403f4271d7
AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
AUX pre/7.37.1-compile-with-latest-nghttp2.patch 6317 SHA256 c4a9daf32fa2c79cd251da0281ea786271657aea23e81a97e3af1288fac12db5 SHA512 3bbe23b9335b9b8f0a262c75794c4e237e95d4d73e369d25fa4dd1d355a1cc37b83288aeb04ffd76500b14b6ab2f521204fffc77b958a85e5563a97e45549ece WHIRLPOOL 977514736d973002714fc970fcf35ff6e3c9807aea4d53fa243ccc55fb1430170803e64de26edd077fb774979f375b12088ef4daf8e9855a366dcab578929e20
-DIST curl-7.41.0.tar.bz2 3304508 SHA256 9f8b546bdc5c57d959151acae7ce6610fe929d82b8d0fc5b25a3a2296e5f8bea SHA512 fc4d14a51740d1752c653d2e48c6721b1ba1cc9959d7b9d1f77fd534d4db90d93fd4d0ad05adfdac082593b5886f5d662b7e4541f5f226514c59f643348287ff WHIRLPOOL b12eb86c6b82b77430ee2169d6021c2401d5712a1e998d096f833f79237810d1a4ae4dbc3815dcdbb3ea9217004930c3a600c2550516b73f1f3411c2720a1d3d
-EBUILD curl-7.41.0.ebuild 7245 SHA256 80bde4fbf3132dcd0879f6091b248b1e7d92044838056a6cc73222ae064efa72 SHA512 d59a479957e2579b8fe698c2f3304aa5aae6de89a2279b1c63425475721bb5cb33c62e1d0f0f7ce62960c24db67fa2b23afdb9e9eeb62b4a00008b92cd80aa91 WHIRLPOOL 5004e3aec6226ec0e59ae5cde476546dc5b7fcb376f87cbcdd04e60fa21d971299338de72bd8693a76624f09b0b9b6ff8ccce60aa355255ec09ee54052c570fb
+DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd
+EBUILD curl-7.44.0.ebuild 7311 SHA256 8f9de7727eadf4cf93ecc18a5dcb8f134b98b62bd700c44bf6c84aa17c97e592 SHA512 bdb24b44a2f5d7ad356832d02d1de4faec02ddc48f4865cb3df3fdb829fcec50fd2ff6ed3c5fdb58e9ee4901b8bc2499028b236930ae2a78c299faa268cb8683 WHIRLPOOL 3125c5307b454b109ee35a6400f90c5e41ad48d82c911903fd40c565caa216d3af3ccd4930f6cefcef87bc03949559894b06b7f40fb6d50318b618fa93b1f6fc
diff --git a/net-misc/curl/curl-7.41.0.ebuild b/net-misc/curl/curl-7.44.0.ebuild
similarity index 74%
rename from net-misc/curl/curl-7.41.0.ebuild
rename to net-misc/curl/curl-7.44.0.ebuild
index 10437a0..a2ba010 100644
--- a/net-misc/curl/curl-7.41.0.ebuild
+++ b/net-misc/curl/curl-7.44.0.ebuild
@@ -1,234 +1,234 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 2014 W. Mark Kubacki
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
inherit autotools eutils prefix
DESCRIPTION="A Client that groks URLs"
HOMEPAGE="http://curl.haxx.se/"
SRC_URI="http://curl.haxx.se/download/${P/_*}.tar.bz2"
S="${WORKDIR}/${P/_*}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns +http2 idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
-IUSE="${IUSE} elibc_Winnt"
-IUSE="${IUSE} rc4 +des dsa +rsa +diffie-hellman ntlm"
+IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh samba ssl static-libs test threads"
+IUSE+=" http2"
+IUSE+=" curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+IUSE+=" rc4 +des dsa +rsa +diffie-hellman ntlm"
#lead to lots of false negatives, bug #285669
RESTRICT="test"
-RDEPEND="ldap? ( net-nds/openldap )
+RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1 )
ssl? (
- curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
- curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
+ app-misc/ca-certificates
+ curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-r1 )
curl_ssl_gnutls? (
|| (
- ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
- ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
- ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+ ( >=net-libs/gnutls-3.3.0[static-libs?] >=dev-libs/nettle-2.6 )
+ ( =net-libs/gnutls-2.12*[nettle,static-libs?] >=dev-libs/nettle-2.6 )
+ ( =net-libs/gnutls-2.12*[-nettle,static-libs?] >=dev-libs/libgcrypt-1.5.3[static-libs?] )
)
- app-misc/ca-certificates
)
- curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1:=[static-libs?,rc4(+)?,des(+)?,dsa(+)?,rsa(+)?,diffie-hellman(+)?] )
- curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
- curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates )
+ curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2:=[static-libs?,rc4(+)?,des(+)?,dsa(+)?,rsa(+)?,diffie-hellman(+)?] )
+ curl_ssl_nss? ( >=dev-libs/nss-3.15.4 )
+ curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:= )
)
+ http2? ( net-libs/nghttp2 )
+ idn? ( >=net-dns/libidn-1.28[static-libs?] )
+ adns? ( >=net-dns/c-ares-1.10.0-r1 )
+ kerberos? ( >=virtual/krb5-0-r1 )
+ metalink? ( >=media-libs/libmetalink-0.1.1 )
+ rtmp? ( >=media-video/rtmpdump-2.4_p20131018 )
+ ssh? ( >=net-libs/libssh2-1.4.3[static-libs?] )
ntlm? ( curl_ssl_openssl? ( dev-libs/openssl[des(+)] ) )
- http2? ( >=net-misc/nghttp2-0.6.0:= )
- idn? ( net-dns/libidn[static-libs?] )
- adns? ( net-dns/c-ares )
- kerberos? ( virtual/krb5 )
- metalink? ( >=media-libs/libmetalink-0.1.0 )
- rtmp? ( media-video/rtmpdump )
- ssh? ( net-libs/libssh2[static-libs?] )
sys-libs/zlib"
# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
# rtmp? (
# media-video/rtmpdump
# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
# )
# ssl providers to be added:
# fbopenssl $(use_with spnego)
# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
DEPEND="${RDEPEND}
- virtual/pkgconfig
+ >=virtual/pkgconfig-0-r1
test? (
sys-apps/diffutils
dev-lang/perl
)"
# c-ares must be disabled for threads
# only one ssl provider can be enabled
REQUIRED_USE="
curl_ssl_winssl? ( elibc_Winnt )
threads? ( !adns )
ntlm? ( des )
ssl? (
^^ (
curl_ssl_axtls
curl_ssl_cyassl
curl_ssl_gnutls
curl_ssl_openssl
curl_ssl_nss
curl_ssl_polarssl
curl_ssl_winssl
)
)"
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
"${FILESDIR}"/${PN}-respect-cflags-3.patch \
"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
sed -i -e "s:${PV/_*}:${PV/_p/.}:" \
include/curl/curlver.h \
src/tool_version.h \
lib/libcurl.plist
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
if use rc4 ; then
epatch "${FILESDIR}"/${PN}-7.36.0-demote-weak-ciphers.patch
else
- epatch "${FILESDIR}"/${PN}-7.35.0-deselect-weak-ciphers.patch
+ sed -i \
+ -e 's/"ALL!EXPORT!EXPORT40!EXPORT56!aNULL!LOW!RC4"/"EECDH+HIGH+TLSv1.2:EECDH+HIGH:EDH+HIGH+TLSv1.2:-AES256:HIGH:-3DES:!aNULL:!eNULL:!RC4"/' \
+ -e 's/ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH/EECDH+HIGH+TLSv1.2:EECDH+HIGH:EDH+HIGH+TLSv1.2:-AES256:HIGH:-3DES:!aNULL:!eNULL:!RC4/' \
+ lib/vtls/openssl.h
fi
if ! use ntlm; then
elog "Removing support for NTLM..."
sed -i -e "s:#define USE_NTLM::" \
lib/curl_setup.h
fi
epatch "${FILESDIR}"/${PN}-7.38.0-openssl-detect-rsa-dsa-dh.patch
epatch_user
eprefixify curl-config.in
eautoreconf
}
src_configure() {
einfo "\033[1;32m**************************************************\033[00m"
# We make use of the fact that later flags override earlier ones
# So start with all ssl providers off until proven otherwise
local myconf=()
- myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+ myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
if use ssl ; then
if use curl_ssl_axtls; then
einfo "SSL provided by axtls"
einfo "NOTE: axtls is meant for embedded systems and"
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-axtls )
fi
- if use curl_ssl_cyassl; then
- einfo "SSL provided by cyassl"
- einfo "NOTE: cyassl is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-cyassl )
- fi
if use curl_ssl_gnutls; then
einfo "SSL provided by gnutls"
- if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
+ if has_version ">=net-libs/gnutls-3.2.15" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
einfo "gnutls compiled with dev-libs/nettle"
myconf+=( --with-gnutls --with-nettle )
else
einfo "gnutls compiled with dev-libs/libgcrypt"
myconf+=( --with-gnutls --without-nettle )
fi
fi
if use curl_ssl_nss; then
einfo "SSL provided by nss"
myconf+=( --with-nss )
fi
if use curl_ssl_polarssl; then
einfo "SSL provided by polarssl"
einfo "NOTE: polarssl is meant for embedded systems and"
einfo "may not be the best choice as an ssl provider"
myconf+=( --with-polarssl )
fi
if use curl_ssl_openssl; then
einfo "SSL provided by openssl"
- myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
fi
if use curl_ssl_winssl; then
einfo "SSL provided by Windows"
myconf+=( --with-winssl )
fi
else
einfo "SSL disabled"
fi
einfo "\033[1;32m**************************************************\033[00m"
# These configuration options are organized alphabetically
# within each category. This should make it easier if we
# ever decide to make any of them contingent on USE flags:
# 1) protocols first. To see them all do
# 'grep SUPPORT_PROTOCOLS configure.ac'
# 2) --enable/disable options second.
# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
# 3) --with/without options third.
# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+ ECONF_SOURCE="${S}" \
econf \
--enable-dict \
--enable-file \
--enable-ftp \
--enable-gopher \
--enable-http \
--enable-imap \
$(use_enable ldap) \
$(use_enable ldap ldaps) \
--enable-pop3 \
+ --enable-rt \
--enable-rtsp \
+ $(use_enable samba smb) \
$(use_with ssh libssh2) \
--enable-smtp \
--enable-telnet \
--enable-tftp \
$(use_enable adns ares) \
--enable-cookies \
--enable-hidden-symbols \
$(use_enable ipv6) \
--enable-largefile \
--enable-manual \
--enable-proxy \
--disable-soname-bump \
--disable-sspi \
$(use_enable static-libs static) \
$(use_enable threads threaded-resolver) \
--disable-versioned-symbols \
+ --without-cyassl \
--without-darwinssl \
$(use_with idn libidn) \
$(use_with kerberos gssapi "${EPREFIX}"/usr) \
--without-krb4 \
$(use_with metalink libmetalink) \
$(use_with http2 nghttp2) \
$(use_with rtmp librtmp) \
--without-spnego \
--without-winidn \
- --without-winssl \
--with-zlib \
"${myconf[@]}"
}
src_install() {
default
find "${ED}" -name '*.la' -delete
rm -rf "${ED}"/etc/
# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
insinto /usr/share/aclocal
doins docs/libcurl/libcurl.m4
}
diff --git a/net-misc/curl/files/curl-7.35.0-deselect-weak-ciphers.patch b/net-misc/curl/files/curl-7.35.0-deselect-weak-ciphers.patch
deleted file mode 100644
index 93c7b87..0000000
--- a/net-misc/curl/files/curl-7.35.0-deselect-weak-ciphers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e336ea36631e2be6d81e4a7d23dfef01abde2a31 Mon Sep 17 00:00:00 2001
-From: W-Mark Kubacki <[email protected]>
-Date: Fri, 31 Jan 2014 11:26:21 +0100
-Subject: [PATCH] OpenSSL: deselect weak ciphers by default
-
-Selects only HIGH ciphers, excluding RC4 and 3DES because:
-
-Some OpenSSL versions still consider RC4 and 3DES a strong cipher.
----
- lib/vtls/openssl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
-index 07448b5..1701e68 100644
---- a/lib/vtls/openssl.h
-+++ b/lib/vtls/openssl.h
-@@ -95,7 +95,7 @@ void Curl_ossl_md5sum(unsigned char *tmp, /* input */
- #define curlssl_random(x,y,z) Curl_ossl_random(x,y,z)
- #define curlssl_md5sum(a,b,c,d) Curl_ossl_md5sum(a,b,c,d)
-
--#define DEFAULT_CIPHER_SELECTION "ALL!EXPORT!EXPORT40!EXPORT56!aNULL!LOW!RC4"
-+#define DEFAULT_CIPHER_SELECTION "HIGH!aNULL!eNULL!RC4!3DES"
-
- #endif /* USE_SSLEAY */
- #endif /* HEADER_CURL_SSLUSE_H */
---
-1.8.5.3
-
|
mark-kubacki/ossdl-overlay | 93addbb9aca48cefe87e72fa291dfa1dcd0a38db | net-libs/nghttp2-1.2.1 | diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 758f8e1..e21873e 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,5 +1,2 @@
-AUX 0001-Set-content-type-header-with-charset-for-.html-files.patch 2514 SHA256 39378f8b815ebc4ede87719b67fe8d1dafddc2226cf6194e530b623d94739da8 SHA512 9b05085272b929b71c47d05e0f1c7145676a8c5e247a908b7b60d45fc31c1c4aa22f2bacd9e3527c1e65687cfee6238f0bbce65329f79508cf1030665949171b WHIRLPOOL 1e748d8b5647971dda61428488dd7d0d02fe116cdaee6c2d9117ef530a158bacfdd36e2524a75f51b777a62e3f989322213f745f968159d3015f16fd86006384
-DIST nghttp2-0.6.7.tar.xz 813524 SHA256 6cd748982f03c0039072c6a61c8dd88fe270ec34b826fb4591e5ed93f1a8376c SHA512 c22c25f98ec66cacf28b70f5d9d4b78dcf3d6d1f0037642cbd16f03e61c87e4637c53ca6d126a0817eeca31f2e94f0ea452d76328d5d463ea32769b31d982ebc WHIRLPOOL d23529c16113314fcd33393ea10446399c553e98587dec442ecc0a8802174738af46238f1b91061c45d1473f5e9a36449bdae3184c187b55bb96cd60c4b7929c
-DIST nghttp2-0.7.5.tar.xz 858444 SHA256 b2a05b4481881228db90314e14cb33511037a9e5940e31b826b688f27a6628d1 SHA512 29ad6f70b3c761b586fc2b0ec258c7c08a4c23f14e6203fb0ccae9b4ddcf473c2d08cc37b31f923bcff9a13b3a042e349e03d42e1f2ba56dbeecb584c054e5b5 WHIRLPOOL 6871dd109eda08b92d8139845547346a21b89a898c62d08fd7d89a04871dfe10e5cf60beedd3faee777bcdd77b8d8c51bc30e4c24c3c91f8dcb98ef31f01b851
-EBUILD nghttp2-0.6.7.ebuild 1754 SHA256 a82f849bb8e91d3a23aa9405c0a78e201aab15dbde44beaede6564e4978e7335 SHA512 04868000ad2b577715da08c26a5be63b0c4a7573c96381eaeb60debcd12f4fcc09efa2697d6d838abac391d27e7e0983bcf951040170d9ade0f9cbb9867a87be WHIRLPOOL 9765195467e57004448ccfb574800d160be6f1b538a3b5c10722af077f800ef4cd4129ad242f26b3c9bc213e0a00f2fa17e7924f23a118790f0bd20c384ee151
-EBUILD nghttp2-0.7.5.ebuild 1838 SHA256 299c916d320fc718d5756b4ed67051dec302e836f52e51dafca275bd2e265a20 SHA512 5f9d12d13e9a4d1e0a018ebc6277c6a7db45e421f700299ff2bd95775e83ffe0e348198749e6fd38fc2d4a036456a528fe91784d8f87cdd24a8132f6330dc242 WHIRLPOOL f3fe15eaf82c76f2f3d866ed686fd373f8cfe90151a83fcef417d79e7191f32597778c68756d48ae343333d8e55ca61d677f59eed01704638869d88d3788e856
+DIST nghttp2-1.2.1.tar.xz 934340 SHA256 e41bca1d99eadf004faa49bbc482067398a2550dddd4098211566b5622e9af03 SHA512 6ecbd794516600c115e4043c1d099249d05bab446f557c9a120d4fb3344406f6f35d54d83d573aa19f7325968812c16b6953973d875e7662a13e543063f78483 WHIRLPOOL f6bfb76f35ffd7cb1e3dbf3688a35652fca04347b723accd4c4fc000e2c3c2e138c825aff37f31010690285cf214eece0c68efdf7d5e785abfa0a597f306fcb5
+EBUILD nghttp2-1.2.1.ebuild 2026 SHA256 8e420203fcb5f145174101822baf63bb8cda8ae97fedc49ab6ba774a04058a66 SHA512 83257eb5e64127665a38a64863450687e8dd6660cbd7eb677f6cf3eacbca86facedb40bef1ff476123776e491f4acd78f52b2e80ee4d10cdfcd7af4f4012b82c WHIRLPOOL 12bc3741657afb35d88ae564ee122c5754a1babf91044c273a2e0bd1ab2ade42b972dc779f71836da7ff8f6776551d104ee7547c9d8361922038436c9a350a6e
diff --git a/net-libs/nghttp2/files/0001-Set-content-type-header-with-charset-for-.html-files.patch b/net-libs/nghttp2/files/0001-Set-content-type-header-with-charset-for-.html-files.patch
deleted file mode 100644
index 5a3f41c..0000000
--- a/net-libs/nghttp2/files/0001-Set-content-type-header-with-charset-for-.html-files.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3e4a94a92d604c16102c8d0daee2d17155575050 Mon Sep 17 00:00:00 2001
-From: W-Mark Kubacki <[email protected]>
-Date: Sat, 10 Jan 2015 15:11:39 +0100
-Subject: [PATCH] Set content-type header with charset for .html files.
-
-This enables correct rendering of such files containing UTF-8 runes.
----
- src/HttpServer.cc | 7 ++++++-
- src/HttpServer.h | 1 +
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/HttpServer.cc b/src/HttpServer.cc
-index b9b404d..b5e495c 100644
---- a/src/HttpServer.cc
-+++ b/src/HttpServer.cc
-@@ -673,6 +673,7 @@ int Http2Handler::verify_npn_result() {
- int Http2Handler::submit_file_response(const std::string &status,
- Stream *stream, time_t last_modified,
- off_t file_length,
-+ const std::string path,
- nghttp2_data_provider *data_prd) {
- std::string content_length = util::utos(file_length);
- std::string last_modified_str;
-@@ -683,12 +684,16 @@ int Http2Handler::submit_file_response(const std::string &status,
- http2::make_nv_ll("cache-control", "max-age=3600"),
- http2::make_nv_ls("date", sessions_->get_cached_date()),
- http2::make_nv_ll("", ""),
-+ http2::make_nv_ll("", ""),
- };
- size_t nvlen = 5;
- if (last_modified != 0) {
- last_modified_str = util::http_date(last_modified);
- nva[nvlen++] = http2::make_nv_ls("last-modified", last_modified_str);
- }
-+ if (nghttp2::util::endsWith(path, ".html")) {
-+ nva[nvlen++] = http2::make_nv_ll("content-type", "text/html; charset=UTF-8");
-+ }
- return nghttp2_submit_response(session_, stream->stream_id, nva, nvlen,
- data_prd);
- }
-@@ -999,7 +1004,7 @@ void prepare_response(Stream *stream, Http2Handler *hd,
- }
-
- hd->submit_file_response(STATUS_200, stream, buf.st_mtime, buf.st_size,
-- &data_prd);
-+ path, &data_prd);
- }
- } // namespace
-
-diff --git a/src/HttpServer.h b/src/HttpServer.h
-index 87d3296..8f88e7b 100644
---- a/src/HttpServer.h
-+++ b/src/HttpServer.h
-@@ -104,6 +104,7 @@ public:
-
- int submit_file_response(const std::string &status, Stream *stream,
- time_t last_modified, off_t file_length,
-+ const std::string path,
- nghttp2_data_provider *data_prd);
-
- int submit_response(const std::string &status, int32_t stream_id,
---
-2.0.4
-
diff --git a/net-libs/nghttp2/nghttp2-0.6.7.ebuild b/net-libs/nghttp2/nghttp2-0.6.7.ebuild
deleted file mode 100644
index 9f4239a..0000000
--- a/net-libs/nghttp2/nghttp2-0.6.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2014 W. Mark Kubacki
-# Distributed under the terms of the OSI Reciprocal Public License
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic autotools python-r1
-
-DESCRIPTION="Implementation of Hypertext Transfer Protocol version 2 in C"
-HOMEPAGE="https://nghttp2.org/"
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/tatsuhiro-t/${PN}.git
- git://github.com/tatsuhiro-t/${PN}.git"
- EGIT_MASTER="master"
- inherit git-2
-else
- SRC_URI="https://github.com/tatsuhiro-t/${PN}/releases/download/v${PV}/${P}.tar.xz"
- RESTRICT="primaryuri"
-fi
-
-LICENSE="MIT"
-SLOT="0/16" # as in h2-16
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="+alpn +apps +examples python +spdy test +xml"
-
-REQUIRED_USE="xml? ( apps )
- alpn? ( apps )"
-RDEPEND=">=dev-libs/jansson-2.5
- apps? (
- dev-libs/jemalloc
- >=dev-libs/libevent-2.0.8[ssl]
- xml? ( >=dev-libs/libxml2-2.7.7 )
- >=dev-libs/openssl-1.0.1:=
- alpn? ( >=dev-libs/openssl-1.0.2_alpha:= )
- >=sys-libs/zlib-1.2.3
- )
- spdy? ( net-misc/spdylay:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/cython-0.19
- )"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.20
- test? (
- ${PYTHON_DEPS}
- >=dev-util/cunit-2.1
- )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- else
- default_src_prepare
- fi
-
- replace-flags -O* -Os
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable apps app) $(use_with apps jemalloc) \
- $(use_enable examples) \
- $(use_enable python python-bindings) \
- $(use_with spdy spdylay) \
- $(use_with xml libxml2) $(use !xml && echo --disable-xmltest --without-libxml2)
-}
-
-src_test() {
- # tests can be parallelised, using emake
- emake check || die "test failed"
-}
diff --git a/net-libs/nghttp2/nghttp2-0.7.5.ebuild b/net-libs/nghttp2/nghttp2-1.2.1.ebuild
similarity index 81%
rename from net-libs/nghttp2/nghttp2-0.7.5.ebuild
rename to net-libs/nghttp2/nghttp2-1.2.1.ebuild
index 657488f..9fb164d 100644
--- a/net-libs/nghttp2/nghttp2-0.7.5.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.2.1.ebuild
@@ -1,77 +1,84 @@
# Copyright 2014 W. Mark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="5"
PYTHON_COMPAT=( python2_7 )
inherit eutils flag-o-matic autotools python-r1
DESCRIPTION="Implementation of Hypertext Transfer Protocol version 2 in C"
HOMEPAGE="https://nghttp2.org/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/tatsuhiro-t/${PN}.git
git://github.com/tatsuhiro-t/${PN}.git"
EGIT_MASTER="master"
inherit git-2
else
SRC_URI="https://github.com/tatsuhiro-t/${PN}/releases/download/v${PV}/${P}.tar.xz"
RESTRICT="primaryuri"
fi
LICENSE="MIT"
-SLOT="0/16" # as in h2-16
+SLOT="0/1.14" # <C++>.<C> SONAMEs - no longer the h2-xx version
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="alpn apps examples python spdy test xml"
+IUSE="alpn apps examples hpack-tools python spdy static-libs test xml"
REQUIRED_USE="xml? ( apps )
alpn? ( apps )"
-RDEPEND="
+RDEPEND="!!net-misc/nghttp2
apps? (
dev-libs/jemalloc
dev-libs/libev
xml? ( >=dev-libs/libxml2-2.7.7 )
>=dev-libs/openssl-1.0.1:=
alpn? ( >=dev-libs/openssl-1.0.2_alpha:= )
>=sys-libs/zlib-1.2.3
>=dev-libs/jansson-2.5
)
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
spdy? ( net-misc/spdylay:= )
python? (
${PYTHON_DEPS}
>=dev-python/cython-0.19
)"
DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.20
+ virtual/pkgconfig
test? (
${PYTHON_DEPS}
>=dev-util/cunit-2.1
)"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
else
default_src_prepare
fi
- epatch "${FILESDIR}"/0001-Set-content-type-header-with-charset-for-.html-files.patch
epatch_user
replace-flags -O* -Os
}
src_configure() {
econf \
--disable-dependency-tracking \
+ $(use_enable hpack-tools) \
+ $(use_enable static-libs static) \
$(use_enable apps app) $(use_with apps jemalloc) \
$(use_enable examples) \
$(use_enable python python-bindings) \
$(use_with spdy spdylay) \
$(use_with xml libxml2) $(use !xml && echo --disable-xmltest --without-libxml2)
}
src_test() {
# tests can be parallelised, using emake
emake check || die "test failed"
}
+
+src_install() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+ default_src_install
+}
|
mark-kubacki/ossdl-overlay | 75b2f9072741e65493a8a08d1a86987c52b0cf71 | app-shells/fish-2.2.0 | diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index a7e9361..2162df6 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,6 +1,3 @@
-AUX fish-2.1.0-putty-xterm.patch 1627 SHA256 2db412f96a3a1d59c252b7c1032fb0428cc0ba1b9864ebe9215e4f5025b72ddb SHA512 f1d7e0d56b6a223068e8fd6f3f5ba6409f59a793abefa2ec6d57e41c25070dbf6bd037ab4bf1a9c86f217e048062b799a9aa55dc89616c2b06859c06765b3fcf WHIRLPOOL 00a85722ff9631e5de0ae8964f11c27be77302e2d407f52555a48175c7269f966644f109da5caceac7ac9d57490c07210466b821727f8fd0c44a7fbc9e7c14da
-AUX fish-2.1.0-tinfo.patch 1037 SHA256 eb6c44ec4d5ece0dbe305112504083f011b3999c274fc86786a7bf9c5ee967b4 SHA512 8ec3c9a003f30a4e05685de1492bc3a795dbbdb1cd5ab95769fc3a8f9df478e15f64a12730e71ed4d2485867c0a59268620ef3ef08982d0a481282f9a20d59a8 WHIRLPOOL e594423661107afb10b09acac4026c58ad708eac27ae3781dd4056a8ddc29d7b12fba66709fc0077f5645905907b00a849515e9a0e3c98a035920177363f46ec
-AUX fish-2.1.1-fix-grep-usage.patch 437 SHA256 1c4fcdd129975d92ac4bf75ee4bf04195cb8443e51bccdf6ade93ac8c5400ec5 SHA512 5c677425dd0a885f1342ebb79bb33132a16774325f99dd9dc7a5ad6b3aab1f3ea874e64985a4f60a2eb2d0435b7d16485de37d5f7e1feb126f115bce96fbed7e WHIRLPOOL 5af8085d49542c3130547054b19cd5c90ccfb0a424adf605ba18ab4c96141de51ed8ed1c551649af05a82a5ae63a2ae8f007f91012961dfbd4a1d93539fea555
AUX fish_prompt_mark.fish 2741 SHA256 ce5a49cdf7d08134a4f0e537a84f7474d366860f7c2e2b23acee1dd7a77f2de9 SHA512 9b52ff1654a3c110622616cd23753aa47c5e38e049c9644acaad6b26af7a2e6c39bff2c54fe522c9053853ee2f935546367dddb5a520719d4ee9f701bda68deb WHIRLPOOL c6362ae10322011ead9268a9cc39bcafeae335e2a6dcb0afad3d25aab58ef32c4b5d31de7596a5c12d9e20211fc7f5d56a71cd13a22373ed5fc8939d6d38225c
-DIST fish-2.1.2.tar.gz 1730198 SHA256 c6c20d5ca3a2a0168461de8abfe85f9e6b255132698ea0109998d4ab68f9f6dd SHA512 4f8f0133094d4d2295546a5b96e044646de2266364610368210b0db529b2d865c1b389f01f311b9b6d6d6dcd2a29040b7a9499d491605ae52a765a76d83db2a5 WHIRLPOOL 2a02dd0f91731cfc79de64245c34fc4361f42406d0c0a60afbafa08c2b9265d11c4adadc96ca5eb49b9053db1eb949c297eee23a7cbc63a30f56ce577b650779
-EBUILD fish-2.1.2.ebuild 2515 SHA256 9a03df010067853e13a796b3f8459d54a08ae646d2749fd7cae65ad1c46ace76 SHA512 7bf49b1f1cf961652a217d287ba68e1b8a4ffba47be7b6b4664d4407133d1886cfd244cd424673f6ea345117f7adf3d949a970dab0a0b04e161133d1fb1de6d3 WHIRLPOOL ee844abe0675c37687e2b34e03b52894b7431cda4553d016f81d8801abf504826a5401794d819c21b22ae578c23e6363278c5d4ecd8b5c65852c3661069a3af5
+DIST fish-2.2.0.tar.gz 2213037 SHA256 a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a SHA512 210047f56b105a3d372f03d3a2de41661ed18001e3c8fa053ae4aa43089118d4467837ea022bc44f9877ecc3d0563b365f97920c002faccebaa663c4f079e9e0 WHIRLPOOL 8b25e437e0c942255b5f39686008fb37ec45cea52e04b2d61facf1fdcd59510138dace506eadb17eb0074d175d3c1226d6e52d437e325ed5a90e22e696918d9d
+EBUILD fish-2.2.0.ebuild 2433 SHA256 8c8ad430219dcf545f7ea07ef82be53fe88125fa20a7c47e9c272802e7216c3f SHA512 34656562bb786027a565a0e0f4f624a626b0c7804f59fcc23ff9871437adae78884943d5f308ea1e2bd210e1ab19f128d3cac19ef5270b389da6403aba167fb0 WHIRLPOOL 1e6d9ee66d9f24cb080e0b280094ef685474c783e75364997202132ffeb9ff65abe01aba8948da279e32d68658bfc18760edf3ef97208c82a294c14a59f15c58
diff --git a/app-shells/fish/files/fish-2.1.0-putty-xterm.patch b/app-shells/fish/files/fish-2.1.0-putty-xterm.patch
deleted file mode 100644
index fdebee9..0000000
--- a/app-shells/fish/files/fish-2.1.0-putty-xterm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 14b6d32fe659d11fb3acf18b012b7ff6207ca84a Mon Sep 17 00:00:00 2001
-From: David Adam <[email protected]>
-Date: Wed, 13 Nov 2013 11:20:59 +0800
-Subject: [PATCH] add bindings for PuTTY's I-can't-believe-it's-xterm keyboard
-
-(see #170)
----
- share/functions/fish_default_key_bindings.fish | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
-index b22d769..a46d3f9 100644
---- a/share/functions/fish_default_key_bindings.fish
-+++ b/share/functions/fish_default_key_bindings.fish
-@@ -32,6 +32,12 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
- bind \e\[H beginning-of-line
- bind \e\[F end-of-line
-
-+ # for PuTTY
-+ # https://github.com/fish-shell/fish-shell/issues/180
-+ bind \e\[1~ beginning-of-line
-+ bind \e\[3~ delete-char
-+ bind \e\[4~ end-of-line
-+
- # OS X SnowLeopard doesn't have these keys. Don't show an annoying error message.
- bind -k home beginning-of-line 2> /dev/null
- bind -k end end-of-line 2> /dev/null
-@@ -79,8 +85,8 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
- bind \ef forward-word
- bind \e\[1\;5C forward-word
- bind \e\[1\;5D backward-word
-- bind \e\[1\;9A history-token-search-backward # iTerm2
-- bind \e\[1\;9B history-token-search-forward # iTerm2
-+ bind \e\[1\;9A history-token-search-backward # iTerm2
-+ bind \e\[1\;9B history-token-search-forward # iTerm2
- bind \e\[1\;9C forward-word #iTerm2
- bind \e\[1\;9D backward-word #iTerm2
- bind \ed forward-kill-word
---
-1.9.3
-
diff --git a/app-shells/fish/files/fish-2.1.0-tinfo.patch b/app-shells/fish/files/fish-2.1.0-tinfo.patch
deleted file mode 100644
index ba4cc40..0000000
--- a/app-shells/fish/files/fish-2.1.0-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -480,7 +480,7 @@
- AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
- AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
- AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
--AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] )
-+AC_SEARCH_LIBS( setupterm, [ncurses tinfo curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] )
- AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
- LIBS_SHARED=$LIBS
- LIBS=$LIBS_COMMON
diff --git a/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch b/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch
deleted file mode 100644
index aea1760..0000000
--- a/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/share/functions/grep.fish b/share/functions/grep.fish
-index b0dc958..73f2192 100644
---- a/share/functions/grep.fish
-+++ b/share/functions/grep.fish
-@@ -3,11 +3,8 @@
- #
-
- if command grep --color=auto --help 1>/dev/null 2>/dev/null
-- if not set -q GREP_COLOR
-- set -gx GREP_COLOR '97;45'
-- end
-- if not set -q GREP_OPTIONS
-- set -gx GREP_OPTIONS --color=auto
-+ function grep
-+ command grep --color=auto $argv
- end
- end
-
diff --git a/app-shells/fish/fish-2.1.2.ebuild b/app-shells/fish/fish-2.2.0.ebuild
similarity index 92%
rename from app-shells/fish/fish-2.1.2.ebuild
rename to app-shells/fish/fish-2.2.0.ebuild
index 5ebf79e..323f92a 100644
--- a/app-shells/fish/fish-2.1.2.ebuild
+++ b/app-shells/fish/fish-2.2.0.ebuild
@@ -1,82 +1,81 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-inherit base autotools
+inherit base autotools flag-o-matic
DESCRIPTION="fish is the Friendly Interactive SHell"
HOMEPAGE="http://fishshell.com/"
SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="arm64 amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="X"
DEPEND="sys-libs/ncurses
sys-devel/bc
sys-devel/gettext
X? ( x11-misc/xsel )"
# fish can add man-page completions from lzma and xz compressed man pages
# through a python script. That's why we depend on python here (bug #490478)
RDEPEND="${DEPEND}"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.0-tinfo.patch #459768
- epatch "${FILESDIR}"/${PN}-2.1.0-putty-xterm.patch
- epatch "${FILESDIR}"/${PN}-2.1.1-fix-grep-usage.patch
mv share/functions/fish_prompt.fish share/tools/web_config/sample_prompts/
cp "${FILESDIR}"/fish_prompt_mark.fish share/functions/fish_prompt.fish
eautoreconf
}
src_configure() {
+ append-ldflags -fwhole-program -static-libgcc -static-libstdc++
+
# Set things up for fish to be a default shell.
# It has to be in /bin in case /usr is unavailable.
# Also, all of its utilities have to be in /bin.
econf \
docdir="${EPREFIX}"/usr/share/doc/${PF} \
--bindir="${EPREFIX}"/bin
}
src_test() {
if has_version ~${CATEGORY}/${P} ; then
emake test
else
ewarn "The test suite only works when the package is already installed"
fi
}
pkg_postinst() {
elog "fish is now installed on your system."
elog "To run fish, type 'fish' in your terminal."
elog
elog "To suppress fish's intro message on this machine type, using fish:"
elog " set -U fish_greeting \"\""
elog
elog "To use fish as your login shell:"
elog "* add the line '${EPREFIX}/bin/${PN}'"
elog "* to the file '${EPREFIX}/etc/shells'."
elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
elog
elog "To set your colors, run 'fish_config'"
elog "To scan your man pages for completions, run 'fish_update_completions'"
elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
elog
elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
elog "browser of your choice to get acces to ${PN}'s help system:"
elog " BROWSER=\"/usr/bin/firefox\""
elog
elog "In order to get lzma and xz support for man-page completion please"
elog "emerge one of the following packages:"
elog " dev-python/backports-lzma"
elog " >=dev-lang/python-3.3"
elog
elog "Have fun!"
elog
}
|
mark-kubacki/ossdl-overlay | ef831f73556761997d1502e44e162009056dee85 | sys-devel/gcc-4.9.3 | diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7e71b5b..b6660e9 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,2257 +1,2258 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Maintainer: Toolchain Ninjas <[email protected]>
DESCRIPTION="The GNU Compiler Collection"
HOMEPAGE="http://gcc.gnu.org/"
RESTRICT="strip" # cross-compilers need controlled stripping
inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator
if [[ ${PV} == *_pre9999* ]] ; then
EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
# naming style:
# gcc-4.7.1_pre9999 -> gcc-4_7-branch
# Note that the micro version is required or lots of stuff will break.
# To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before
# inheriting this eclass.
EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch"
EGIT_BRANCH=${EGIT_BRANCH//./_}
inherit git-2
fi
FEATURES=${FEATURES/multilib-strict/}
EXPORTED_FUNCTIONS="pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm"
case ${EAPI:-0} in
- 0|1) ;;
+ 0|1) die "Need to upgrade to at least EAPI=2";;
2|3) EXPORTED_FUNCTIONS+=" src_prepare src_configure" ;;
4*|5*) EXPORTED_FUNCTIONS+=" pkg_pretend src_prepare src_configure" ;;
*) die "I don't speak EAPI ${EAPI}."
esac
EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
#---->> globals <<----
export CTARGET=${CTARGET:-${CHOST}}
if [[ ${CTARGET} = ${CHOST} ]] ; then
- if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
- export CTARGET=${CATEGORY/cross-}
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
fi
fi
: ${TARGET_ABI:=${ABI}}
: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}}
: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}}
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
# General purpose version check. Without a second arg matches up to minor version (x.x.x)
tc_version_is_at_least() {
version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}"
}
# General purpose version range check
# Note that it matches up to but NOT including the second version
tc_version_is_between() {
tc_version_is_at_least "${1}" && ! tc_version_is_at_least "${2}"
}
GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
GCC_PVR=${GCC_PV}
[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR}
GCC_RELEASE_VER=$(get_version_component_range 1-3 ${GCC_PV})
GCC_BRANCH_VER=$(get_version_component_range 1-2 ${GCC_PV})
GCCMAJOR=$(get_version_component_range 1 ${GCC_PV})
GCCMINOR=$(get_version_component_range 2 ${GCC_PV})
GCCMICRO=$(get_version_component_range 3 ${GCC_PV})
[[ ${BRANCH_UPDATE-notset} == "notset" ]] && \
BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV})
# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
-GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV/_/-})}
+GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV%%_*})}
# Pre-release support
if [[ ${GCC_PV} == *_pre* ]] ; then
PRERELEASE=${GCC_PV/_pre/-}
elif [[ ${GCC_PV} == *_alpha* ]] ; then
SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha}
elif [[ ${GCC_PV} == *_beta* ]] ; then
SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta}
elif [[ ${GCC_PV} == *_rc* ]] ; then
SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
fi
-if [[ ${SNAPSHOT} == 5.0-* ]] ; then
- # The gcc-5 release has dropped the .0 for some reason.
- SNAPSHOT=${SNAPSHOT/5.0/5}
+if [[ ${SNAPSHOT} == [56789].0-* ]] ; then
+ # The gcc-5+ releases have dropped the .0 for some reason.
+ SNAPSHOT=${SNAPSHOT/.0}
fi
export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
PREFIX=${TOOLCHAIN_PREFIX:-/usr}
if tc_version_is_at_least 3.4.0 ; then
LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
else
LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
fi
INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
if is_crosscompile ; then
BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
else
BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
fi
DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}}
# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
# We will handle /usr/include/g++-v3/ with gcc-config ...
STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
#---->> LICENSE+SLOT+IUSE logic <<----
if tc_version_is_at_least 4.6 ; then
LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
elif tc_version_is_at_least 4.4 ; then
LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
elif tc_version_is_at_least 4.3 ; then
LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
elif tc_version_is_at_least 4.2 ; then
LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
elif tc_version_is_at_least 3.3 ; then
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
else
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
fi
IUSE="multislot regression-test vanilla"
IUSE_DEF=( nls nptl )
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE+=" altivec"
+ IUSE+=" altivec debug"
IUSE_DEF+=( cxx fortran )
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER} ]] && IUSE+=" d"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
- tc_version_is_at_least 4.6 && IUSE+=" graphite"
tc_version_is_at_least 4.7 && IUSE+=" go"
- tc_version_is_at_least 4.8 && IUSE_DEF+=( sanitize )
+ # Note: while <=gcc-4.7 also supported graphite, it required forked ppl
+ # versions which we dropped. Since graphite was also experimental in
+ # the older versions, we don't want to bother supporting it. #448024
+ tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize )
+ tc_version_is_at_least 4.9 && IUSE+=" cilk"
+ tc_version_is_at_least 6.0 && IUSE+=" pie"
fi
-[[ ${EAPI:-0} != 0 ]] && IUSE_DEF=( "${IUSE_DEF[@]/#/+}" )
-IUSE+=" ${IUSE_DEF[*]}"
+IUSE+=" ${IUSE_DEF[*]/#/+}"
# Support upgrade paths here or people get pissed
-if use multislot ; then
- SLOT="${GCC_CONFIG_VER}"
+if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
+ SLOT="${GCC_CONFIG_VER%%_*}"
else
SLOT="${GCC_BRANCH_VER}"
fi
#---->> DEPEND <<----
RDEPEND="sys-libs/zlib
nls? ( virtual/libintl )"
tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv"
if tc_version_is_at_least 4 ; then
- GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2"
+ GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0"
if tc_version_is_at_least 4.3 ; then
RDEPEND+=" ${GMP_MPFR_DEPS}"
elif in_iuse fortran ; then
RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
fi
fi
-tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1"
+tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0"
if in_iuse graphite ; then
- if tc_version_is_at_least 4.8 ; then
+ if tc_version_is_at_least 5.0 ; then
+ RDEPEND+=" graphite? ( >=dev-libs/isl-0.14 )"
+ elif tc_version_is_at_least 4.8 ; then
RDEPEND+="
graphite? (
>=dev-libs/cloog-0.18.0
>=dev-libs/isl-0.11.1
)"
- else
- RDEPEND+="
- graphite? (
- >=dev-libs/cloog-ppl-0.15.10
- >=dev-libs/ppl-0.11
- )"
fi
fi
DEPEND="${RDEPEND}
>=sys-devel/bison-1.875
>=sys-devel/flex-2.5.4
nls? ( sys-devel/gettext )
regression-test? (
>=dev-util/dejagnu-1.4.4
>=sys-devel/autogen-5.5.4
)"
if in_iuse gcj ; then
GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
GCJ_GTK_DEPS="
x11-libs/libXt
x11-libs/libX11
x11-libs/libXtst
x11-proto/xproto
x11-proto/xextproto
=x11-libs/gtk+-2*
virtual/pkgconfig
- amd64? ( multilib? (
- app-emulation/emul-linux-x86-gtklibs
- app-emulation/emul-linux-x86-xlibs
- ) )
"
tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
fi
PDEPEND=">=sys-devel/gcc-config-1.7"
#---->> S + SRC_URI essentials <<----
# Set the source directory depending on whether we're using
# a prerelease, snapshot, or release tarball.
S=$(
if [[ -n ${PRERELEASE} ]] ; then
echo ${WORKDIR}/gcc-${PRERELEASE}
elif [[ -n ${SNAPSHOT} ]] ; then
echo ${WORKDIR}/gcc-${SNAPSHOT}
else
echo ${WORKDIR}/gcc-${GCC_RELEASE_VER}
fi
)
gentoo_urls() {
local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI
- HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI"
+ HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI"
devspace=${devspace//HTTP/http:\/\/dev.gentoo.org\/}
echo mirror://gentoo/$1 ${devspace//URI/$1}
}
# This function handles the basics of setting the SRC_URI for a gcc ebuild.
# To use, set SRC_URI with:
#
# SRC_URI="$(get_gcc_src_uri)"
#
# Other than the variables normally set by portage, this function's behavior
# can be altered by setting the following:
#
# SNAPSHOT
# If set, this variable signals that we should be using a snapshot of
# gcc. It is expected to be in the format "YYYY-MM-DD". Note that if
# the ebuild has a _pre suffix, this variable is ignored and the
# prerelease tarball is used instead.
#
# BRANCH_UPDATE
# If set, this variable signals that we should be using the main
# release tarball (determined by ebuild version) and applying a
# CVS branch update patch against it. The location of this branch
# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}.
# Just like with SNAPSHOT, this variable is ignored if the ebuild
# has a _pre suffix.
#
# PATCH_VER
# PATCH_GCC_VER
# This should be set to the version of the gentoo patch tarball.
# The resulting filename of this tarball will be:
# gcc-${PATCH_GCC_VER:-${GCC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
#
# PIE_VER
# PIE_GCC_VER
# These variables control patching in various updates for the logic
# controlling Position Independant Executables. PIE_VER is expected
# to be the version of this patch, and PIE_GCC_VER the gcc version of
# the patch:
# An example:
# PIE_VER="8.7.6.5"
# PIE_GCC_VER="3.4.0"
# The resulting filename of this tarball will be:
# gcc-${PIE_GCC_VER:-${GCC_RELEASE_VER}}-piepatches-v${PIE_VER}.tar.bz2
#
# SPECS_VER
# SPECS_GCC_VER
# This is for the minispecs files included in the hardened gcc-4.x
# The specs files for hardenedno*, vanilla and for building the "specs" file.
# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER
# the gcc version of the patch.
# An example:
# SPECS_VER="8.7.6.5"
# SPECS_GCC_VER="3.4.0"
# The resulting filename of this tarball will be:
# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2
#
# HTB_VER
# HTB_GCC_VER
# These variables control whether or not an ebuild supports Herman
# ten Brugge's bounds-checking patches. If you want to use a patch
# for an older gcc version with a new gcc, make sure you set
# HTB_GCC_VER to that version of gcc.
get_gcc_src_uri() {
export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
# Set where to download gcc itself depending on whether we're using a
# prerelease, snapshot, or release tarball.
if [[ ${PV} == *9999* ]] ; then
# Nothing to do w/git snapshots.
:
elif [[ -n ${PRERELEASE} ]] ; then
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
elif [[ -n ${SNAPSHOT} ]] ; then
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
else
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
# we want all branch updates to be against the main release
[[ -n ${BRANCH_UPDATE} ]] && \
GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
fi
[[ -n ${UCLIBC_VER} ]] && \
GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
[[ -n ${PATCH_VER} ]] && \
GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
# strawberry pie, Cappuccino and a Gauloises (it's a good thing)
[[ -n ${PIE_VER} ]] && \
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \
GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})"
# gcc minispec for the hardened gcc 4 compiler
[[ -n ${SPECS_VER} ]] && \
GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
GCC_SRC_URI+="
boundschecking? (
mirror://sourceforge/boundschecking/${HTBFILE}
$(gentoo_urls ${HTBFILE})
)"
fi
[[ -n ${D_VER} ]] && \
GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
if in_iuse gcj ; then
if tc_version_is_at_least 4.5 ; then
GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
elif tc_version_is_at_least 4.3 ; then
GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
fi
fi
echo "${GCC_SRC_URI}"
}
SRC_URI=$(get_gcc_src_uri)
#---->> pkg_pretend <<----
toolchain_pkg_pretend() {
if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] &&
[[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]] ; then
die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it" \
"in your make.conf if you want to use this version."
fi
[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \
die "Sorry, this version does not support uClibc"
if ! use_if_iuse cxx ; then
use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"'
use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"'
use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"'
fi
want_minispecs
}
#---->> pkg_setup <<----
toolchain_pkg_setup() {
- case "${EAPI:-0}" in
- 0|1|2|3) toolchain_pkg_pretend ;;
+ case ${EAPI} in
+ 2|3) toolchain_pkg_pretend ;;
esac
# we dont want to use the installed compiler's specs to build gcc
unset GCC_SPECS
unset LANGUAGES #265283
}
#---->> src_unpack <<----
toolchain_src_unpack() {
if [[ ${PV} == *9999* ]]; then
git-2_src_unpack
else
gcc_quick_unpack
fi
-
- case ${EAPI:-0} in
- 0|1) toolchain_src_prepare ;;
- esac
}
gcc_quick_unpack() {
pushd "${WORKDIR}" > /dev/null
export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
if [[ -n ${GCC_A_FAKEIT} ]] ; then
unpack ${GCC_A_FAKEIT}
elif [[ -n ${PRERELEASE} ]] ; then
unpack gcc-${PRERELEASE}.tar.bz2
elif [[ -n ${SNAPSHOT} ]] ; then
unpack gcc-${SNAPSHOT}.tar.bz2
elif [[ ${PV} != *9999* ]] ; then
unpack gcc-${GCC_RELEASE_VER}.tar.bz2
# We want branch updates to be against a release tarball
if [[ -n ${BRANCH_UPDATE} ]] ; then
pushd "${S}" > /dev/null
epatch "${DISTDIR}"/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
popd > /dev/null
fi
fi
if [[ -n ${D_VER} ]] && use d ; then
pushd "${S}"/gcc > /dev/null
unpack gdc-${D_VER}-src.tar.bz2
cd ..
ebegin "Adding support for the D language"
./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log
if ! eend $? ; then
eerror "The D GCC package failed to apply"
eerror "Please include this log file when posting a bug report:"
eerror " ${T}/dgcc.log"
die "failed to include the D language"
fi
popd > /dev/null
fi
[[ -n ${PATCH_VER} ]] && \
unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2
[[ -n ${UCLIBC_VER} ]] && \
unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2
if want_pie ; then
if [[ -n ${PIE_CORE} ]] ; then
unpack ${PIE_CORE}
else
unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
fi
[[ -n ${SPECS_VER} ]] && \
unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2
fi
use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
popd > /dev/null
}
#---->> src_prepare <<----
toolchain_src_prepare() {
export BRANDING_GCC_PKGVERSION="Blitznote ${GCC_PVR}"
cd "${S}"
if ! use vanilla ; then
if [[ -n ${PATCH_VER} ]] ; then
guess_patch_type_in_dir "${WORKDIR}"/patch
EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
epatch "${WORKDIR}"/patch
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} p${PATCH_VER}"
fi
if [[ -n ${UCLIBC_VER} ]] ; then
guess_patch_type_in_dir "${WORKDIR}"/uclibc
EPATCH_MULTI_MSG="Applying uClibc patches ..." \
epatch "${WORKDIR}"/uclibc
fi
fi
do_gcc_HTB_patches
do_gcc_PIE_patches
epatch_user
if ( tc_version_is_at_least 4.8.2 || use hardened ) && ! use vanilla ; then
make_gcc_hard
fi
# install the libstdc++ python into the right location
# http://gcc.gnu.org/PR51368
if tc_version_is_between 4.5 4.7 ; then
sed -i \
'/^pythondir =/s:=.*:= $(datadir)/python:' \
"${S}"/libstdc++-v3/python/Makefile.in || die
fi
# make sure the pkg config files install into multilib dirs.
# since we configure with just one --libdir, we can't use that
# (as gcc itself takes care of building multilibs). #435728
find "${S}" -name Makefile.in \
-exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} +
# No idea when this first started being fixed, but let's go with 4.3.x for now
if ! tc_version_is_at_least 4.3 ; then
fix_files=""
for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
[[ -e ${x} ]] && fix_files="${fix_files} ${x}"
done
ht_fix_file ${fix_files} */configure *.sh */Makefile.in
fi
setup_multilib_osdirnames
gcc_version_patch
if tc_version_is_at_least 4.1 ; then
if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then
# BASE-VER must be a three-digit version number
# followed by an optional -pre string
# eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999
# If BASE-VER differs from ${PV/_/-} then libraries get installed in
# the wrong directory.
echo ${PV/_/-} > "${S}"/gcc/BASE-VER
fi
fi
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
if tc_version_is_at_least 4.3 && use gcj ; then
if tc_version_is_at_least 4.5 ; then
einfo "Copying ecj-4.5.jar"
cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
else
einfo "Copying ecj-4.3.jar"
cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
fi
fi
# disable --as-needed from being compiled into gcc specs
# natively when using a gcc version < 3.4.4
# http://gcc.gnu.org/PR14992
if ! tc_version_is_at_least 3.4.4 ; then
sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in
fi
# In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names
# in line with gcc-4.
if tc_version_is_between 3.3 4.0 ; then
do_gcc_rename_java_bins
fi
# Prevent libffi from being installed
if tc_version_is_between 3.0 4.8 ; then
sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die
sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die
fi
# Fixup libtool to correctly generate .la files with portage
elibtoolize --portage --shallow --no-uclibc
gnuconfig_update
# update configure files
local f
einfo "Fixing misc issues in configure files"
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
ebegin " Updating ${f/${S}\/} [LANG]"
patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
|| eerror "Please file a bug about this"
eend $?
done
sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828
# Prevent new texinfo from breaking old versions (see #198182, #464008)
tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
if [[ -x contrib/gcc_update ]] ; then
einfo "Touching generated files"
./contrib/gcc_update --touch | \
while read f ; do
einfo " ${f%%...}"
done
fi
}
guess_patch_type_in_dir() {
[[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
&& EPATCH_SUFFIX="patch.bz2" \
|| EPATCH_SUFFIX="patch"
}
do_gcc_HTB_patches() {
use_if_iuse boundschecking || return 0
# modify the bounds checking patch with a regression patch
epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}"
}
do_gcc_PIE_patches() {
want_pie || return 0
use vanilla && return 0
if tc_version_is_at_least 4.3.2 ; then
guess_patch_type_in_dir "${WORKDIR}"/piepatch/
EPATCH_MULTI_MSG="Applying pie patches ..." \
epatch "${WORKDIR}"/piepatch/
else
guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
# corrects startfile/endfile selection and shared/static/pie flag usage
EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
epatch "${WORKDIR}"/piepatch/upstream
# adds non-default pie support (rs6000)
EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
epatch "${WORKDIR}"/piepatch/nondef
# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
EPATCH_MULTI_MSG="Applying default pie patches ..." \
epatch "${WORKDIR}"/piepatch/def
fi
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
}
# configure to build with the hardened GCC specs as the default
make_gcc_hard() {
# we want to be able to control the pie patch logic via something other
# than ALL_CFLAGS...
sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
-i "${S}"/gcc/Makefile.in
# Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7
if tc_version_is_at_least 4.7 ; then
sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \
-e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \
-i "${S}"/gcc/Makefile.in
fi
# defaults to enable for all toolchains
local gcc_hard_flags=""
if use hardened ; then
if hardened_gcc_works ; then
einfo "Updating gcc to use automatic PIE + SSP building ..."
gcc_hard_flags+=" -DEFAULT_PIE_SSP"
elif hardened_gcc_works pie ; then
einfo "Updating gcc to use automatic PIE building ..."
ewarn "SSP has not been enabled by default"
gcc_hard_flags+=" -DEFAULT_PIE"
elif hardened_gcc_works ssp ; then
einfo "Updating gcc to use automatic SSP building ..."
ewarn "PIE has not been enabled by default"
gcc_hard_flags+=" -DEFAULT_SSP"
else
# do nothing if hardened is't supported, but don't die either
ewarn "hardened is not supported for this arch in this gcc version"
return 0
fi
# rebrand to make bug reports easier
BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
else
if hardened_gcc_works ssp ; then
einfo "Updating gcc to use automatic SSP building ..."
gcc_hard_flags+=" -DEFAULT_SSP"
fi
fi
sed -i \
-e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \
"${S}"/gcc/Makefile.in || die
}
# This is a historical wart. The original Gentoo/amd64 port used:
# lib32 - 32bit binaries (x86)
# lib64 - 64bit binaries (x86_64)
# lib - "native" binaries (a symlink to lib64)
# Most other distros use the logic (including mainline gcc):
# lib - 32bit binaries (x86)
# lib64 - 64bit binaries (x86_64)
# Over time, Gentoo is migrating to the latter form.
#
# Unfortunately, due to distros picking the lib32 behavior, newer gcc
# versions will dynamically detect whether to use lib or lib32 for its
# 32bit multilib. So, to keep the automagic from getting things wrong
# while people are transitioning from the old style to the new style,
# we always set the MULTILIB_OSDIRNAMES var for relevant targets.
setup_multilib_osdirnames() {
is_multilib || return 0
local config
local libdirs="../lib64 ../lib32"
# this only makes sense for some Linux targets
case ${CTARGET} in
x86_64*-linux*) config="i386" ;;
powerpc64*-linux*) config="rs6000" ;;
sparc64*-linux*) config="sparc" ;;
s390x*-linux*) config="s390" ;;
*) return 0 ;;
esac
config+="/t-linux64"
local sed_args=()
if tc_version_is_at_least 4.6 ; then
sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' )
fi
if [[ ${SYMLINK_LIB} == "yes" ]] ; then
einfo "updating multilib directories to be: ${libdirs}"
if tc_version_is_at_least 4.6.4 || tc_version_is_at_least 4.7 ; then
sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' )
else
sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" )
fi
else
einfo "using upstream multilib; disabling lib32 autodetection"
sed_args+=( -r -e 's:[$][(]if.*,(.*)[)]:\1:' )
fi
sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die
}
gcc_version_patch() {
# gcc-4.3+ has configure flags (whoo!)
tc_version_is_at_least 4.3 && return 0
local version_string=${GCC_CONFIG_VER}
[[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}"
einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})"
local gcc_sed=( -e 's:gcc\.gnu\.org/bugs\.html:bugs\.gentoo\.org/:' )
if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then
gcc_sed+=( -e "/VERSUFFIX \"\"/s:\"\":\" (${BRANDING_GCC_PKGVERSION})\":" )
else
version_string="${version_string} (${BRANDING_GCC_PKGVERSION})"
gcc_sed+=( -e "/const char version_string\[\] = /s:= \".*\":= \"${version_string}\":" )
fi
sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die
}
do_gcc_rename_java_bins() {
# bug #139918 - conflict between gcc and java-config-2 for ownership of
# /usr/bin/rmi{c,registry}. Done with mv & sed rather than a patch
# because patches would be large (thanks to the rename of man files),
# and it's clear from the sed invocations that all that changes is the
# rmi{c,registry} names to grmi{c,registry} names.
# Kevin F. Quinn 2006-07-12
einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
# 1) Move the man files if present (missing prior to gcc-3.4)
for manfile in rmic rmiregistry ; do
[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1
done
# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do
[[ -f ${S}/${jfile} ]] || continue
sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmiregistry"
sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmic"
done
# 3) Fixup Makefiles to build the changed executable names
# These are present in all 3.x versions, and are the important bit
# to get gcc to build with the new names.
for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do
sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmiregistry"
# Careful with rmic on these files; it's also the name of a directory
# which should be left unchanged. Replace occurrences of 'rmic$',
# 'rmic_' and 'rmic '.
sed -i -e 's:rmic\([$_ ]\):grmic\1:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
#---->> src_configure <<----
toolchain_src_configure() {
downgrade_arch_flags
gcc_do_filter_flags
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
einfo "LDFLAGS=\"${LDFLAGS}\""
# Force internal zip based jar script to avoid random
# issues with 3rd party jar implementations. #384291
export JAR=no
# For hardened gcc 4.3 piepatchset to build the hardened specs
# file (build.specs) to use when building gcc.
if ! tc_version_is_at_least 4.4 && want_minispecs ; then
setup_minispecs_gcc_build_specs
fi
local confgcc=( --host=${CHOST} )
if is_crosscompile || tc-is-cross-compiler ; then
# Straight from the GCC install doc:
# "GCC has code to correctly determine the correct value for target
# for nearly all native systems. Therefore, we highly recommend you
# not provide a configure target when configuring a native compiler."
confgcc+=( --target=${CTARGET} )
fi
[[ -n ${CBUILD} ]] && confgcc+=( --build=${CBUILD} )
confgcc+=(
--prefix="${PREFIX}"
--bindir="${BINPATH}"
--includedir="${INCLUDEPATH}"
--datadir="${DATAPATH}"
--mandir="${DATAPATH}/man"
--infodir="${DATAPATH}/info"
--with-gxx-include-dir="${STDCXX_INCDIR}"
)
# Stick the python scripts in their own slotted directory (bug #279252)
#
# --with-python-dir=DIR
# Specifies where to install the Python modules used for aot-compile. DIR
# should not include the prefix used in installation. For example, if the
# Python modules are to be installed in /usr/lib/python2.5/site-packages,
# then --with-python-dir=/lib/python2.5/site-packages should be passed.
#
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
if tc_version_is_at_least 4.4 ; then
confgcc+=( --with-python-dir=${DATAPATH/$PREFIX/}/python )
fi
### language options
local GCC_LANG="c"
is_cxx && GCC_LANG+=",c++"
is_d && GCC_LANG+=",d"
is_gcj && GCC_LANG+=",java"
is_go && GCC_LANG+=",go"
if is_objc || is_objcxx ; then
GCC_LANG+=",objc"
if tc_version_is_at_least 4 ; then
use objc-gc && confgcc+=( --enable-objc-gc )
fi
is_objcxx && GCC_LANG+=",obj-c++"
fi
# fortran support just got sillier! the lang value can be f77 for
# fortran77, f95 for fortran95, or just plain old fortran for the
# currently supported standard depending on gcc version.
is_fortran && GCC_LANG+=",fortran"
is_f77 && GCC_LANG+=",f77"
is_f95 && GCC_LANG+=",f95"
# We do NOT want 'ADA support' in here!
# is_ada && GCC_LANG+=",ada"
confgcc+=( --enable-languages=${GCC_LANG} )
### general options
confgcc+=(
--enable-obsolete
--enable-secureplt
--disable-werror
--with-system-zlib
)
if use nls ; then
confgcc+=( --enable-nls --without-included-gettext )
else
confgcc+=( --disable-nls )
fi
tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions )
# Use the default ("release") checking because upstream usually neglects
# to test "disabled" so it has a history of breaking. #317217
- if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
- confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-release} )
- else
- confgcc+=( --disable-checking )
+ if tc_version_is_at_least 3.4 ; then
+ # The "release" keyword is new to 4.0. #551636
+ local off=$(tc_version_is_at_least 4.0 && echo release || echo no)
+ confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes ${off})}" )
fi
# Branding
tc_version_is_at_least 4.3 && confgcc+=(
--with-bugurl=https://bugs.gentoo.org/
--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
)
# If we want hardened support with the newer piepatchset for >=gcc 4.4
if tc_version_is_at_least 4.4 && want_minispecs ; then
confgcc+=( $(use_enable hardened esp) )
fi
# allow gcc to search for clock funcs in the main C lib.
# if it can't find them, then tough cookies -- we aren't
# going to link in -lrt to all C++ apps. #411681
if tc_version_is_at_least 4.4 && is_cxx ; then
confgcc+=( --enable-libstdcxx-time )
fi
# # Turn on the -Wl,--build-id flag by default for ELF targets. #525942
# # This helps with locating debug files.
# case ${CTARGET} in
# *-linux-*|*-elf|*-eabi)
# tc_version_is_at_least 4.5 && confgcc+=(
# --enable-linker-build-id
# )
# ;;
# esac
# newer gcc versions like to bootstrap themselves with C++,
# so we need to manually disable it ourselves
if tc_version_is_between 4.7 4.8 && ! is_cxx ; then
confgcc+=( --disable-build-with-cxx --disable-build-poststage1-with-cxx )
fi
### Cross-compiler options
if is_crosscompile ; then
# Enable build warnings by default with cross-compilers when system
# paths are included (e.g. via -I flags).
confgcc+=( --enable-poison-system-directories )
# When building a stage1 cross-compiler (just C compiler), we have to
# disable a bunch of features or gcc goes boom
local needed_libc=""
case ${CTARGET} in
*-linux) needed_libc=no-fucking-clue;;
*-dietlibc) needed_libc=dietlibc;;
*-elf|*-eabi) needed_libc=newlib;;
*-freebsd*) needed_libc=freebsd-lib;;
*-gnu*) needed_libc=glibc;;
*-klibc) needed_libc=klibc;;
*-musl*) needed_libc=musl;;
*-uclibc*)
if ! echo '#include <features.h>' | \
$(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
grep -q __HAVE_SHARED__
then #291870
confgcc+=( --disable-shared )
fi
needed_libc=uclibc
;;
*-cygwin) needed_libc=cygwin;;
x86_64-*-mingw*|\
*-w64-mingw*) needed_libc=mingw64-runtime;;
mingw*|*-mingw*) needed_libc=mingw-runtime;;
avr) confgcc+=( --enable-shared --disable-threads );;
esac
if [[ -n ${needed_libc} ]] ; then
local confgcc_no_libc=( --disable-shared )
tc_version_is_at_least 4.8 && confgcc_no_libc+=( --disable-libatomic )
if ! has_version ${CATEGORY}/${needed_libc} ; then
confgcc+=(
"${confgcc_no_libc[@]}"
--disable-threads
--without-headers
)
elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then
confgcc+=(
"${confgcc_no_libc[@]}"
--with-sysroot=${PREFIX}/${CTARGET}
)
else
confgcc+=( --with-sysroot=${PREFIX}/${CTARGET} )
fi
fi
tc_version_is_at_least 4.2 && confgcc+=( --disable-bootstrap )
else
if tc-is-static-only ; then
confgcc+=( --disable-shared )
else
confgcc+=( --enable-shared )
fi
case ${CHOST} in
mingw*|*-mingw*|*-cygwin)
confgcc+=( --enable-threads=win32 ) ;;
*)
confgcc+=( --enable-threads=posix ) ;;
esac
fi
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.
case ${CTARGET} in
*-uclibc*)
confgcc+=(
--disable-__cxa_atexit
$(use_enable nptl tls)
)
tc_version_is_between 3.3 3.4 && confgcc+=( --enable-sjlj-exceptions )
if tc_version_is_between 3.4 4.3 ; then
confgcc+=( --enable-clocale=uclibc )
fi
;;
*-elf|*-eabi)
confgcc+=( --with-newlib )
;;
*-gnu*)
confgcc+=(
--enable-__cxa_atexit
--enable-clocale=gnu
)
;;
*-freebsd*)
confgcc+=( --enable-__cxa_atexit )
;;
*-solaris*)
confgcc+=( --enable-__cxa_atexit )
;;
esac
### arch options
gcc-multilib-configure
# ppc altivec support
confgcc+=( $(use_enable altivec) )
# gcc has fixed-point arithmetic support in 4.3 for mips targets that can
# significantly increase compile time by several hours. This will allow
# users to control this feature in the event they need the support.
tc_version_is_at_least 4.3 && confgcc+=( $(use_enable fixed-point) )
case $(tc-is-softfloat) in
yes) confgcc+=( --with-float=soft ) ;;
softfp) confgcc+=( --with-float=softfp ) ;;
*)
# If they've explicitly opt-ed in, do hardfloat,
# otherwise let the gcc default kick in.
case ${CTARGET//_/-} in
*-hardfloat-*|*eabihf) confgcc+=( --with-float=hard ) ;;
esac
esac
local with_abi_map=()
case $(tc-arch) in
arm) #264534 #414395
local a arm_arch=${CTARGET%%-*}
# Remove trailing endian variations first: eb el be bl b l
for a in e{b,l} {b,l}e b l ; do
if [[ ${arm_arch} == *${a} ]] ; then
arm_arch=${arm_arch%${a}}
break
fi
done
# Convert armv7{a,r,m} to armv7-{a,r,m}
[[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
# See if this is a valid --with-arch flag
if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
. "${srcdir}"/config.gcc) &>/dev/null
then
confgcc+=( --with-arch=${arm_arch} )
fi
# Make default mode thumb for microcontroller classes #418209
[[ ${arm_arch} == *-m ]] && confgcc+=( --with-mode=thumb )
# Enable hardvfp
if [[ $(tc-is-softfloat) == "no" ]] && \
[[ ${CTARGET} == armv[67]* ]] && \
tc_version_is_at_least 4.5
then
# Follow the new arm hardfp distro standard by default
confgcc+=( --with-float=hard )
case ${CTARGET} in
armv6*) confgcc+=( --with-fpu=vfp ) ;;
armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;;
esac
fi
;;
mips)
# Add --with-abi flags to set default ABI
confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
;;
amd64)
# drop the older/ABI checks once this get's merged into some
# version of gcc upstream
- if tc_version_is_at_least 4.7 && has x32 $(get_all_abis TARGET) ; then
+ if tc_version_is_at_least 4.8 && has x32 $(get_all_abis TARGET) ; then
confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
fi
;;
x86)
# Default arch for x86 is normally i386, lets give it a bump
# since glibc will do so based on CTARGET anyways
confgcc+=( --with-arch=${CTARGET%%-*} )
;;
hppa)
# Enable sjlj exceptions for backward compatibility on hppa
[[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions )
;;
ppc)
# Set up defaults based on current CFLAGS
is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double )
[[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double )
;;
esac
# if the target can do biarch (-m32/-m64), enable it. overhead should
# be small, and should simplify building of 64bit kernels in a 32bit
# userland by not needing sys-devel/kgcc64. #349405
case $(tc-arch) in
ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=( --enable-targets=all ) ;;
sparc) tc_version_is_at_least 4.4 && confgcc+=( --enable-targets=all ) ;;
amd64|x86) tc_version_is_at_least 4.3 && confgcc+=( --enable-targets=all ) ;;
esac
# On Darwin we need libdir to be set in order to get correct install names
# for things like libobjc-gnu, libgcj and libfortran. If we enable it on
# non-Darwin we screw up the behaviour this eclass relies on. We in
# particular need this over --libdir for bug #255315.
[[ ${CTARGET} == *-darwin* ]] && \
confgcc+=( --enable-version-specific-runtime-libs )
### library options
if ! is_gcj ; then
confgcc+=( --disable-libgcj )
elif use awt ; then
confgcc+=( --enable-java-awt=gtk )
fi
if tc_version_is_at_least 4.2 ; then
if in_iuse openmp ; then
# Make sure target has pthreads support. #326757 #335883
# There shouldn't be a chicken & egg problem here as openmp won't
# build without a C library, and you can't build that w/out
# already having a compiler ...
if ! is_crosscompile || \
$(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
then
confgcc+=( $(use_enable openmp libgomp) )
else
# Force disable as the configure script can be dumb #359855
confgcc+=( --disable-libgomp )
fi
else
# For gcc variants where we don't want openmp (e.g. kgcc)
confgcc+=( --disable-libgomp )
fi
fi
if tc_version_is_at_least 4.0 ; then
if in_iuse mudflap ; then
confgcc+=( $(use_enable mudflap libmudflap) )
else
confgcc+=( --disable-libmudflap )
fi
if use_if_iuse libssp ; then
confgcc+=( --enable-libssp )
else
if hardened_gcc_is_stable ssp; then
export gcc_cv_libc_provides_ssp=yes
fi
confgcc+=( --disable-libssp )
fi
+ fi
+ if in_iuse cilk ; then
+ confgcc+=( $(use_enable cilk libcilkrts) )
fi
# newer gcc's come with libquadmath, but only fortran uses
# it, so auto punt it when we don't care
if tc_version_is_at_least 4.6 && ! is_fortran ; then
confgcc+=( --disable-libquadmath )
fi
if tc_version_is_at_least 4.6 ; then
confgcc+=( --enable-lto )
elif tc_version_is_at_least 4.5 ; then
confgcc+=( --disable-lto )
fi
- # graphite was added in 4.4 but we only support it in 4.6+ due to external
- # library issues. 4.6/4.7 uses cloog-ppl which is a fork of CLooG with a
- # PPL backend. 4.8+ uses upstream CLooG with the ISL backend. We install
- # cloog-ppl into a non-standard location to prevent collisions.
- if tc_version_is_at_least 4.8 ; then
- confgcc+=( $(use_with graphite cloog) )
+ # graphite was added in 4.4 but we only support it in 4.8+ due to external
+ # library issues. #448024
+ if tc_version_is_at_least 5.0 ; then
+ confgcc+=( $(use_with graphite isl) )
use graphite && confgcc+=( --disable-isl-version-check )
- elif tc_version_is_at_least 4.6 ; then
+ elif tc_version_is_at_least 4.8 ; then
confgcc+=( $(use_with graphite cloog) )
- confgcc+=( $(use_with graphite ppl) )
- use graphite && confgcc+=( --with-cloog-include=/usr/include/cloog-ppl )
- use graphite && confgcc+=( --disable-ppl-version-check )
+ use graphite && confgcc+=( --disable-isl-version-check )
elif tc_version_is_at_least 4.4 ; then
- confgcc+=( --without-cloog )
- confgcc+=( --without-ppl )
+ confgcc+=( --without-{cloog,ppl} )
fi
if tc_version_is_at_least 4.8 ; then
confgcc+=( $(use_enable sanitize libsanitizer) )
fi
+ if tc_version_is_at_least 6.0 ; then
+ confgcc+=( $(use_enable pie default-pie) )
+ fi
+
# Disable gcc info regeneration -- it ships with generated info pages
# already. Our custom version/urls/etc... trigger it. #464008
export gcc_cv_prog_makeinfo_modern=no
# Do not let the X detection get in our way. We know things can be found
# via system paths, so no need to hardcode things that'll break multilib.
# Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up
# killing the 32bit builds which want /usr/lib.
export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries='
confgcc+=( "$@" ${EXTRA_ECONF} )
# Nothing wrong with a good dose of verbosity
echo
einfo "PREFIX: ${PREFIX}"
einfo "BINPATH: ${BINPATH}"
einfo "LIBPATH: ${LIBPATH}"
einfo "DATAPATH: ${DATAPATH}"
einfo "STDCXX_INCDIR: ${STDCXX_INCDIR}"
echo
einfo "Languages: ${GCC_LANG}"
echo
einfo "Configuring GCC with: ${confgcc[@]//--/\n\t--}"
echo
# Build in a separate build tree
mkdir -p "${WORKDIR}"/build
pushd "${WORKDIR}"/build > /dev/null
# and now to do the actual configuration
addwrite /dev/zero
echo "${S}"/configure "${confgcc[@]}"
- "${S}"/configure "${confgcc[@]}" || die "failed to run configure"
+ # Older gcc versions did not detect bash and re-exec itself, so force the
+ # use of bash. Newer ones will auto-detect, but this is not harmeful.
+ CONFIG_SHELL="/bin/bash" \
+ bash "${S}"/configure "${confgcc[@]}" || die "failed to run configure"
# return to whatever directory we were in before
popd > /dev/null
}
# Replace -m flags unsupported by the version being built with the best
# available equivalent
downgrade_arch_flags() {
local arch bver i isa myarch mytune rep ver
bver=${1:-${GCC_BRANCH_VER}}
[[ $(gcc-version) < ${bver} ]] && return 0
[[ $(tc-arch) != amd64 && $(tc-arch) != x86 ]] && return 0
myarch=$(get-flag march)
mytune=$(get-flag mtune)
# If -march=native isn't supported we have to tease out the actual arch
if [[ ${myarch} == native || ${mytune} == native ]] ; then
if [[ ${bver} < 4.2 ]] ; then
arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \
| sed -rn "/cc1.*-march/s:.*-march=([^ ']*).*:\1:p")
replace-cpu-flags native ${arch}
fi
fi
# Handle special -mtune flags
[[ ${mytune} == intel && ${bver} < 4.9 ]] && replace-cpu-flags intel generic
[[ ${mytune} == generic && ${bver} < 4.2 ]] && filter-flags '-mtune=*'
[[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*'
[[ ${bver} < 3.4 ]] && filter-flags '-mtune=*'
# "added" "arch" "replacement"
local archlist=(
4.9 bdver4 bdver3
4.9 bonnell atom
4.9 broadwell core-avx2
4.9 haswell core-avx2
4.9 ivybridge core-avx-i
4.9 nehalem corei7
4.9 sandybridge corei7-avx
4.9 silvermont corei7
4.9 westmere corei7
4.8 bdver3 bdver2
4.8 btver2 btver1
4.7 bdver2 bdver1
4.7 core-avx2 core-avx-i
4.6 bdver1 amdfam10
4.6 btver1 amdfam10
4.6 core-avx-i core2
4.6 corei7 core2
4.6 corei7-avx core2
4.5 atom core2
4.3 amdfam10 k8
4.3 athlon64-sse3 k8
4.3 barcelona k8
4.3 core2 nocona
4.3 geode k6-2 # gcc.gnu.org/PR41989#c22
4.3 k8-sse3 k8
4.3 opteron-sse3 k8
3.4 athlon-fx x86-64
3.4 athlon64 x86-64
3.4 c3-2 c3
3.4 k8 x86-64
3.4 opteron x86-64
3.4 pentium-m pentium3
3.4 pentium3m pentium3
3.4 pentium4m pentium4
)
for ((i = 0; i < ${#archlist[@]}; i += 3)) ; do
myarch=$(get-flag march)
mytune=$(get-flag mtune)
ver=${archlist[i]}
arch=${archlist[i + 1]}
rep=${archlist[i + 2]}
[[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue
if [[ ${ver} > ${bver} ]] ; then
einfo "Replacing ${myarch} (added in gcc ${ver}) with ${rep}..."
[[ ${myarch} == ${arch} ]] && replace-cpu-flags ${myarch} ${rep}
[[ ${mytune} == ${arch} ]] && replace-cpu-flags ${mytune} ${rep}
continue
else
break
fi
done
# we only check -mno* here since -m* get removed by strip-flags later on
local isalist=(
4.9 -mno-sha
4.9 -mno-avx512pf
4.9 -mno-avx512f
4.9 -mno-avx512er
4.9 -mno-avx512cd
4.8 -mno-xsaveopt
4.8 -mno-xsave
4.8 -mno-rtm
4.8 -mno-fxsr
4.7 -mno-lzcnt
4.7 -mno-bmi2
4.7 -mno-avx2
4.6 -mno-tbm
4.6 -mno-rdrnd
4.6 -mno-fsgsbase
4.6 -mno-f16c
4.6 -mno-bmi
4.5 -mno-xop
4.5 -mno-movbe
4.5 -mno-lwp
4.5 -mno-fma4
4.4 -mno-pclmul
4.4 -mno-fma
4.4 -mno-avx
4.4 -mno-aes
4.3 -mno-ssse3
4.3 -mno-sse4a
4.3 -mno-sse4
4.3 -mno-sse4.2
4.3 -mno-sse4.1
4.3 -mno-popcnt
4.3 -mno-abm
)
for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do
ver=${isalist[i]}
isa=${isalist[i + 1]}
[[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-}
done
}
gcc_do_filter_flags() {
strip-flags
replace-flags -O? -O2
# dont want to funk ourselves
filter-flags '-mabi*' -m31 -m32 -m64
filter-flags -frecord-gcc-switches # 490738
filter-flags -mno-rtm -mno-htm # 506202
if tc_version_is_between 3.2 3.4 ; then
# XXX: this is so outdated it's barely useful, but it don't hurt...
replace-cpu-flags G3 750
replace-cpu-flags G4 7400
replace-cpu-flags G5 7400
# XXX: should add a sed or something to query all supported flags
# from the gcc source and trim everything else ...
filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs
filter-flags -f{no-,}stack-protector{,-all}
filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
fi
if tc_version_is_at_least 3.4 ; then
case $(tc-arch) in
amd64|x86)
filter-flags '-mcpu=*'
tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287
if tc_version_is_between 4.6 4.7 ; then
# https://bugs.gentoo.org/411333
# https://bugs.gentoo.org/466454
replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686
fi
;;
alpha)
# https://bugs.gentoo.org/454426
append-ldflags -Wl,--no-relax
;;
sparc)
# temporary workaround for random ICEs reproduced by multiple users
# https://bugs.gentoo.org/457062
tc_version_is_between 4.6 4.8 && MAKEOPTS+=" -j1"
;;
*-macos)
# http://gcc.gnu.org/PR25127
tc_version_is_between 4.0 4.2 && \
filter-flags '-mcpu=*' '-march=*' '-mtune=*'
;;
esac
fi
strip-unsupported-flags
# these are set here so we have something sane at configure time
if is_crosscompile ; then
# Set this to something sane for both native and target
CFLAGS="-O2 -pipe"
FFLAGS=${CFLAGS}
FCFLAGS=${CFLAGS}
local VAR="CFLAGS_"${CTARGET//-/_}
CXXFLAGS=${!VAR}
fi
export GCJFLAGS=${GCJFLAGS:-${CFLAGS}}
}
setup_minispecs_gcc_build_specs() {
# Setup the "build.specs" file for gcc 4.3 to use when building.
if hardened_gcc_works pie ; then
cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
fi
if hardened_gcc_works ssp ; then
for s in ssp sspall ; do
cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
done
fi
for s in nostrict znow ; do
cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
done
export GCC_SPECS="${WORKDIR}"/build.specs
}
gcc-multilib-configure() {
if ! is_multilib ; then
confgcc+=( --disable-multilib )
# Fun times: if we are building for a target that has multiple
# possible ABI formats, and the user has told us to pick one
# that isn't the default, then not specifying it via the list
# below will break that on us.
else
confgcc+=( --enable-multilib )
fi
# translate our notion of multilibs into gcc's
local abi list
for abi in $(get_all_abis TARGET) ; do
local l=$(gcc-abi-map ${abi})
[[ -n ${l} ]] && list+=",${l}"
done
if [[ -n ${list} ]] ; then
case ${CTARGET} in
x86_64*)
- tc_version_is_at_least 4.7 && confgcc+=( --with-multilib-list=${list:1} )
+ tc_version_is_at_least 4.8 && confgcc+=( --with-multilib-list=${list:1} )
;;
esac
fi
}
gcc-abi-map() {
# Convert the ABI name we use in Gentoo to what gcc uses
local map=()
case ${CTARGET} in
mips*) map=("o32 32" "n32 n32" "n64 64") ;;
x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;;
esac
local m
for m in "${map[@]}" ; do
l=( ${m} )
[[ $1 == ${l[0]} ]] && echo ${l[1]} && break
done
}
#----> src_compile <----
toolchain_src_compile() {
- case ${EAPI:-0} in
- 0|1) toolchain_src_configure ;;
- esac
-
touch "${S}"/gcc/c-gperf.h
# Do not make manpages if we do not have perl ...
[[ ! -x /usr/bin/perl ]] \
&& find "${WORKDIR}"/build -name '*.[17]' | xargs touch
gcc_do_make ${GCC_MAKE_TARGET}
}
gcc_do_make() {
# This function accepts one optional argument, the make target to be used.
# If omitted, gcc_do_make will try to guess whether it should use all,
# or bootstrap-lean depending on CTARGET and arch.
# An example of how to use this function:
#
# gcc_do_make all-target-libstdc++-v3
[[ -n ${1} ]] && GCC_MAKE_TARGET=${1}
# default target
if is_crosscompile || tc-is-cross-compiler ; then
# 3 stage bootstrapping doesnt quite work when you cant run the
# resulting binaries natively ^^;
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
else
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
fi
# Older versions of GCC could not do profiledbootstrap in parallel due to
# collisions with profiling info.
# boundschecking also seems to introduce parallel build issues.
if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] || use_if_iuse boundschecking ; then
! tc_version_is_at_least 4.6 && export MAKEOPTS="${MAKEOPTS} -j1"
fi
if [[ ${GCC_MAKE_TARGET} == "all" ]] ; then
STAGE1_CFLAGS=${STAGE1_CFLAGS-"${CFLAGS}"}
elif [[ $(gcc-version) == "3.4" && ${GCC_BRANCH_VER} == "3.4" ]] && gcc-specs-ssp ; then
# See bug #79852
STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O2"}
fi
if is_crosscompile; then
# In 3.4, BOOT_CFLAGS is never used on a crosscompile...
# but I'll leave this in anyways as someone might have had
# some reason for putting it in here... --eradicator
BOOT_CFLAGS=${BOOT_CFLAGS-"-O2"}
else
# we only want to use the system's CFLAGS if not building a
# cross-compiler.
BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
fi
einfo "Compiling ${PN} (${GCC_MAKE_TARGET})..."
pushd "${WORKDIR}"/build >/dev/null
emake \
LDFLAGS="${LDFLAGS}" \
STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
LIBPATH="${LIBPATH}" \
BOOT_CFLAGS="${BOOT_CFLAGS}" \
${GCC_MAKE_TARGET} \
|| die "emake failed with ${GCC_MAKE_TARGET}"
if ! is_crosscompile && use cxx && use_if_iuse doc ; then
if type -p doxygen > /dev/null ; then
if tc_version_is_at_least 4.3 ; then
cd "${CTARGET}"/libstdc++-v3/doc
emake doc-man-doxygen || ewarn "failed to make docs"
elif tc_version_is_at_least 3.0 ; then
cd "${CTARGET}"/libstdc++-v3
emake doxygen-man || ewarn "failed to make docs"
fi
+ # Clean bogus manpages. #113902
+ find -name '*_build_*' -delete
+ # Blow away generated directory references. Newer versions of gcc
+ # have gotten better at this, but not perfect. This is easier than
+ # backporting all of the various doxygen patches. #486754
+ find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \
+ xargs rm -f
else
ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed"
fi
fi
popd >/dev/null
}
#---->> src_test <<----
toolchain_src_test() {
if use regression-test ; then
cd "${WORKDIR}"/build
emake -k check
fi
}
#---->> src_install <<----
toolchain_src_install() {
cd "${WORKDIR}"/build
# Do allow symlinks in private gcc include dir as this can break the build
find gcc/include*/ -type l -delete
# Copy over the info pages. We disabled their generation earlier, but the
# build system only expects to install out of the build dir, not the source. #464008
mkdir -p gcc/doc
local x=
for x in "${S}"/gcc/doc/*.info* ; do
if [[ -f ${x} ]] ; then
cp "${x}" gcc/doc/ || die
fi
done
- # Remove generated headers, as they can cause things to break
- # (ncurses, openssl, etc).
+ # We remove the generated fixincludes, as they can cause things to break
+ # (ncurses, openssl, etc). We do not prevent them from being built, as
+ # in the following commit which we revert:
+ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648
+ # This is because bsd userland needs fixedincludes to build gcc, while
+ # linux does not. Both can dispose of them afterwards.
while read x ; do
grep -q 'It has been auto-edited by fixincludes from' "${x}" \
&& rm -f "${x}"
done < <(find gcc/include*/ -name '*.h')
# Do the 'make install' from the build directory
S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die
# Punt some tools which are really only useful while building gcc
find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
# This one comes with binutils
find "${D}" -name libiberty.a -delete
# Move the libraries to the proper location
gcc_movelibs
# Basic sanity check
if ! is_crosscompile ; then
local EXEEXT
eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
[[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${D}"
fi
dodir /etc/env.d/gcc
create_gcc_env_entry
# Setup the gcc_env_entry for hardened gcc 4 with minispecs
want_minispecs && copy_minispecs_gcc_specs
# Make sure we dont have stuff lying around that
# can nuke multiple versions of gcc
gcc_slot_java
dodir /usr/bin
cd "${D}"${BINPATH}
# Ugh: we really need to auto-detect this list.
# It's constantly out of date.
for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do
# For some reason, g77 gets made instead of ${CTARGET}-g77...
# this should take care of that
[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
if [[ -f ${CTARGET}-${x} ]] ; then
if ! is_crosscompile ; then
ln -sf ${CTARGET}-${x} ${x}
dosym ${BINPATH}/${CTARGET}-${x} \
/usr/bin/${x}-${GCC_CONFIG_VER}
fi
# Create versioned symlinks
dosym ${BINPATH}/${CTARGET}-${x} \
/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
fi
if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
fi
done
# Now do the fun stripping stuff
env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
# gcc used to install helper binaries in lib/ but then moved to libexec/
[[ -d ${D}${PREFIX}/libexec/gcc ]] && \
env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}"
cd "${S}"
if is_crosscompile; then
rm -rf "${D}"/usr/share/{man,info}
rm -rf "${D}"${DATAPATH}/{man,info}
else
if tc_version_is_at_least 3.0 ; then
local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man)
if [[ -d ${cxx_mandir} ]] ; then
- # clean bogus manpages #113902
- find "${cxx_mandir}" -name '*_build_*' -exec rm {} \;
cp -r "${cxx_mandir}"/man? "${D}/${DATAPATH}"/man/
fi
fi
has noinfo ${FEATURES} \
&& rm -r "${D}/${DATAPATH}"/info \
|| prepinfo "${DATAPATH}"
has noman ${FEATURES} \
&& rm -r "${D}/${DATAPATH}"/man \
|| prepman "${DATAPATH}"
fi
# prune empty dirs left behind
find "${D}" -depth -type d -delete 2>/dev/null
# install testsuite results
if use regression-test; then
docinto testsuite
find "${WORKDIR}"/build -type f -name "*.sum" -print0 | xargs -0 dodoc
find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -print0 \
| xargs -0 dodoc
fi
# Rather install the script, else portage with changing $FILESDIR
# between binary and source package borks things ....
if ! is_crosscompile ; then
insinto "${DATAPATH}"
- if tc_version_is_at_least 4.0 ; then
- newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die
- find "${D}/${LIBPATH}" -name libstdc++.la -type f -exec rm "{}" \;
- find "${D}/${LIBPATH}" -name "lib?san.la" -type f -exec rm "{}" \; # 487550
- else
- doins "${GCC_FILESDIR}"/awk/fixlafiles.awk || die
- fi
+ newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die
+ find "${D}/${LIBPATH}" -name libstdc++.la -type f -delete
+ find "${D}/${LIBPATH}" -name 'lib*san.la' -type f -delete #487550 #546700
exeinto "${DATAPATH}"
doexe "${GCC_FILESDIR}"/fix_libtool_files.sh || die
doexe "${GCC_FILESDIR}"/c{89,99} || die
fi
# Use gid of 0 because some stupid ports don't have
# the group 'root' set to gid 0. Send to /dev/null
# for people who are testing as non-root.
chown -R root:0 "${D}"${LIBPATH} 2>/dev/null
# Move pretty-printers to gdb datadir to shut ldconfig up
local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
pushd "${D}"${LIBPATH} >/dev/null
for py in $(find . -name '*-gdb.py') ; do
local multidir=${py%/*}
insinto "${gdbdir}/${multidir}"
sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128
doins "${py}" || die
rm "${py}" || die
done
popd >/dev/null
# Don't scan .gox files for executable stacks - false positives
export QA_EXECSTACK="usr/lib*/go/*/*.gox"
export QA_WX_LOAD="usr/lib*/go/*/*.gox"
# Disable RANDMMAP so PCH works. #301299
if tc_version_is_at_least 4.3 ; then
pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1"
pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus"
fi
}
# Move around the libs to the right location. For some reason,
# when installing gcc, it dumps internal libraries into /usr/lib
# instead of the private gcc lib path
gcc_movelibs() {
# older versions of gcc did not support --print-multi-os-directory
tc_version_is_at_least 3.2 || return 0
local x multiarg removedirs=""
for multiarg in $($(XGCC) -print-multi-lib) ; do
multiarg=${multiarg#*;}
multiarg=${multiarg//@/ -}
local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory)
local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory)
local TODIR=${D}${LIBPATH}/${MULTIDIR}
local FROMDIR=
[[ -d ${TODIR} ]] || mkdir -p ${TODIR}
for FROMDIR in \
${LIBPATH}/${OS_MULTIDIR} \
${LIBPATH}/../${MULTIDIR} \
${PREFIX}/lib/${OS_MULTIDIR} \
${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR}
do
removedirs="${removedirs} ${FROMDIR}"
FROMDIR=${D}${FROMDIR}
if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then
local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null)
if [[ -n ${files} ]] ; then
- mv ${files} "${TODIR}"
+ mv ${files} "${TODIR}" || die
fi
fi
done
fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
# SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}"
for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do
[[ -f ${x} ]] || continue
- sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}"
+ sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}" || die
mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die
done
done
# We remove directories separately to avoid this case:
# mv SRC/lib/../lib/*.o DEST
# rmdir SRC/lib/../lib/
# mv SRC/lib/../lib32/*.o DEST # Bork
for FROMDIR in ${removedirs} ; do
rmdir "${D}"${FROMDIR} >& /dev/null
done
find "${D}" -type d | xargs rmdir >& /dev/null
}
# make sure the libtool archives have libdir set to where they actually
# -are-, and not where they -used- to be. also, any dependencies we have
# on our own .la files need to be updated.
fix_libtool_libdir_paths() {
+ local libpath="$1"
+
pushd "${D}" >/dev/null
- pushd "./${1}" >/dev/null
+ pushd "./${libpath}" >/dev/null
local dir="${PWD#${D%/}}"
local allarchives=$(echo *.la)
allarchives="\(${allarchives// /\\|}\)"
popd >/dev/null
- sed -i \
- -e "/^libdir=/s:=.*:='${dir}':" \
- ./${dir}/*.la
- sed -i \
- -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
- $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
- ./${dir}/*.la
+ # The libdir might not have any .la files. #548782
+ find "./${dir}" -maxdepth 1 -name '*.la' \
+ -exec sed -i -e "/^libdir=/s:=.*:='${dir}':" {} + || die
+ # Would be nice to combine these, but -maxdepth can not be specified
+ # on sub-expressions.
+ find "./${PREFIX}"/lib* -maxdepth 3 -name '*.la' \
+ -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die
+ find "./${dir}/" -maxdepth 1 -name '*.la' \
+ -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die
popd >/dev/null
}
create_gcc_env_entry() {
dodir /etc/env.d/gcc
local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
local gcc_specs_file
local gcc_envd_file="${D}${gcc_envd_base}"
if [[ -z $1 ]] ; then
# I'm leaving the following commented out to remind me that it
# was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
# on chroot or in non-toolchain.eclass gcc ebuilds!
#gcc_specs_file="${LIBPATH}/specs"
gcc_specs_file=""
else
gcc_envd_file+="-$1"
gcc_specs_file="${LIBPATH}/$1.specs"
fi
# We want to list the default ABI's LIBPATH first so libtool
# searches that directory first. This is a temporary
# workaround for libtool being stupid and using .la's from
# conflicting ABIs by using the first one in the search path
local ldpaths mosdirs
if tc_version_is_at_least 3.2 ; then
local mdir mosdir abi ldpath
for abi in $(get_all_abis TARGET) ; do
mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
ldpath=${LIBPATH}
[[ ${mdir} != "." ]] && ldpath+="/${mdir}"
ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
done
else
# Older gcc's didn't do multilib, so logic is simple.
ldpaths=${LIBPATH}
fi
cat <<-EOF > ${gcc_envd_file}
PATH="${BINPATH}"
ROOTPATH="${BINPATH}"
GCC_PATH="${BINPATH}"
LDPATH="${ldpaths}"
MANPATH="${DATAPATH}/man"
INFOPATH="${DATAPATH}/info"
STDCXX_INCDIR="${STDCXX_INCDIR##*/}"
CTARGET="${CTARGET}"
GCC_SPECS="${gcc_specs_file}"
MULTIOSDIRS="${mosdirs}"
EOF
}
copy_minispecs_gcc_specs() {
# setup the hardenedno* specs files and the vanilla specs file.
if hardened_gcc_works ; then
create_gcc_env_entry hardenednopiessp
fi
if hardened_gcc_works pie ; then
create_gcc_env_entry hardenednopie
fi
if hardened_gcc_works ssp ; then
create_gcc_env_entry hardenednossp
fi
create_gcc_env_entry vanilla
insinto ${LIBPATH}
doins "${WORKDIR}"/specs/*.specs || die "failed to install specs"
# Build system specs file which, if it exists, must be a complete set of
# specs as it completely and unconditionally overrides the builtin specs.
if ! tc_version_is_at_least 4.4 ; then
$(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs
cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
doins "${WORKDIR}"/specs/specs || die "failed to install the specs file"
fi
}
gcc_slot_java() {
local x
# Move Java headers to compiler-specific dir
for x in "${D}"${PREFIX}/include/gc*.h "${D}"${PREFIX}/include/j*.h ; do
[[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/include/
done
for x in gcj gnu java javax org ; do
if [[ -d ${D}${PREFIX}/include/${x} ]] ; then
dodir /${LIBPATH}/include/${x}
mv -f "${D}"${PREFIX}/include/${x}/* "${D}"${LIBPATH}/include/${x}/
rm -rf "${D}"${PREFIX}/include/${x}
fi
done
if [[ -d ${D}${PREFIX}/lib/security ]] || [[ -d ${D}${PREFIX}/$(get_libdir)/security ]] ; then
dodir /${LIBPATH}/security
mv -f "${D}"${PREFIX}/lib*/security/* "${D}"${LIBPATH}/security
rm -rf "${D}"${PREFIX}/lib*/security
fi
# Move random gcj files to compiler-specific directories
for x in libgcj.spec logging.properties ; do
x="${D}${PREFIX}/lib/${x}"
[[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/
done
# Rename jar because it could clash with Kaffe's jar if this gcc is
# primary compiler (aka don't have the -<version> extension)
cd "${D}"${BINPATH}
[[ -f jar ]] && mv -f jar gcj-jar
}
#---->> pkg_post* <<----
toolchain_pkg_postinst() {
do_gcc_config
if ! is_crosscompile ; then
echo
ewarn "If you have issues with packages unable to locate libstdc++.la,"
ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions."
echo
ewarn "You might want to review the GCC upgrade guide when moving between"
ewarn "major versions (like 4.2 to 4.3):"
ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
echo
# Clean up old paths
rm -f "${ROOT}"/*/rcscripts/awk/fixlafiles.awk "${ROOT}"/sbin/fix_libtool_files.sh
rmdir "${ROOT}"/*/rcscripts{/awk,} 2>/dev/null
mkdir -p "${ROOT}"/usr/{share/gcc-data,sbin,bin}
cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/usr/share/gcc-data/ || die
cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/usr/sbin/ || die
# Since these aren't critical files and portage sucks with
# handling of binpkgs, don't require these to be found
cp "${ROOT}/${DATAPATH}"/c{89,99} "${ROOT}"/usr/bin/ 2>/dev/null
fi
if use regression-test ; then
elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite"
echo
fi
if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then
einfo "This GCC ebuild is provided for your convenience, and the use"
einfo "of this compiler is not supported by the Gentoo Developers."
einfo "Please report bugs to upstream at http://gcc.gnu.org/bugzilla/"
fi
}
toolchain_pkg_postrm() {
# to make our lives easier (and saner), we do the fix_libtool stuff here.
# rather than checking SLOT's and trying in upgrade paths, we just see if
# the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
# unmerging. if it does, that means this was a simple re-emerge.
# clean up the cruft left behind by cross-compilers
if is_crosscompile ; then
if [[ -z $(ls "${ROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
rm -f "${ROOT}"/etc/env.d/gcc/config-${CTARGET}
rm -f "${ROOT}"/etc/env.d/??gcc-${CTARGET}
rm -f "${ROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
fi
return 0
fi
# ROOT isnt handled by the script
[[ ${ROOT} != "/" ]] && return 0
if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then
# make sure the profile is sane during same-slot upgrade #289403
do_gcc_config
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
/usr/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}
if [[ -n ${BRANCH_UPDATE} ]] ; then
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}'"
/usr/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}
fi
fi
return 0
}
do_gcc_config() {
if ! should_we_gcc_config ; then
env -i ROOT="${ROOT}" gcc-config --use-old --force
return 0
fi
local current_gcc_config="" current_specs="" use_specs=""
current_gcc_config=$(env -i ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>/dev/null)
if [[ -n ${current_gcc_config} ]] ; then
# figure out which specs-specific config is active
current_specs=$(gcc-config -S ${current_gcc_config} | awk '{print $3}')
[[ -n ${current_specs} ]] && use_specs=-${current_specs}
fi
if [[ -n ${use_specs} ]] && \
[[ ! -e ${ROOT}/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}${use_specs} ]]
then
ewarn "The currently selected specs-specific gcc config,"
ewarn "${current_specs}, doesn't exist anymore. This is usually"
ewarn "due to enabling/disabling hardened or switching to a version"
ewarn "of gcc that doesnt create multiple specs files. The default"
ewarn "config will be used, and the previous preference forgotten."
use_specs=""
fi
gcc-config ${CTARGET}-${GCC_CONFIG_VER}${use_specs}
}
should_we_gcc_config() {
# if the current config is invalid, we definitely want a new one
# Note: due to bash quirkiness, the following must not be 1 line
local curr_config
curr_config=$(env -i ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>&1) || return 0
# if the previously selected config has the same major.minor (branch) as
# the version we are installing, then it will probably be uninstalled
# for being in the same SLOT, make sure we run gcc-config.
local curr_config_ver=$(env -i ROOT="${ROOT}" gcc-config -S ${curr_config} | awk '{print $2}')
local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver})
# If we're using multislot, just run gcc-config if we're installing
# to the same profile as the current one.
use multislot && return $([[ ${curr_config_ver} == ${GCC_CONFIG_VER} ]])
if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then
return 0
else
# if we're installing a genuinely different compiler version,
# we should probably tell the user -how- to switch to the new
# gcc version, since we're not going to do it for him/her.
# We don't want to switch from say gcc-3.3 to gcc-3.4 right in
# the middle of an emerge operation (like an 'emerge -e world'
# which could install multiple gcc versions).
# Only warn if we're installing a pkg as we might be called from
# the pkg_{pre,post}rm steps. #446830
if [[ ${EBUILD_PHASE} == *"inst" ]] ; then
einfo "The current gcc config appears valid, so it will not be"
einfo "automatically switched for you. If you would like to"
einfo "switch to the newly installed gcc version, do the"
einfo "following:"
echo
einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}"
einfo "source /etc/profile"
echo
fi
return 1
fi
}
#---->> support and misc functions <<----
# This is to make sure we don't accidentally try to enable support for a
# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc.
#
# Also add a hook so special ebuilds (kgcc64) can control which languages
# exactly get enabled
gcc-lang-supported() {
grep ^language=\"${1}\" "${S}"/gcc/*/config-lang.in > /dev/null || return 1
[[ -z ${TOOLCHAIN_ALLOWED_LANGS} ]] && return 0
has $1 ${TOOLCHAIN_ALLOWED_LANGS}
}
is_ada() {
gcc-lang-supported ada || return 1
use ada
}
is_cxx() {
gcc-lang-supported 'c++' || return 1
! is_crosscompile && tc_version_is_at_least 4.8 && return 0
use cxx
}
is_d() {
gcc-lang-supported d || return 1
use_if_iuse d
}
is_f77() {
gcc-lang-supported f77 || return 1
use fortran
}
is_f95() {
gcc-lang-supported f95 || return 1
use fortran
}
is_fortran() {
gcc-lang-supported fortran || return 1
use fortran
}
is_gcj() {
gcc-lang-supported java || return 1
use cxx && use_if_iuse gcj
}
is_go() {
gcc-lang-supported go || return 1
use cxx && use_if_iuse go
}
is_multilib() {
tc_version_is_at_least 3 || return 1
use multilib
}
is_objc() {
gcc-lang-supported objc || return 1
use_if_iuse objc
}
is_objcxx() {
gcc-lang-supported 'obj-c++' || return 1
use cxx && use_if_iuse objc++
}
# Grab a variable from the build system (taken from linux-info.eclass)
get_make_var() {
local var=$1 makefile=${2:-${WORKDIR}/build/Makefile}
echo -e "e:\\n\\t@echo \$(${var})\\ninclude ${makefile}" | \
r=${makefile%/*} emake --no-print-directory -s -f - 2>/dev/null
}
XGCC() { get_make_var GCC_FOR_TARGET ; }
# The gentoo piessp patches allow for 3 configurations:
# 1) PIE+SSP by default
# 2) PIE by default
# 3) SSP by default
hardened_gcc_works() {
if [[ $1 == "pie" ]] ; then
# $gcc_cv_ld_pie is unreliable as it simply take the output of
# `ld --help | grep -- -pie`, that reports the option in all cases, also if
# the loader doesn't actually load the resulting executables.
# To avoid breakage, blacklist FreeBSD here at least
[[ ${CTARGET} == *-freebsd* ]] && return 1
want_pie || return 1
use_if_iuse nopie && return 1
hardened_gcc_is_stable pie
return $?
elif [[ $1 == "ssp" ]] ; then
[[ -n ${SPECS_VER} ]] || return 1
use_if_iuse nossp && return 1
hardened_gcc_is_stable ssp
return $?
else
# laziness ;)
hardened_gcc_works pie || return 1
hardened_gcc_works ssp || return 1
return 0
fi
}
hardened_gcc_is_stable() {
local tocheck
if [[ $1 == "pie" ]] ; then
if [[ ${CTARGET} == *-uclibc* ]] ; then
tocheck=${PIE_UCLIBC_STABLE}
else
tocheck=${PIE_GLIBC_STABLE}
fi
elif [[ $1 == "ssp" ]] ; then
if [[ ${CTARGET} == *-uclibc* ]] ; then
tocheck=${SSP_UCLIBC_STABLE}
elif [[ ${CTARGET} == *-gnu* ]] ; then
tocheck=${SSP_STABLE}
fi
else
die "hardened_gcc_stable needs to be called with pie or ssp"
fi
has $(tc-arch) ${tocheck} && return 0
return 1
}
want_minispecs() {
if tc_version_is_at_least 4.3.2 && use hardened ; then
if ! want_pie ; then
ewarn "PIE_VER or SPECS_VER is not defined in the GCC ebuild."
elif use vanilla ; then
ewarn "You will not get hardened features if you have the vanilla USE-flag."
elif use nopie && use nossp ; then
ewarn "You will not get hardened features if you have the nopie and nossp USE-flag."
elif ! hardened_gcc_works ; then
ewarn "Your $(tc-arch) arch is not supported."
else
return 0
fi
ewarn "Hope you know what you are doing. Hardened will not work."
return 0
fi
return 1
}
want_pie() {
! use hardened && [[ -n ${PIE_VER} ]] && use nopie && return 1
[[ -n ${PIE_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0
tc_version_is_at_least 4.3.2 && return 1
[[ -z ${PIE_VER} ]] && return 1
use !nopie && return 0
return 1
}
has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice"
toolchain_death_notice() {
if [[ -e "${WORKDIR}"/build ]] ; then
pushd "${WORKDIR}"/build >/dev/null
(echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log
[[ -e "${T}"/build.log ]] && cp "${T}"/build.log .
tar jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \
gccinfo.log build.log $(find -name config.log)
rm gccinfo.log build.log
eerror
eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report."
eerror
popd >/dev/null
fi
}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 0650b9d..f9ab6ff 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,17 +1,20 @@
+AUX 4.x/4.9-0x47-is-broadwell.patch 922 SHA256 12f2081c2325704ed6e899720649d2f33e59bfd4486eff5bd3c61c338b4fd8bf SHA512 0e54e2e22be131a8d9a69c24caf91cacd695104c1bcc32ed0e7f4205976e3987029d95a00aa136183b23cbe72f4b74ec157bfe800acddea55ab1e0a7d3e19f3f WHIRLPOOL f82a39b1b9169e3fa790f9415ffc76794c0c9ae0df3066a0083fb6373151a00fc5e8da499973e511dde18c90705b967753c65f01764f63edf1df73342342b860
+AUX 4.x/4.9-add-skylake.patch 4388 SHA256 3ce05fff3003bf85e6a9d22d30ebd643b1b12dd2668b9ac580647e5ff6400b3d SHA512 29675e267e55efa96a220b82257bef6d75303499ce932d7b020d0627a920d422ab646f738eab5fdbb2b8635ae90879f45139579d2ef65ca7e27e454c4ce1fcbd WHIRLPOOL e1813796f360fe86faa228e512f0f20f39875f0be424213ea1466b0a0368fa82c328b38cd81b1ae40db9a8b8e6512b173bae688ae6b0c29e4c76b9b57f5063c4
+AUX 4.x/4.9-haswell-float-optimize.patch 21243 SHA256 04e151f8b6cb1433efb94e8d139d9ab62140ffe88ec3c67e558adf4c112dd35c SHA512 84348701b5699b3964e1cc13335b1867178da315421c65d0de91a72e3b3355d8d86b4fe5edd5870878c875a1257357a4c91b429542d2b70ef5000db0da5651fd WHIRLPOOL 3243b848f0551cfadabee8274d115e122238334287e24fa5f6b687a506f617911fc787f01901ed5dbca5f003d2c266d96fd1bd1a31d003e298fea91885f455ec
AUX awk/fixlafiles.awk 7807 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c073e5c29433c3cdf9c5c SHA512 a39e09db4f34d1358de9e929b4c1e10b677d7e8aeffd6afb36d42543b18f1dfa77e3e26331e3fa1b556bae3d8c75ab4bd5796c7ccf2dda4eb365edb307828bed WHIRLPOOL 0cb6e5e96460514c17f3242d8fe936dc2545c07ca08c03ceb34730935435fde24d197300da54d4a19de86067f9e4bbc14178da2f7c03f4be57c89c81307f5d82
AUX awk/fixlafiles.awk-no_gcc_la 8596 SHA256 91e36c29133b6ff854bc84acd6cd2e9d07be6eaa73ef9b23e4f7bc6371107fab SHA512 a970ade3e0b57b3280dd01036a95338c4a7f0c7ec45e7aeb7255197df43e13a5fad8c565b4b345e3a0c8326f71ae7ab598b804eaeaa9d59eda8683195bccfe45 WHIRLPOOL e3da866b8902fbf639af545b43c3b6ccaca0f5d543647007f02e0b8bfc16a675463b8681e9fad11d6ce29517e099636f43708f880ef7a433e4578ee408c3b099
AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
AUX c99 446 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5 SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 WHIRLPOOL b888038b96615c7a0363555b407a3de2c1f17e34428fa16dfbf56fcf68875d6bcdecbc61b545d7f71842ff1909a3ffeff17165fa7f56b48f95adae22f5f8bff1
AUX fix_libtool_files.sh 1679 SHA256 0037e3f1303560f1ffadc61c7ed6bca13a41d6f2f70f196276938cda9dd158f0 SHA512 834beeb04f1057a0b1f79025fc9bbe0193ea8457055cc10b5b4c528a60e37ead7614a686aa6e7285e040161a91d4b5ff394539a33fc2f4b44be5c2514d0bb283 WHIRLPOOL c7e2f517e0c5c9a8930cd615f68222b44a6f227518ea71b5eb9b6436e1642be748d9cb4c0732f27df6c2ded2eb2c758d67ee9cb58e409f30814f988523dc649b
AUX gcc-configure-LANG.patch 2052 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 WHIRLPOOL 3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 WHIRLPOOL 39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb
DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad
DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
-DIST gcc-4.9.2-patches-1.0.tar.bz2 18213 SHA256 e4e9a665381beb4018779a14d5124528a9d5df0e0772f3b7639390d6bda51515 SHA512 27deba0db6a500b160829fdcf5fc9a70be4b4fbd45c89d18dd2d0808d42803657693d0ed0f2b664e020a0d2ac39cdfe550e397eb4c2a6f64220cae1e7a16ff20 WHIRLPOOL 7e04ed92038f19a9b00fe0022c2c7ce3df8621fccca95cb2da37333a5edcc0857efe96aed68f5c4b51db19ecd23ec1194412f1bc24730cea30db7b342c12dfdf
-DIST gcc-4.9.2-piepatches-v0.6.1.tar.bz2 14185 SHA256 590d11ea5723812fff3239c5eaed4b040b26a92586de0e42a84438f742eaac0b SHA512 89560e96bc205e848936acc4d3423ff5e1ea5ee478848edfe2b992585cea0df21eb102b1f1bee55c10568d4ca54bb3f4e8ae72aa695e34a908abfda3585fb992 WHIRLPOOL e6db4a2e5fdf762bd4f0fa70d630499bf6789a0c3b7ca193b455bb22f95f5f2983358ba9f28bd85b571a3a44a691ca797762302a1f2ea63ce170752f7e44128b
-DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
-DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
-DIST gcc-5-20150208.tar.bz2 89692570 SHA256 a7c07a0be6ae91a398605f14653d72f41b3db1052ec636bb17a62fbbf6eb16e1 SHA512 48a7dd71f1c044a89576609e22712fc6f5624be677e3b38bdb79782bcb7ea81a49ce7e3787515f621855ca868041a52fbad214430db626156bef88edff930ac0 WHIRLPOOL 56ca4fc1ade53aebf68c61522b8ea2d19e65e85c650036dc5bad6c239b70aa668ef8275c15035cef06b2bb53dffd978cd6ab652c7d731e22e0c051489b7e17b2
-EBUILD gcc-4.9.2.ebuild 1343 SHA256 801f1cc98b27dfcfd1cfcb112c82131ed12f700595403ad76adeeec76f0a7b1e SHA512 12351ae88d87b7b3602f42c8e236965746708726a1bf4d22f4f95301cb62b564e696287ce1c5cf8914024734ebb54e01e28a210981d27dc3646485a9c499535f WHIRLPOOL 49e59732de3bc456a3ea673d399d277945aafe07a0c7b3385e1a5138ae640ef41fe6c94b0adaeb07ca86efae73eb5f943bd3d2a46077a3ce7d2f051cc971c10f
-EBUILD gcc-5.0_alpha20150208.ebuild 1298 SHA256 2d30c025325aef1e42804dad4769c254dfccfbef425346ed067adeb00b0b855b SHA512 55d552af87ff9c5ede5874e6dafb87dc058ffeeb092ed81c3879f2320035d8041794663fd271ffdf2566b8aed70665299f3c80fecc78e59507076a779e849ff3 WHIRLPOOL 3e4c205327325f9da7fc5b4dc7e81fd33961999f6adc93d288c5d177f40a0bfe9b1fcaa1b47a4c7d9fbb2e4da70601d167ffe6df0c3d11ec1750f89475c8f621
+DIST gcc-4.9.3-patches-1.2.tar.bz2 23657 SHA256 1eb0b19e9f048ba30b897154aa51d4c84e5c65eeaa35faa2614af5219b06529b SHA512 05eeb60c7b8a99f3b283caea06a8e1a015c41756496b67ed912467cb437dcb9d3bcefc235e6e1dd79c6f7364f378af6a3ebf52b333610a25a6f85cb10c4394b6 WHIRLPOOL d457b4fe4257cc4ef57317187b979d0a97f5c55d8ba4ddd2133e37d1f63299bfe35c3e11ab4efecc5c4f0361789773e5035b216d7fbbe4cdf4bc0c41be0aa655
+DIST gcc-4.9.3-piepatches-v0.6.2.tar.bz2 14261 SHA256 c92de44a4c79ffdd59fc78ebfb5262cd26171808e34f6cb77646c314fe4bc82e SHA512 26f273877926353758f922447c282a8bf30d42c3f34d35c04feee175506a1e06fe18cbc63bbb3a3f744cfa9b449feec3223af251c12f8784565ff90364dc65f2 WHIRLPOOL a9c5d1fc389630c4f46b82b9bccb0049fd3eefe77d11e2cb6f4227050df809932b12fa2ce9b6451d08af084ef03c003d007c5963ad99c26990a3fdfd801c7dbf
+DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
+DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
+DIST gcc-5-20150818.tar.bz2 91281973 SHA256 5f65914dbf332fadafdc91c4682420c97b720b41d9ad5e8a083d1e5f2c7bfdb2 SHA512 862d1ce048403f431dd4a09e6a46d5be836ea87b1a543b66ce651ec89ed1d1a37f0b2ce48d92cdaf898402edf89e68fb4be1533d4206a21f10546714080048ad WHIRLPOOL 4c492ebf3dd8e0998bb3180fe9c4bb6828fc64c1c20ff8805da08a0d5c738fddc725c6b3c0177d2758a0322561a2871c0dbb49ea676e0f5db8c55bead3e9d5fd
+EBUILD gcc-4.9.3.ebuild 1472 SHA256 f97224556b16717418b6f198fa3ccfa6749a50bb6955c249a0de4381b4dc1fb3 SHA512 ac6f80851544dead5967464a4a63cd1bcaa5df132f6720e502b6de904d05d6151734c458bf9a461e6a38fcbbe8f9e3e18e79a03fdb7225fa7932e32c19aa1935 WHIRLPOOL 3414aa927b831e2b826672702271b6fb45612bb67945f01af91d3970cc0c5bbddbc128da9e08fd903ca0e475c0ec83e170c3fde8a45a8fd55eacd34c23381c79
+EBUILD gcc-5.0_alpha20150818.ebuild 1300 SHA256 14251ddd4be1de4211cb46b1984345acd31191900fd3801e2eafd5217fc45650 SHA512 420aa0ff8c85aa425f792ff8b56f0d7a0fcecb1da46ffe6cc52d28a5daebcbc89f1d53689a27c810d583655cc5c500aeec5c847fccb830d08eed846119ad2764 WHIRLPOOL c5a1faaf5a293a5d00de05567beea7351a610c9315c563941aa3902ce354e58aaf5d51f5eb819ab61b8424cee8cf000f0d4a3049916f327d21e62db31da892a2
diff --git a/sys-devel/gcc/files/4.x/4.9-0x47-is-broadwell.patch b/sys-devel/gcc/files/4.x/4.9-0x47-is-broadwell.patch
new file mode 100644
index 0000000..7e5efb8
--- /dev/null
+++ b/sys-devel/gcc/files/4.x/4.9-0x47-is-broadwell.patch
@@ -0,0 +1,24 @@
+diff --git a/gcc/testsuite/gcc.target/i386/builtin_target.c b/gcc/testsuite/gcc.target/i386/builtin_target.c
+index af73338..a90080a 100644
+--- a/gcc/testsuite/gcc.target/i386/builtin_target.c
++++ b/gcc/testsuite/gcc.target/i386/builtin_target.c
+@@ -74,6 +74,7 @@ check_intel_cpu_model (unsigned int family, unsigned int model,
+ assert (__builtin_cpu_is ("haswell"));
+ break;
+ case 0x3d:
++ case 0x47:
+ case 0x4f:
+ case 0x56:
+ /* Broadwell. */
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index 7972ced..df9644a 100644
+--- a/libgcc/config/i386/cpuinfo.c
++++ b/libgcc/config/i386/cpuinfo.c
+@@ -228,6 +228,7 @@ get_intel_cpu (unsigned int family, unsigned int model, unsigned int brand_id)
+ __cpu_model.__cpu_subtype = INTEL_COREI7_HASWELL;
+ break;
+ case 0x3d:
++ case 0x47:
+ case 0x4f:
+ case 0x56:
+ /* Broadwell. */
diff --git a/sys-devel/gcc/files/4.x/4.9-add-skylake.patch b/sys-devel/gcc/files/4.x/4.9-add-skylake.patch
new file mode 100644
index 0000000..7d8b098
--- /dev/null
+++ b/sys-devel/gcc/files/4.x/4.9-add-skylake.patch
@@ -0,0 +1,116 @@
+diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
+index 992f91f..10d452b 100644
+--- a/gcc/config/i386/driver-i386.c
++++ b/gcc/config/i386/driver-i386.c
+@@ -720,6 +720,11 @@ const char *host_detect_local_cpu (int argc, const char **argv)
+ /* Broadwell. */
+ cpu = "broadwell";
+ break;
++ case 0x4e:
++ case 0x5e:
++ /* Skylake. */
++ cpu = "skylake";
++ break;
+ case 0x57:
+ /* Knights Landing. */
+ cpu = "knl";
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+old mode 100644
+new mode 100755
+index 6a15836..fe29933
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -3142,6 +3142,8 @@ ix86_option_override_internal (bool main_args_p,
+ | PTA_FMA | PTA_MOVBE | PTA_HLE)
+ #define PTA_BROADWELL \
+ (PTA_HASWELL | PTA_ADX | PTA_PRFCHW | PTA_RDSEED)
++#define PTA_SKYLAKE \
++ (PTA_BROADWELL | PTA_CLFLUSHOPT | PTA_XSAVEC | PTA_XSAVES)
+ #define PTA_BONNELL \
+ (PTA_CORE2 | PTA_MOVBE)
+ #define PTA_SILVERMONT \
+@@ -3201,6 +3203,7 @@ ix86_option_override_internal (bool main_args_p,
+ {"haswell", PROCESSOR_HASWELL, CPU_NEHALEM, PTA_HASWELL},
+ {"core-avx2", PROCESSOR_HASWELL, CPU_NEHALEM, PTA_HASWELL},
+ {"broadwell", PROCESSOR_HASWELL, CPU_NEHALEM, PTA_BROADWELL},
++ {"skylake", PROCESSOR_HASWELL, CPU_NEHALEM, PTA_SKYLAKE},
+ {"bonnell", PROCESSOR_BONNELL, CPU_ATOM, PTA_BONNELL},
+ {"atom", PROCESSOR_BONNELL, CPU_ATOM, PTA_BONNELL},
+ {"silvermont", PROCESSOR_SILVERMONT, CPU_SLM, PTA_SILVERMONT},
+@@ -32431,7 +32434,8 @@ fold_builtin_cpu (tree fndecl, tree *args)
+ M_AMDFAM15H_BDVER4,
+ M_INTEL_COREI7_IVYBRIDGE,
+ M_INTEL_COREI7_HASWELL,
+- M_INTEL_COREI7_BROADWELL
++ M_INTEL_COREI7_BROADWELL,
++ M_INTEL_COREI7_SKYLAKE
+ };
+
+ static struct _arch_names_table
+@@ -32453,6 +32457,7 @@ fold_builtin_cpu (tree fndecl, tree *args)
+ {"ivybridge", M_INTEL_COREI7_IVYBRIDGE},
+ {"haswell", M_INTEL_COREI7_HASWELL},
+ {"broadwell", M_INTEL_COREI7_BROADWELL},
++ {"skylake", M_INTEL_COREI7_SKYLAKE},
+ {"bonnell", M_INTEL_BONNELL},
+ {"silvermont", M_INTEL_SILVERMONT},
+ {"amdfam10h", M_AMDFAM10H},
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index c9b86ab..73fcddf 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -14829,6 +14829,12 @@ Intel Broadwell CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, SSE3, SSSE3,
+ SSE4.1, SSE4.2, POPCNT, AVX, AVX2, AES, PCLMUL, FSGSBASE, RDRND, FMA,
+ BMI, BMI2, F16C, RDSEED, ADCX and PREFETCHW instruction set support.
+
++@item skylake
++Intel Skylake CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, SSE3, SSSE3,
++SSE4.1, SSE4.2, POPCNT, AVX, AVX2, AES, PCLMUL, FSGSBASE, RDRND, FMA,
++BMI, BMI2, F16C, RDSEED, ADCX, PREFETCHW, CLFLUSHOPT, XSAVEC and
++XSAVES instruction set support.
++
+ @item bonnell
+ Intel Bonnell CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, SSE3 and SSSE3
+ instruction set support.
+diff --git a/gcc/testsuite/gcc.target/i386/builtin_target.c b/gcc/testsuite/gcc.target/i386/builtin_target.c
+index a90080a..350ae1f 100644
+--- a/gcc/testsuite/gcc.target/i386/builtin_target.c
++++ b/gcc/testsuite/gcc.target/i386/builtin_target.c
+@@ -81,6 +81,12 @@ check_intel_cpu_model (unsigned int family, unsigned int model,
+ assert (__builtin_cpu_is ("corei7"));
+ assert (__builtin_cpu_is ("broadwell"));
+ break;
++ case 0x4e:
++ case 0x5e:
++ /* Skylake. */
++ assert (__builtin_cpu_is ("corei7"));
++ assert (__builtin_cpu_is ("skylake"));
++ break;
+ case 0x17:
+ case 0x1d:
+ /* Penryn. */
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index df9644a..44a9368 100644
+--- a/libgcc/config/i386/cpuinfo.c
++++ b/libgcc/config/i386/cpuinfo.c
+@@ -76,6 +76,7 @@ enum processor_subtypes
+ INTEL_COREI7_IVYBRIDGE,
+ INTEL_COREI7_HASWELL,
+ INTEL_COREI7_BROADWELL,
++ INTEL_COREI7_SKYLAKE,
+ CPU_SUBTYPE_MAX
+ };
+
+@@ -235,6 +236,12 @@ get_intel_cpu (unsigned int family, unsigned int model, unsigned int brand_id)
+ __cpu_model.__cpu_type = INTEL_COREI7;
+ __cpu_model.__cpu_subtype = INTEL_COREI7_BROADWELL;
+ break;
++ case 0x4e:
++ case 0x5e:
++ /* Skylake. */
++ __cpu_model.__cpu_type = INTEL_COREI7;
++ __cpu_model.__cpu_subtype = INTEL_COREI7_SKYLAKE;
++ break;
+ case 0x17:
+ case 0x1d:
+ /* Penryn. */
diff --git a/sys-devel/gcc/files/4.x/4.9-haswell-float-optimize.patch b/sys-devel/gcc/files/4.x/4.9-haswell-float-optimize.patch
new file mode 100644
index 0000000..c33395a
--- /dev/null
+++ b/sys-devel/gcc/files/4.x/4.9-haswell-float-optimize.patch
@@ -0,0 +1,586 @@
+diff --git a/gcc/config/i386/core2.md b/gcc/config/i386/core2.md
+index 53df9ee..3042879 100644
+--- a/gcc/config/i386/core2.md
++++ b/gcc/config/i386/core2.md
+@@ -77,9 +77,9 @@
+ ;; port 3 for store address calculations, port 4 for memory stores, and
+ ;; ports 0, 1 and 5 for everything else.
+
+-(define_cpu_unit "c2_p0,c2_p1,c2_p5" "core2_core")
+-(define_cpu_unit "c2_p2" "core2_load")
+-(define_cpu_unit "c2_p3,c2_p4" "core2_store")
++(define_cpu_unit "c2_p0,c2_p1,c2_p5,c2_p6" "core2_core")
++(define_cpu_unit "c2_p2,c2_p3" "core2_load")
++(define_cpu_unit "c2_p4,c2_p7" "core2_store")
+ (define_cpu_unit "c2_idiv" "core2_idiv")
+ (define_cpu_unit "c2_fdiv" "core2_fdiv")
+ (define_cpu_unit "c2_ssediv" "core2_ssediv")
+@@ -118,50 +118,50 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "imov,imovx")))
+- "c2_decodern,(c2_p0|c2_p1|c2_p5)")
++ "c2_decodern,(c2_p0|c2_p1|c2_p5|c2_p6)")
+
+ (define_insn_reservation "c2_imov_load" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "imov,imovx")))
+- "c2_decodern,c2_p2")
++ "c2_decodern,c2_p2|c2_p3")
+
+ (define_insn_reservation "c2_imov_store" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (eq_attr "type" "imov")))
+- "c2_decodern,c2_p4+c2_p3")
++ "c2_decodern,c2_p4+c2_p7")
+
+-(define_insn_reservation "c2_icmov" 2
++(define_insn_reservation "c2_icmov" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "icmov")))
+- "c2_decoder0,(c2_p0|c2_p1|c2_p5)*2")
++ "c2_decodern,(c2_p0|c2_p1)")
+
+-(define_insn_reservation "c2_icmov_load" 2
++(define_insn_reservation "c2_icmov_load" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "icmov")))
+- "c2_decoder0,c2_p2,(c2_p0|c2_p1|c2_p5)*2")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1)")
+
+ (define_insn_reservation "c2_push_reg" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (eq_attr "type" "push")))
+- "c2_decodern,c2_p4+c2_p3")
++ "c2_decodern,c2_p4+c2_p7")
+
+ (define_insn_reservation "c2_push_mem" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "both")
+ (eq_attr "type" "push")))
+- "c2_decoder0,c2_p2,c2_p4+c2_p3")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p4+c2_p7)")
+
+ ;; lea executes on port 0 with latency one and throughput 1.
+ (define_insn_reservation "c2_lea" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "lea")))
+- "c2_decodern,c2_p0")
++ "c2_decodern,c2_p1|c2_p5")
+
+ ;; Shift and rotate decode as two uops which can go to port 0 or 5.
+ ;; The load and store units need to be reserved when memory operands
+@@ -170,62 +170,58 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "ishift,ishift1,rotate,rotate1")))
+- "c2_decodern,(c2_p0|c2_p5)")
++ "c2_decodern,c2_p0|c2_p6")
+
+-(define_insn_reservation "c2_shift_rotate_mem" 4
++(define_insn_reservation "c2_shift_rotate_mem" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "!none")
+ (eq_attr "type" "ishift,ishift1,rotate,rotate1")))
+- "c2_decoder0,c2_p2,(c2_p0|c2_p5),c2_p4+c2_p3")
++ "c2_decodern,(c2_p0|c2_p6)+(c2_p2|c2_p3)")
+
+ ;; See comments in ppro.md for the corresponding reservation.
+ (define_insn_reservation "c2_branch" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "ibr")))
+- "c2_decodern,c2_p5")
++ "c2_decodern,c2_p0|c2_p6")
+
+ ;; ??? Indirect branches probably have worse latency than this.
+ (define_insn_reservation "c2_indirect_branch" 6
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "!none")
+ (eq_attr "type" "ibr")))
+- "c2_decoder0,c2_p2+c2_p5")
++ "c2_decoder0,c2_p2|c2_p3,c2_p0|c2_p6")
+
+ (define_insn_reservation "c2_leave" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (eq_attr "type" "leave"))
+ "c2_decoder0,c2_p2+(c2_p0|c2_p1),(c2_p0|c2_p1)")
+
+-;; mul and imul with two/three operands only execute on port 1 for HImode
+-;; and SImode, port 0 for DImode.
+-(define_insn_reservation "c2_imul_hisi" 3
++;; imul and imulx with two/three operands only execute on port 1.
++(define_insn_reservation "c2_imul" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "HI,SI")
+- (eq_attr "type" "imul"))))
++ (eq_attr "type" "imul")))
+ "c2_decodern,c2_p1")
+
+-(define_insn_reservation "c2_imul_hisi_mem" 3
++(define_insn_reservation "c2_imul_mem" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "!none")
+- (and (eq_attr "mode" "HI,SI")
+- (eq_attr "type" "imul"))))
+- "c2_decoder0,c2_p2+c2_p1")
++ (eq_attr "type" "imul")))
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1")
+
+-(define_insn_reservation "c2_imul_di" 5
+- (and (eq_attr "cpu" "core2,nehalem")
++(define_insn_reservation "c2_imulx" 4
++ (and (eq_attr "cpu" "nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "DI")
+- (eq_attr "type" "imul"))))
+- "c2_decodern,c2_p0")
++ (eq_attr "type" "imulx")))
++ "c2_decodern,c2_p1+c2_p6")
+
+-(define_insn_reservation "c2_imul_di_mem" 5
+- (and (eq_attr "cpu" "core2,nehalem")
++(define_insn_reservation "c2_imulx_mem" 4
++ (and (eq_attr "cpu" "nehalem")
+ (and (eq_attr "memory" "!none")
+- (and (eq_attr "mode" "DI")
+- (eq_attr "type" "imul"))))
+- "c2_decoder0,c2_p2+c2_p0")
++ (eq_attr "type" "imulx")))
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1+c2_p6")
++
+
+ ;; div and idiv are very similar, so we model them the same.
+ ;; QI, HI, and SI have issue latency 12, 21, and 37, respectively.
+@@ -242,7 +238,7 @@
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "mode" "QI")
+ (eq_attr "type" "idiv"))))
+- "c2_decoder0,c2_p2+c2_p0+c2_idiv,c2_p0+c2_idiv,(c2_p0|c2_p1)+c2_idiv,c2_idiv*9")
++ "c2_decoder0,(c2_p2|c2_p3)+c2_p0+c2_idiv,c2_p0+c2_idiv,(c2_p0|c2_p1)+c2_idiv,c2_idiv*9")
+
+ (define_insn_reservation "c2_idiv_HI" 23
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -289,19 +285,19 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "fop")))
+- "c2_decoder0,c2_p2+c2_p1,c2_p1")
++ "c2_decodern,c2_p2+c2_p1,c2_p1")
+
+ (define_insn_reservation "c2_fop_store" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (eq_attr "type" "fop")))
+- "c2_decoder0,c2_p0,c2_p0,c2_p0+c2_p4+c2_p3")
++ "c2_decodern,c2_p0,c2_p0,c2_p0+c2_p4+c2_p3")
+
+ (define_insn_reservation "c2_fop_both" 5
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "both")
+ (eq_attr "type" "fop")))
+- "c2_decoder0,c2_p2+c2_p0,c2_p0+c2_p4+c2_p3")
++ "c2_decodern,c2_p2+c2_p0,c2_p0+c2_p4+c2_p3")
+
+ (define_insn_reservation "c2_fsgn" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -328,7 +324,7 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "fcmp")))
+- "c2_decoder0,c2_p2+c2_p1")
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1")
+
+ (define_insn_reservation "c2_fmov" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -341,42 +337,42 @@
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "mode" "!XF")
+ (eq_attr "type" "fmov"))))
+- "c2_decodern,c2_p2")
++ "c2_decodern,c2_p2|c2_p3")
+
+ (define_insn_reservation "c2_fmov_XF_load" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "mode" "XF")
+ (eq_attr "type" "fmov"))))
+- "c2_decoder0,(c2_p2+c2_p0)*2")
++ "c2_decodern,((c2_p2|c2_p3)+c2_p0)*2")
+
+ (define_insn_reservation "c2_fmov_store" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (and (eq_attr "mode" "!XF")
+ (eq_attr "type" "fmov"))))
+- "c2_decodern,c2_p3+c2_p4")
++ "c2_decodern,c2_p4+c2_p7")
+
+ (define_insn_reservation "c2_fmov_XF_store" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (and (eq_attr "mode" "XF")
+ (eq_attr "type" "fmov"))))
+- "c2_decoder0,(c2_p3+c2_p4),(c2_p3+c2_p4)")
++ "c2_decodern,(c2_p4+c2_p7),(c2_p4+c2_p7)")
+
+ ;; fmul executes on port 0 with latency 5. It has issue latency 2,
+ ;; but we don't model this.
+-(define_insn_reservation "c2_fmul" 5
++(define_insn_reservation "c2_fmul" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "fmul")))
+- "c2_decoder0,c2_p0*2")
++ "c2_decodern,c2_p0|c2_p1")
+
+-(define_insn_reservation "c2_fmul_load" 6
++(define_insn_reservation "c2_fmul_load" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "fmul")))
+- "c2_decoder0,c2_p2+c2_p0,c2_p0")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1)")
+
+ ;; fdiv latencies depend on the mode of the operands. XFmode gives
+ ;; a latency of 38 cycles, DFmode gives 32, and SFmode gives latency 18.
+@@ -395,7 +391,7 @@
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "mode" "SF")
+ (eq_attr "type" "fdiv,fpspc"))))
+- "c2_decoder0,c2_p2+c2_p0+c2_fdiv,c2_fdiv*16")
++ "c2_decodern,c2_p2+c2_p0+c2_fdiv,c2_fdiv*16")
+
+ (define_insn_reservation "c2_fdiv_DF" 32
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -409,7 +405,7 @@
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "mode" "DF")
+ (eq_attr "type" "fdiv,fpspc"))))
+- "c2_decoder0,c2_p2+c2_p0+c2_fdiv,c2_fdiv*30")
++ "c2_decodern,c2_p2+c2_p0+c2_fdiv,c2_fdiv*30")
+
+ (define_insn_reservation "c2_fdiv_XF" 38
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -423,7 +419,7 @@
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "mode" "XF")
+ (eq_attr "type" "fdiv,fpspc"))))
+- "c2_decoder0,c2_p2+c2_p0+c2_fdiv,c2_fdiv*36")
++ "c2_decodern,c2_p2+c2_p0+c2_fdiv,c2_fdiv*36")
+
+ ;; MMX instructions.
+
+@@ -431,53 +427,53 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "mmxadd,sseiadd")))
+- "c2_decodern,c2_p0|c2_p5")
++ "c2_decodern,c2_p0|c2_p1|c2_p5")
+
+ (define_insn_reservation "c2_mmx_add_load" 2
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "mmxadd,sseiadd")))
+- "c2_decodern,c2_p2+c2_p0|c2_p5")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1|c2_p5)")
+
+ (define_insn_reservation "c2_mmx_shft" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "mmxshft")))
+- "c2_decodern,c2_p0|c2_p5")
++ "c2_decodern,c2_p0|c2_p1")
+
+ (define_insn_reservation "c2_mmx_shft_load" 2
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "mmxshft")))
+- "c2_decoder0,c2_p2+c2_p1")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1)")
+
+ (define_insn_reservation "c2_mmx_sse_shft" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (and (eq_attr "type" "sseishft")
+ (eq_attr "length_immediate" "!0"))))
+- "c2_decodern,c2_p1")
++ "c2_decodern,c2_p0|c2_p1")
+
+ (define_insn_reservation "c2_mmx_sse_shft_load" 2
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "type" "sseishft")
+ (eq_attr "length_immediate" "!0"))))
+- "c2_decodern,c2_p1")
++ "c2_decodern,(c2_p0|c2_p1)+(c2_p2|c2_p3)")
+
+ (define_insn_reservation "c2_mmx_sse_shft1" 2
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (and (eq_attr "type" "sseishft")
+ (eq_attr "length_immediate" "0"))))
+- "c2_decodern,c2_p1")
++ "c2_decodern,c2_p0|c2_p1")
+
+ (define_insn_reservation "c2_mmx_sse_shft1_load" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (and (eq_attr "type" "sseishft")
+ (eq_attr "length_immediate" "0"))))
+- "c2_decodern,c2_p1")
++ "c2_decodern,(c2_p0|c2_p1)+(c2_p2|c2_p3)")
+
+ (define_insn_reservation "c2_mmx_mul" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -489,7 +485,7 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (eq_attr "type" "mmxmul,sseimul")))
+- "c2_decoder0,c2_p2+c2_p1")
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1")
+
+ (define_insn_reservation "c2_sse_mmxcvt" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -503,93 +499,119 @@
+ ;; (and (eq_attr "cpu" "core2,nehalem")
+ ;; (and (eq_attr "mode" "TI")
+ ;; (eq_attr "type" "mmxshft")))
+-;; "c2_decodern,c2_p0")
++;; "c2_decodern,c2_p0|c2_p1")
+
+ ;; The sfence instruction.
+ (define_insn_reservation "c2_sse_sfence" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "unknown")
+ (eq_attr "type" "sse")))
+- "c2_decoder0,c2_p4+c2_p3")
++ "c2_decoder0,c2_p4+c2_p7")
+
+ ;; FIXME: This reservation is all wrong when we're scheduling sqrtss.
+ (define_insn_reservation "c2_sse_SFDF" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "mode" "SF,DF")
+ (eq_attr "type" "sse")))
+- "c2_decodern,c2_p0")
++ "c2_decodern,c2_p0|c2_p1")
+
+ (define_insn_reservation "c2_sse_V4SF" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "mode" "V4SF")
+ (eq_attr "type" "sse")))
+- "c2_decoder0,c2_p1*2")
++ "c2_decodern,c2_p0|c2_p1")
++
++(define_insn_reservation "c2_sse_V8SF" 4
++ (and (eq_attr "cpu" "nehalem")
++ (and (eq_attr "mode" "V8SF,V4DF")
++ (eq_attr "type" "sse")))
++ "c2_decodern,c2_p0|c2_p1")
+
+ (define_insn_reservation "c2_sse_addcmp" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (eq_attr "type" "sseadd,sseadd1,ssecmp,ssecomi")))
+- "c2_decodern,c2_p1")
++ (eq_attr "type" "sseadd1,ssecmp,ssecomi")))
++ "c2_decodern,c2_p0|c2_p1")
+
+ (define_insn_reservation "c2_sse_addcmp_load" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+- (eq_attr "type" "sseadd,sseadd1,ssecmp,ssecomi")))
+- "c2_decodern,c2_p2+c2_p1")
++ (eq_attr "type" "sseadd1,ssecmp,ssecomi")))
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1)")
+
+-(define_insn_reservation "c2_sse_mul_SF" 4
++(define_insn_reservation "c2_sse_logic" 1
++ (and (eq_attr "cpu" "nehalem")
++ (and (eq_attr "memory" "none")
++ (eq_attr "type" "sselog,sselog1")))
++ "c2_decodern,c2_p0|c2_p1|c2_p5")
++
++(define_insn_reservation "c2_sse_logic_load" 2
++ (and (eq_attr "cpu" "nehalem")
++ (and (eq_attr "memory" "load")
++ (eq_attr "type" "sselog,sselog1")))
++ "c2_decodern,(c2_p0|c2_p1|c2_p5)+(c2_p2|c2_p3)")
++
++(define_insn_reservation "c2_sse_add" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "SF,V4SF")
+- (eq_attr "type" "ssemul"))))
+- "c2_decodern,c2_p0")
++ (eq_attr "type" "sseadd")))
++ "c2_decodern,c2_p1")
+
+-(define_insn_reservation "c2_sse_mul_SF_load" 4
++(define_insn_reservation "c2_sse_add_load" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+- (and (eq_attr "mode" "SF,V4SF")
+- (eq_attr "type" "ssemul"))))
+- "c2_decodern,c2_p2+c2_p0")
++ (eq_attr "type" "sseadd")))
++ "c2_decodern,c2_p1+(c2_p2|c2_p3)")
+
+-(define_insn_reservation "c2_sse_mul_DF" 5
++(define_insn_reservation "c2_sse_mul" 5
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "DF,V2DF")
+- (eq_attr "type" "ssemul"))))
+- "c2_decodern,c2_p0")
++ (eq_attr "type" "ssemul")))
++ "c2_decodern,c2_p0|c2_p1")
+
+-(define_insn_reservation "c2_sse_mul_DF_load" 5
++(define_insn_reservation "c2_sse_mul_load" 5
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+- (and (eq_attr "mode" "DF,V2DF")
+- (eq_attr "type" "ssemul"))))
+- "c2_decodern,c2_p2+c2_p0")
++ (eq_attr "type" "ssemul")))
++ "c2_decodern,(c2_p0|c2_p1)+(c2_p2|c2_p3)")
++
++(define_insn_reservation "c2_sse_muladd" 5
++ (and (eq_attr "cpu" "nehalem")
++ (and (eq_attr "memory" "none")
++ (eq_attr "type" "ssemuladd")))
++ "c2_decodern,c2_p0|c2_p1")
++
++(define_insn_reservation "c2_sse_muladd_load" 5
++ (and (eq_attr "cpu" "nehalem")
++ (and (eq_attr "memory" "load")
++ (eq_attr "type" "ssemuladd")))
++ "c2_decodern,(c2_p0|c2_p1)+(c2_p2|c2_p3)")
+
+ (define_insn_reservation "c2_sse_div_SF" 18
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "SF,V4SF")
++ (and (eq_attr "mode" "SF,V4SF,V8SF")
+ (eq_attr "type" "ssediv"))))
+ "c2_decodern,c2_p0,c2_ssediv*17")
+
+ (define_insn_reservation "c2_sse_div_SF_load" 18
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "SF,V4SF")
++ (and (eq_attr "mode" "SF,V4SF,V8SF")
+ (eq_attr "type" "ssediv"))))
+ "c2_decodern,(c2_p2+c2_p0),c2_ssediv*17")
+
+ (define_insn_reservation "c2_sse_div_DF" 32
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "DF,V2DF")
++ (and (eq_attr "mode" "DF,V2DF,V4DF")
+ (eq_attr "type" "ssediv"))))
+ "c2_decodern,c2_p0,c2_ssediv*31")
+
+ (define_insn_reservation "c2_sse_div_DF_load" 32
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+- (and (eq_attr "mode" "DF,V2DF")
++ (and (eq_attr "mode" "DF,V2DF,V4DF")
+ (eq_attr "type" "ssediv"))))
+ "c2_decodern,(c2_p2+c2_p0),c2_ssediv*31")
+
+@@ -606,21 +628,21 @@
+ (and (eq_attr "memory" "!none")
+ (and (eq_attr "mode" "SF")
+ (eq_attr "type" "sseicvt"))))
+- "c2_decodern,c2_p2+c2_p1")
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1")
+
+ (define_insn_reservation "c2_sse_icvt_DF" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none")
+ (and (eq_attr "mode" "DF")
+ (eq_attr "type" "sseicvt"))))
+- "c2_decoder0,c2_p0+c2_p1")
++ "c2_decodern,c2_p0+c2_p1")
+
+ (define_insn_reservation "c2_sse_icvt_DF_load" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "!none")
+ (and (eq_attr "mode" "DF")
+ (eq_attr "type" "sseicvt"))))
+- "c2_decoder0,(c2_p2+c2_p1)")
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1")
+
+ (define_insn_reservation "c2_sse_icvt_SI" 3
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -634,7 +656,7 @@
+ (and (eq_attr "memory" "!none")
+ (and (eq_attr "mode" "SI")
+ (eq_attr "type" "sseicvt"))))
+- "c2_decodern,(c2_p2+c2_p1)")
++ "c2_decodern,(c2_p2|c2_p3)+c2_p1")
+
+ (define_insn_reservation "c2_sse_mov" 1
+ (and (eq_attr "cpu" "core2,nehalem")
+@@ -652,7 +674,7 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (eq_attr "type" "ssemov")))
+- "c2_decodern,c2_p4+c2_p3")
++ "c2_decodern,c2_p4+c2_p7")
+
+ ;; All other instructions are modelled as simple instructions.
+ ;; We have already modelled all i387 floating point instructions, so all
+@@ -666,13 +688,13 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "none,unknown")
+ (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,sseishft1,mmx,mmxcmp")))
+- "c2_decodern,(c2_p0|c2_p1|c2_p5)")
++ "c2_decodern,(c2_p0|c2_p1|c2_p5|c2_p6)")
+
+ (define_insn_reservation "c2_insn_load" 4
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "load")
+ (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,pop,sseishft1,mmx,mmxcmp")))
+- "c2_decodern,c2_p2,(c2_p0|c2_p1|c2_p5)")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1|c2_p5|c2_p6)")
+
+ ;; register-memory instructions have three uops, so they have to be
+ ;; decoded on c2_decoder0.
+@@ -680,7 +702,7 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "store")
+ (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,sseishft1,mmx,mmxcmp")))
+- "c2_decoder0,(c2_p0|c2_p1|c2_p5),c2_p4+c2_p3")
++ "c2_decodern,(c2_p0|c2_p1|c2_p5|c2_p6)+(c2_p4+c2_p7)")
+
+ ;; read-modify-store instructions produce 4 uops so they have to be
+ ;; decoded on c2_decoder0 as well.
+@@ -688,4 +710,4 @@
+ (and (eq_attr "cpu" "core2,nehalem")
+ (and (eq_attr "memory" "both")
+ (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,pop,sseishft1,mmx,mmxcmp")))
+- "c2_decoder0,c2_p2,(c2_p0|c2_p1|c2_p5),c2_p4+c2_p3")
++ "c2_decodern,(c2_p2|c2_p3)+(c2_p0|c2_p1|c2_p5|c2_p6)+c2_p4+c2_p7")
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index 5d20841..6a15836 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -46352,7 +46352,7 @@ ix86_reassociation_width (unsigned int opc ATTRIBUTE_UNUSED,
+ if (INTEGRAL_MODE_P (mode) && TARGET_REASSOC_INT_TO_PARALLEL)
+ res = 2;
+ else if (FLOAT_MODE_P (mode) && TARGET_REASSOC_FP_TO_PARALLEL)
+- res = 2;
++ res = ((TARGET_64BIT && ix86_tune == PROCESSOR_HASWELL)? 4 : 2);
+
+ return res;
+ }
diff --git a/sys-devel/gcc/gcc-4.9.2.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
similarity index 80%
rename from sys-devel/gcc/gcc-4.9.2.ebuild
rename to sys-devel/gcc/gcc-4.9.3.ebuild
index b52cbfb..c40e047 100644
--- a/sys-devel/gcc/gcc-4.9.2.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -1,47 +1,50 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
-PATCH_VER="1.0"
+PATCH_VER="1.2"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
-PIE_VER="0.6.1"
+PIE_VER="0.6.2"
SPECS_VER="0.2.0"
SPECS_GCC_VER="4.4.3"
# arch/libc configurations known to be stable with {PIE,SSP}-by-default
PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
# uclibc need tls and nptl support for SSP support
# uclibc need to be >= 0.9.33
SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
#end Hardened stuff
inherit eutils toolchain
KEYWORDS="amd64 amd64-linux ~x86 ~x86-linux"
RDEPEND=""
DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.12 )
- >=${CATEGORY}/binutils-2.20"
+ elibc_glibc? ( >=sys-libs/glibc-2.19 )
+ >=${CATEGORY}/binutils-2.25"
if [[ ${CATEGORY} != cross-* ]] ; then
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+ PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.19 )"
fi
src_prepare() {
if has_version '<sys-libs/glibc-2.12' ; then
ewarn "Your host glibc is too old; disabling automatic fortify."
ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
fi
toolchain_src_prepare
use vanilla && return 0
#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+
+ epatch "${FILESDIR}"/4.x/4.9-haswell-float-optimize.patch || die
+ epatch "${FILESDIR}"/4.x/4.9-0x47-is-broadwell.patch || die
}
diff --git a/sys-devel/gcc/gcc-5.0_alpha20150208.ebuild b/sys-devel/gcc/gcc-5.0_alpha20150818.ebuild
similarity index 94%
rename from sys-devel/gcc/gcc-5.0_alpha20150208.ebuild
rename to sys-devel/gcc/gcc-5.0_alpha20150818.ebuild
index 738d79d..2af0291 100644
--- a/sys-devel/gcc/gcc-5.0_alpha20150208.ebuild
+++ b/sys-devel/gcc/gcc-5.0_alpha20150818.ebuild
@@ -1,43 +1,43 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
# Hardened gcc 4 stuff
# arch/libc configurations known to be stable with {PIE,SSP}-by-default
PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
# uclibc need tls and nptl support for SSP support
# uclibc need to be >= 0.9.33
SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
#end Hardened stuff
inherit eutils toolchain
KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
RDEPEND=""
DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.12 )
- >=${CATEGORY}/binutils-2.20"
+ elibc_glibc? ( >=sys-libs/glibc-2.18 )
+ >=${CATEGORY}/binutils-2.25.1"
if [[ ${CATEGORY} != cross-* ]] ; then
PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
fi
src_prepare() {
if has_version '<sys-libs/glibc-2.12' ; then
ewarn "Your host glibc is too old; disabling automatic fortify."
ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
fi
EPATCH_EXCLUDE+=" gcc-spec-env-r1.patch"
toolchain_src_prepare
use vanilla && return 0
#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
}
|
mark-kubacki/ossdl-overlay | 9c6eb94f1b7aa8c2ac312b976e799c3da851793e | sys-devel/binutils-2.25.1_p20150823 | diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d6b7c9c..da92026 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1 +1 @@
-EBUILD binutils-2.25_pre20141211.ebuild 473 SHA256 926baaf90ee426ca234a0c41fbc5e3e2d869574edcce6c29ba3c839411428db1 SHA512 1c57daa18a57d656af10777f063b75db30579b8e1bcc0ff8403713c6a8514f374e6b9a87a57b7269a668913b155f6a81c3bcc4bd1dc1f8977c44813ff67923ca WHIRLPOOL e2007048cc9d574987cfbbf82f19afc9a20cb92daba7e2784f31d6392c4e9040aec07588dbbbdb0bcbd1ba88ab5b780ec981cc8ab6d64767accfb5d5ad8ea0d6
+EBUILD binutils-2.25.1_p20150823.ebuild 454 SHA256 a4d520dac2d42b06a4bd9c7d5315fee335e18e8dfd4c9f9d9b2ced5ad29fbfc9 SHA512 4a9cf3c74fb47418ae4a67883ad7e881f66f6309a9a5991f8737e2bc26fe93c4299a94338bb782cbc748db2cd919c13a6f97fdde4413981c8216ffb6f4c14c6f WHIRLPOOL 58164a0881d32b8a29230337bd40e257d42ea3af52e22b73761f58251698a337f271f5e0977d617c8bad472875856c107a2997d5fe3708300adc8c0f53d088ab
diff --git a/sys-devel/binutils/binutils-2.25_pre20141211.ebuild b/sys-devel/binutils/binutils-2.25.1_p20150823.ebuild
similarity index 65%
rename from sys-devel/binutils/binutils-2.25_pre20141211.ebuild
rename to sys-devel/binutils/binutils-2.25.1_p20150823.ebuild
index b3b37a0..dc9fabd 100644
--- a/sys-devel/binutils/binutils-2.25_pre20141211.ebuild
+++ b/sys-devel/binutils/binutils-2.25.1_p20150823.ebuild
@@ -1,20 +1,20 @@
# Copyright 1999-2014 W. Mark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="4"
BINUTILS_TYPE="git"
EGIT_BRANCH="binutils-2_25-branch"
-EGIT_COMMIT="516a3acf86bb85b0e51c9809a93d3b50320b6bde"
-BVER="2.25.0.0.${PV##*_pre}"
+EGIT_COMMIT="0363588f454f6efa3dab47c932b488d33a45eb70"
+BVER="2.25.1.${PV##*_p}"
inherit toolchain-binutils
KEYWORDS="~amd64 ~arm64 ~x86"
src_prepare() {
toolchain-binutils_src_prepare
- sed -i -e "s:2.24.90:2.25.0.0.${PV##*_pre}:" -- */configure bfd/version.m4 \
+ sed -i -e "s:2.25.2:${BVER}:" -- */configure bfd/version.m4 \
|| die "cannot set version"
}
|
mark-kubacki/ossdl-overlay | 655f4e4d29dc8145d789fb481ccfcafda876b839 | dev-libs/boost-1.59.0 | diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index d514588..48ffa98 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,12 +1,13 @@
AUX boost-1.48.0-disable_icu_rpath.patch 1073 SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4 SHA512 efb62b65dbcb52258dcca074997a0380dfc52f48161777a8b6f9672179247e534e098784dcbb574826f495981fd2189290c7fe733d943bba2b668bb62ef50087 WHIRLPOOL 6f9a142e15bf3674114f2b07c8708055888e74cda4c3c775ca5470e8f54c921aa12660a1f905a370ec5f44f16b73f05025d3ff1ccad557d379ff55ad3ad0a8f0
AUX boost-1.48.0-disable_libboost_python3.patch 1509 SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e SHA512 5aa0eb72365a0674d7d654b924c3189501495c22cc1eb50dc1ce7aaee941ba418c17857475ebbcc4d8f8102100d889aa1c059e3782dbff9eb03ff101bea2ffbb WHIRLPOOL 5710ac3ecf1f6d18db0307f07c720d12646666ec83adde2b2464cb87c901d57088e98801720efb176420f9728967c8752382b15ca69f632b00852d51be412795
AUX boost-1.48.0-no_strict_aliasing_python2.patch 741 SHA256 d11db74992a7a692f655b36c1cd78355fcec6703007fde522b6a82c88f171689 SHA512 cd06ba8bf5623a5ca590cbd024ba27fae14d1d2a193ccd4baf91b06c5d41b6442f40561fa49b5ba14deb0c156d5773fc4a15890a85b6cea35cab91d54e94aa6e WHIRLPOOL 1b5cce1374f56d702213d7479beb90d15413c90010442a37a46821f383afa371aac3de49e657e7623d6e9079d1e3b07353233aa40218b760042161effedd813a
AUX boost-1.48.0-python_linking.patch 1278 SHA256 5bb937bd4423e039aa406ee4a366c61542a8067ec96b22dbcc48e8826bb7b1f8 SHA512 d588d9391c654a0c3cd49078933563705da4157cd79929ac2ff2021a2e86eec1b87ed85f5ec6d2028b76974abe7e947bd379d78aa60d97da9dc23a6f74c77ec2 WHIRLPOOL 879318dd228ca01841dd3ef0d8020810357c4699fbd1d9f164b0db07319b599634bd823f0e06dd462157d81550bc9f101506d0a7469ad2352d4b1b366bb7fb00
AUX boost-1.51.0-respect_python-buildid.patch 1565 SHA256 a783cd262cfda7c0046a9a9f34dd91cdc48bc2442c4c466873e85ead818326bb SHA512 65a7456c63db5eeab862fdb6245ba3a26536e26b56be9ed7a502a3d5be91bc278cd4a22cf1c5a1d8917bdeaa6575cbf37a11bfc3e982272f56308117fd2b230e WHIRLPOOL fb430e9c5368540493e13fdadff94df426203c9e6776891a3fc421488266b39f7e5720e5f5d289665d62d753c9bce7a33198cf6e911d94961714c22d1452ac92
AUX boost-1.51.0-support_dots_in_python-buildid.patch 609 SHA256 189299e2ef3cde98584e60a5bdd8606894c19bceb0c4d40b38f04aae0aed0edd SHA512 0bf1e4cae598a098b8c252bab1938b29dd5d3ea19d9355156b14add27238e9359ad39a73d3afecb031efebd801215804ecebc11ca8fa6ac2b7b3c2f5ff9bc32f WHIRLPOOL ffc318bc06c33263906be6d0e565ef4c2e3fde9f6224cc5413c02cbe446d9f286c69153f4aee6f588472b058b9b4a37110b0be696bd22362989f1b6a8c8fc13e
AUX boost-1.52.0-threads.patch 2089 SHA256 b59323cefaf4f89078db62b1ece2a6e3b2cf7e8861996c0e366bee4d4638bdb3 SHA512 c6b43e9d8bebbeeb89681ec2bca61c2d656b8b5b1d508c5cd7e545f8ff3ca9b2b3bdf5f66b33ae043548d74b58a9d49096e3c971cd4a1487ef7ee90a9473a92d WHIRLPOOL cf75f6f740a22b001466018e9fb90a75c6912f1723486bda1e53ae2af5eeca5dedec7d430755a0a26cb433ba9d1b56aaa449ed543356ebf2ac4c67c62899ee2c
AUX boost-1.55.0-context-x32.patch 1077 SHA256 1da4ff48b98416cac601c52594d4c4da3fb89d0a3e8908f119f05cc8ae76f9c7 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73 WHIRLPOOL 0b7a3521a8ec513b833d0292fa3e3bcafc8232fa96d2e41afd25da8dc30bdb49ee4319c7c8555d95e7d3de55fc704d83e443ba49bf89d6961a3f5af73c024a71
-AUX boost-1.55.0-tools-c98-compat.patch 680 SHA256 08192ebf36a3087d3bce31d7b78c29c6e38bca6e5164744878783f648024beec SHA512 fc132898d9ef1a9fab607f277003f86080306fd0f30f89ab0916eb4c3217b390f15cfa00d1e410e79080d469714866a417ba72a3c0727189e8425cd72a1d6a47 WHIRLPOOL 17eb9e80ae33ef9fa8e4c442c511e35d1f5c2ac5251462931e9fbbd53bb29ef5adf699680729af71ef4c12ec87c6d83c821a8e30a03f7f1abedc2207c3125c1c
+AUX boost-1.56.0-build-auto_index-tool.patch 408 SHA256 36bbd2652654b48c27eb4297d06968c8bdcdf78eec34127d775fad2b9689ac2a SHA512 916d7060003bceb6ee345de5fad9a4f44ec43473b119bab4cc057360d07b7be89bdab5e9d393df28171a4d1679ac0a3089f2096d5a6554ee2e00bc0805d2cbe2 WHIRLPOOL 172059b31b9128cda03e9119f6deac1a0fde373542e96493156f6e3527c65c7ec8fe16611568b0aed07b2f5ffc3440462386d47557ef7e84d855c8df2acbbea8
+AUX boost-1.58.0-fix-non-constexpr-types-regression.patch 10687 SHA256 746c6c48f7b88782b3bf792e8e0e042eee65a5c3a419cc8a8c7714991314eda1 SHA512 1d1aa4c6b64fec4773b0a294ed2e2ba6f3cc905370a5b641010ca7310063f4cc9090cda9435fc5817b379f9b4c0ad93777b81387c4eb59da73ed297005d09dc8 WHIRLPOOL 48b50c9d823c829f8c1dd7955cf7c9e163acfa0f9069f139c52be026df6082ffa6caeda2c5c831ee4bf103a3fb79ebabe2c652cb7924f6e5dfa3ff613563f4b5
AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332
-DIST boost_1_57_0.tar.bz2 60821561 SHA256 910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 SHA512 61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d WHIRLPOOL ff092af332434082a774645a5eb42829cdbdac805ef86dccce8988542062901524bd4d5fc890e3a9c01f0a721047501e5d8b13d50ffa5368066c3438dcf719d6
-EBUILD boost-1.57.0.ebuild 11429 SHA256 3f2443d9e29853752734e488f29fd4a9b942c8099491230ecfbcf72fc3c90594 SHA512 f6aa50adf9cebfcb4fa56a708d0f97464eb511dbc2d3044109a473f576dc3c1902d4ead9f047968d12e72973bba383e70216cdb791788e5b3b1483756a7b336e WHIRLPOOL 13f2ae155a13977cf6521e84ec6904e5472a90267b838ca4b90b1ded2166752fbf2c6b32a6273a7debe55715c74932fb6df82765a4d8d29a5c6b0f3319a79f18
+DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
+EBUILD boost-1.59.0.ebuild 11624 SHA256 26f9cef0761b5811b1b1175b5b525184fb07da233e5738b557a942c11d0dedfc SHA512 072e62078c4ada67e7dfc68d0e4fa19e44d9227c1118f2c2bfa96d116d0622fb5e1724e14df14ae3fbcf9b7f4349fb04c287cd3d1168d6b746896a2604d9181a WHIRLPOOL 4fc9350fc589bb97bec9ae55731401deb023ef1f7e16d6917967ec45acf942b1cac1fb26e246b4ddc1b5e939b70e7287b057084e3a1795e4ab6cdf90e28e092c
diff --git a/dev-libs/boost/boost-1.57.0.ebuild b/dev-libs/boost/boost-1.59.0.ebuild
similarity index 93%
rename from dev-libs/boost/boost-1.57.0.ebuild
rename to dev-libs/boost/boost-1.59.0.ebuild
index f6fe0ec..6cac59b 100644
--- a/dev-libs/boost/boost-1.57.0.ebuild
+++ b/dev-libs/boost/boost-1.59.0.ebuild
@@ -1,397 +1,400 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
MY_P="${PN}_$(replace_all_version_separators _)"
MAJOR_V="$(get_version_component_range 1-2)"
DESCRIPTION="Boost Libraries for C++"
HOMEPAGE="http://www.boost.org/"
SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] )
- icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
- mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
+ mpi? ( virtual/mpi[cxx,threads] )
python? ( ${PYTHON_DEPS} )
app-arch/bzip2[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
!app-admin/eselect-boost"
DEPEND="${RDEPEND}
=dev-util/boost-build-${MAJOR_V}*"
REQUIRED_USE="
mpi? ( threads )
python? ( ${PYTHON_REQUIRED_USE} )"
S="${WORKDIR}/${MY_P}"
# the tests will never fail because these are not intended as sanity
# tests at all. They are more a way for upstream to check their own code
# on new compilers. Since they would either be completely unreliable
# (failing for no good reason) or completely useless (never failing)
# there is no point in having them in the ebuild to begin with.
RESTRICT="test"
python_bindings_needed() {
multilib_is_native_abi && use python
}
tools_needed() {
multilib_is_native_abi && use tools
}
# MPI stuff is not ported on multilib yet, disabling it for non-native ABIs
mpi_needed() {
multilib_is_native_abi && use mpi
}
create_user-config.jam() {
local compiler compiler_version compiler_executable
if [[ ${CHOST} == *-darwin* ]]; then
compiler="darwin"
compiler_version="$(gcc-fullversion)"
compiler_executable="$(tc-getCXX)"
else
compiler="gcc"
compiler_version="$(gcc-version)"
compiler_executable="$(tc-getCXX)"
fi
local mpi_configuration python_configuration
if mpi_needed; then
mpi_configuration="using mpi ;"
fi
if python_bindings_needed; then
- python_configuration="using python : : ${PYTHON} ;"
+ if tc-is-cross-compiler; then
+ python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
+ else
+ python_configuration="using python : : ${PYTHON} ;"
+ fi
fi
cat > "${BOOST_ROOT}/user-config.jam" << __EOF__
using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
${mpi_configuration}
${python_configuration}
__EOF__
}
pkg_setup() {
# Bail out on unsupported build configuration, bug #456792
if [[ -f "${EROOT}etc/site-config.jam" ]]; then
grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" ||
(
eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
eerror "Boost can not be built in such configuration."
eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it."
die
)
fi
}
src_prepare() {
epatch \
"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
"${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
- "${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
- "${FILESDIR}/${PN}-1.52.0-threads.patch"
+ "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
# Do not try to build missing 'wave' tool, bug #522682
# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
epatch_user
multilib_copy_sources
}
ejam() {
local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@"
echo b2 ${b2_opts}
b2 ${b2_opts}
}
src_configure() {
# Workaround for too many parallel processes requested, bug #506064
[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2"
if [[ ${CHOST} == *-darwin* ]]; then
# We need to add the prefix, and in two cases this exceeds, so prepare
# for the largest possible space allocation.
append-ldflags -Wl,-headerpad_max_install_names
elif [[ ${CHOST} == *-winnt* ]]; then
compiler=parity
if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
compilerVersion=trunk
else
compilerVersion=$($(tc-getCXX) -v | sed '1q' \
| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
fi
compilerExecutable=$(tc-getCXX)
fi
# bug 298489
if use ppc || use ppc64; then
[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
fi
# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
append-cxxflags -std=gnu++98
use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
mpi_needed || OPTIONS+=" --without-mpi"
use nls || OPTIONS+=" --without-locale"
use context || OPTIONS+=" --without-context --without-coroutine"
OPTIONS+=" pch=off"
OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\""
OPTIONS+=" --layout=system"
OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)"
[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
}
multilib_src_compile() {
local -x BOOST_ROOT="${BUILD_DIR}"
PYTHON_DIRS=""
MPI_PYTHON_MODULE=""
building() {
create_user-config.jam
local PYTHON_OPTIONS
if python_bindings_needed; then
PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
else
PYTHON_OPTIONS=" --without-python"
fi
ejam \
${OPTIONS} \
${PYTHON_OPTIONS} \
|| die "Building of Boost libraries failed"
if python_bindings_needed; then
if [[ -z "${PYTHON_DIRS}" ]]; then
PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
else
if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
die "Inconsistent structure of build directories"
fi
fi
local dir
for dir in ${PYTHON_DIRS}; do
mv ${dir} ${dir}-${EPYTHON} \
|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
done
if mpi_needed; then
if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
die "Multiple mpi.so files found"
fi
else
if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
die "Inconsistent structure of build directories"
fi
fi
mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
fi
fi
}
if python_bindings_needed; then
python_foreach_impl building
else
building
fi
if tools_needed; then
pushd tools > /dev/null || die
ejam \
${OPTIONS} \
${PYTHON_OPTIONS} \
|| die "Building of Boost tools failed"
popd > /dev/null || die
fi
}
multilib_src_install_all() {
if ! use python; then
rm -r "${ED}"/usr/include/boost/python* || die
fi
if ! use nls; then
rm -r "${ED}"/usr/include/boost/locale || die
fi
if ! use context; then
rm -r "${ED}"/usr/include/boost/context || die
rm -r "${ED}"/usr/include/boost/coroutine || die
+ rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
fi
if use doc; then
find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
dohtml \
-A pdf,txt,cpp,hpp \
*.{htm,html,png,css} \
-r doc
dohtml -A pdf,txt -r tools
insinto /usr/share/doc/${PF}/html
doins -r libs
doins -r more
# To avoid broken links
insinto /usr/share/doc/${PF}/html
doins LICENSE_1_0.txt
dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
fi
}
multilib_src_install() {
local -x BOOST_ROOT="${BUILD_DIR}"
installation() {
create_user-config.jam
local PYTHON_OPTIONS
if python_bindings_needed; then
local dir
for dir in ${PYTHON_DIRS}; do
cp -pr ${dir}-${EPYTHON} ${dir} \
|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
done
if mpi_needed; then
cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
fi
PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
else
PYTHON_OPTIONS=" --without-python"
fi
ejam \
${OPTIONS} \
${PYTHON_OPTIONS} \
--includedir="${ED}usr/include" \
--libdir="${ED}usr/$(get_libdir)" \
install || die "Installation of Boost libraries failed"
if python_bindings_needed; then
rm -r ${PYTHON_DIRS} || die
# Move mpi.so Python module to Python site-packages directory.
# https://svn.boost.org/trac/boost/ticket/2838
if mpi_needed; then
local moddir=$(python_get_sitedir)/boost
# moddir already includes eprefix
mkdir -p "${D}${moddir}" || die
mv "${ED}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
cat << EOF > "${D}${moddir}/__init__.py" || die
import sys
if sys.platform.startswith('linux'):
import DLFCN
flags = sys.getdlopenflags()
sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
from . import mpi
sys.setdlopenflags(flags)
del DLFCN, flags
else:
from . import mpi
del sys
EOF
fi
python_optimize
fi
}
if python_bindings_needed; then
python_foreach_impl installation
else
installation
fi
pushd "${ED}usr/$(get_libdir)" > /dev/null || die
local ext=$(get_libname)
if use threads; then
local f
for f in *${ext}; do
dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
done
fi
popd > /dev/null || die
if tools_needed; then
dobin dist/bin/*
insinto /usr/share
doins -r dist/share/boostbook
fi
# boost's build system truely sucks for not having a destdir. Because for
# this reason we are forced to build with a prefix that includes the
# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
# DESTROOT instread of the actual EPREFIX. There is no way out of here
# but to do it the dirty way of manually setting the right install_names.
if [[ ${CHOST} == *-darwin* ]]; then
einfo "Working around completely broken build-system(tm)"
local d
for d in "${ED}"usr/lib/*.dylib; do
if [[ -f ${d} ]]; then
# fix the "soname"
ebegin " correcting install_name of ${d#${ED}}"
install_name_tool -id "/${d#${D}}" "${d}"
eend $?
# fix references to other libs
refs=$(otool -XL "${d}" | \
sed -e '1d' -e 's/^\t//' | \
grep "^libboost_" | \
cut -f1 -d' ')
local r
for r in ${refs}; do
ebegin " correcting reference to ${r}"
install_name_tool -change \
"${r}" \
"${EPREFIX}/usr/lib/${r}" \
"${d}"
eend $?
done
fi
done
fi
}
pkg_preinst() {
# Yai for having symlinks that are nigh-impossible to remove without
# resorting to dirty hacks like these. Removes lingering symlinks
# from the slotted versions.
local symlink
for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do
[[ -L ${symlink} ]] && rm -f "${symlink}"
done
}
diff --git a/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch b/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch
deleted file mode 100644
index df2a14a..0000000
--- a/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make tools compiled successfully with forced C++98
-
-Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=503468
-
-diff --git a/tools/regression/src/compiler_status.cpp b/tools/regression/src/compiler_status.cpp
-index 63f8134..3f3374a 100644
---- a/tools/regression/src/compiler_status.cpp
-+++ b/tools/regression/src/compiler_status.cpp
-@@ -128,7 +128,7 @@ namespace
- string ln(line);
- if (ln.find("Revision: ") != string::npos)
- {
-- for(auto itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr)
-+ for(string::iterator itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr)
- rev += *itr;
- }
- }
diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
new file mode 100644
index 0000000..5175800
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
@@ -0,0 +1,13 @@
+Build auto_index tool with USE="tools"
+Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066
+
+--- tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300
++++ tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300
+@@ -20,6 +20,7 @@
+ use-project /boost/regression : regression/build ;
+
+ TOOLS =
++ auto_index/build//auto_index
+ bcp//bcp
+ inspect/build//inspect
+ quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.58.0-fix-non-constexpr-types-regression.patch b/dev-libs/boost/files/boost-1.58.0-fix-non-constexpr-types-regression.patch
new file mode 100644
index 0000000..da54a48
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.58.0-fix-non-constexpr-types-regression.patch
@@ -0,0 +1,233 @@
+diff --git a/boost/fusion/adapted/struct/detail/define_struct.hpp b/boost/fusion/adapted/struct/detail/define_struct.hpp
+index 2554292..ce3737e 100644
+--- a/boost/fusion/adapted/struct/detail/define_struct.hpp
++++ b/boost/fusion/adapted/struct/detail/define_struct.hpp
+@@ -69,7 +69,7 @@
+ ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
+ \
+ template<typename Seq> \
+- BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ self_type& \
+ operator=(Seq const& seq) \
+ { \
+@@ -128,7 +128,7 @@
+ ATTRIBUTE_TUPEL_SIZE, \
+ ATTRIBUTES_SEQ) \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ NAME() \
+ : BOOST_PP_SEQ_FOR_EACH_I_R( \
+ 1, \
+@@ -137,7 +137,7 @@
+ ATTRIBUTES_SEQ) \
+ {} \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ NAME(self_type const& other_self) \
+ : BOOST_PP_SEQ_FOR_EACH_I_R( \
+ 1, \
+@@ -147,7 +147,7 @@
+ {} \
+ \
+ template<typename Seq> \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ NAME(Seq const& seq \
+ BOOST_PP_IF( \
+ BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)), \
+@@ -167,7 +167,7 @@
+ #define BOOST_FUSION_DEFINE_STRUCT_CTOR_1( \
+ NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ explicit \
+ NAME(boost::call_traits< \
+ BOOST_PP_TUPLE_ELEM( \
+@@ -180,7 +180,7 @@
+ #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1( \
+ TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ explicit \
+ NAME(typename boost::call_traits< \
+ typename boost::fusion::detail::get_first_arg< \
+@@ -217,7 +217,7 @@
+ #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N( \
+ TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \
+ 1, \
+ BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I, \
+@@ -245,7 +245,7 @@
+ #define BOOST_FUSION_DEFINE_STRUCT_CTOR_N( \
+ NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \
+ 1, \
+ BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I, \
+diff --git a/boost/fusion/adapted/struct/detail/define_struct_inline.hpp b/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
+index a5a3ae0..a037ffe 100644
+--- a/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
++++ b/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
+@@ -66,7 +66,7 @@
+ #define BOOST_FUSION_IGNORE_2(ARG1, ARG2)
+
+ #define BOOST_FUSION_MAKE_COPY_CONSTRUCTOR(NAME, ATTRIBUTES_SEQ) \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ NAME(BOOST_PP_SEQ_FOR_EACH_I( \
+ BOOST_FUSION_MAKE_CONST_REF_PARAM, \
+ ~, \
+@@ -337,7 +337,7 @@
+ typedef boost::mpl::int_<N> index; \
+ typedef boost_fusion_detail_Seq sequence_type; \
+ \
+- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
++ BOOST_FUSION_GPU_ENABLED \
+ BOOST_FUSION_ITERATOR_NAME(NAME)(boost_fusion_detail_Seq& seq) \
+ : seq_(seq) \
+ BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES( \
+diff --git a/libs/fusion/test/sequence/adapt_struct.cpp b/libs/fusion/test/sequence/adapt_struct.cpp
+index c0cd304..121827f 100644
+--- a/libs/fusion/test/sequence/adapt_struct.cpp
++++ b/libs/fusion/test/sequence/adapt_struct.cpp
+@@ -67,6 +67,17 @@ namespace ns
+ foo foo_;
+ int y;
+ };
++
++
++ // Testing non-constexpr compatible types
++ struct employee {
++ std::string name;
++ std::string nickname;
++
++ employee(std::string name, std::string nickname)
++ : name(name), nickname(nickname)
++ {}
++ };
+ }
+
+ #if BOOST_PP_VARIADICS
+@@ -96,6 +107,13 @@ namespace ns
+ y
+ )
+
++ BOOST_FUSION_ADAPT_STRUCT(
++ ns::employee,
++ name,
++ nickname
++ )
++
++
+ #else // BOOST_PP_VARIADICS
+
+ BOOST_FUSION_ADAPT_STRUCT(
+@@ -123,6 +141,12 @@ namespace ns
+ (BOOST_FUSION_ADAPT_AUTO, y)
+ )
+
++ BOOST_FUSION_ADAPT_STRUCT(
++ ns::employee,
++ (std::string, name)
++ (BOOST_FUSION_ADAPT_AUTO, nickname)
++ )
++
+ #endif
+
+ int
+@@ -224,6 +248,15 @@ main()
+ BOOST_TEST(v2 >= v1);
+ }
+
++ {
++ ns::employee emp("John Doe", "jdoe");
++ std::cout << at_c<0>(emp) << std::endl;
++ std::cout << at_c<1>(emp) << std::endl;
++
++ fusion::vector<std::string, std::string> v1("John Doe", "jdoe");
++ BOOST_TEST(emp == v1);
++ }
++
+ return boost::report_errors();
+ }
+
+diff --git a/libs/fusion/test/sequence/define_struct.cpp b/libs/fusion/test/sequence/define_struct.cpp
+index 795fdf6..63b5a19 100644
+--- a/libs/fusion/test/sequence/define_struct.cpp
++++ b/libs/fusion/test/sequence/define_struct.cpp
+@@ -26,6 +26,14 @@ BOOST_FUSION_DEFINE_STRUCT(
+
+ BOOST_FUSION_DEFINE_STRUCT(BOOST_PP_EMPTY(), s, (int, m))
+
++// Testing non-constexpr compatible types
++BOOST_FUSION_DEFINE_STRUCT(
++ (ns),
++ employee,
++ (std::string, name)
++ (std::string, nickname)
++)
++
+ int
+ main()
+ {
+@@ -100,6 +108,14 @@ main()
+ BOOST_TEST(p == make_vector(3,5));
+ }
+
++ {
++ ns::employee emp = make_list("John Doe", "jdoe");
++ std::cout << at_c<0>(emp) << std::endl;
++ std::cout << at_c<1>(emp) << std::endl;
++
++ BOOST_TEST(emp == make_vector("John Doe", "jdoe"));
++ }
++
+ return boost::report_errors();
+ }
+
+diff --git a/libs/fusion/test/sequence/define_struct_inline.cpp b/libs/fusion/test/sequence/define_struct_inline.cpp
+index e849ce9..d34a142 100644
+--- a/libs/fusion/test/sequence/define_struct_inline.cpp
++++ b/libs/fusion/test/sequence/define_struct_inline.cpp
+@@ -41,6 +41,13 @@ namespace ns
+ BOOST_FUSION_DEFINE_STRUCT_INLINE(s, (int, m))
+
+ BOOST_FUSION_DEFINE_STRUCT_INLINE(empty_struct, )
++
++ // Testing non-constexpr compatible types
++ BOOST_FUSION_DEFINE_STRUCT_INLINE(
++ employee,
++ (std::string, name)
++ (std::string, nickname)
++ )
+ }
+
+ template <typename Point>
+@@ -128,6 +135,17 @@ main()
+ {
+ run_test<cls::point>(); // test with non-template enclosing class
+ run_test<tpl_cls<>::point>(); // test with template enclosing class
++
++ {
++ using namespace boost::fusion;
++
++ ns::employee emp = make_list("John Doe", "jdoe");
++ std::cout << at_c<0>(emp) << std::endl;
++ std::cout << at_c<1>(emp) << std::endl;
++
++ BOOST_TEST(emp == make_vector("John Doe", "jdoe"));
++ }
++
+ return boost::report_errors();
+
+ }
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index b6aaf47..0d835ae 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,9 +1,9 @@
AUX boost-build-1.48.0-disable_python_rpath.patch 337 SHA256 979727bd1aabf6df05d8b06e3ac525bb6d44c2b18c3e4e1331528c4633b7e9df SHA512 4244814e05c15478992a775b9f63fc0b7477caa4770af7f61f0e664af7e681c33c3a5be3b6842e1d4e159af43adde820d00cc0f92c990cea59899ec0aa2d273c WHIRLPOOL 3d395f0adb341430192f2bc3507d8f585ea2afe7cedcbfd95e5b6fce53fd6cf34b5a612d36937cf3413f38e20f9b2bb72938f1b1fb07895f63297d5e4c4c2a6e
AUX boost-build-1.49.0-darwin-gentoo-toolchain.patch 647 SHA256 f729f8e7cd9046cbb653e2f687a8e72e71a313cffb14805e8783e7799786441b SHA512 53a4f0b53a53d65c9777d2621b957a5b2620899f631017858bad975b82be3ac3c0acbef9d694c3b86fe41b0aba5c170e4e0b63b169c5d00a6d4448fa506b66a4 WHIRLPOOL e2c83f06667938c6f2b32aefa2f5a7ad07a68c1366c55eef7b9bda9c42b31f417c34127f518cca151245c82704e45fe6a5402e3b26383f79de417c728e67e667
AUX boost-build-1.50.0-respect-c_ld-flags.patch 2014 SHA256 15db5440bee28ff3109f0a9a45a4426026b1ded36da88fa8f8a828bff961cd74 SHA512 cd9454009a09795f9b6ad7da187046e43ad624cb56ac79d53596771b69793666247bac540e580060a20694ea7c42f0bb13b266b98cee43a04397bc8931016508 WHIRLPOOL 9267db366be1dff9ead6b846c88a78312600fd2b3a0b9864fa3c7c767a3bd41a4b10b2508f44eb39bb0748163bacda4423eafe2872b2b6482bdcc269c25a1bdd
AUX boost-build-1.52.0-darwin-no-python-framework.patch 415 SHA256 1a85311e133f3cdb3d17bfd10fe64c244c2efa23722def1334f89dad9274dace SHA512 68a43d610f5d92f5733b9fbf08348e06e190ec7e30f8d5e63ff95c3123539bc582b4d4fe960de586c0df243c5c49e36e9bccf49ca2017884aaa6a2a2b5759d56 WHIRLPOOL 82458d31670568b583f5c067c3224560d50c97f830e67138c31054371267012a29f9a1e902f885c576b2b39af4d92a387028183223d626a3e45a8cfbc9ef366d
AUX boost-build-1.54.0-fix-test.patch 436 SHA256 244d923dda51f68f2b8535342727307a4e4e2c0b99c11c4b0806e7ca524982d5 SHA512 9a7cb66b6cd82f7e27074f4a3edad20817fcaa0d9b54d14e87311a57bb59498e9b880c37342d2afccbc8146422702f6a908dacf7a7aae0d24354b0709c2d4891 WHIRLPOOL 151a186c0ef18dca513f29114b877959e71976ed15d7aae9d81f6015db16e9efc0d6d712712d73bc79168d23ba6ee6eedb0df096e614db2b1232ff1ac110396c
AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 560 SHA256 a986984f85908e19577908376c02f258b8a224cbdf7b4b0e9d57a2bb364c5b4f SHA512 06edc9d25a2fb9cf9b9124e67a9c7d9afccf50d41bf2a65814b6b0a0e6b43a3ec1950bf2919a08908b6f5f5ff7ad13e41352c2328b9bca2ddf1e5a5cc60ff59b WHIRLPOOL ba22249002c0d1169dd463b0c8df3db81bc35f0e161eb0d8168a75c8b8c2e7b96f2658a2bba0018d6178e0dccac4045d5a2fa7a53849271002018f6a4f322081
AUX site-config.jam 688 SHA256 795b0719536a934a1c65cfd4abf09ad4f30ad7d90ad4d55b00c858ee35e8890f SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df WHIRLPOOL be4e6a1a308dc41e522be919d765b85cb67909ed74d022ca4bf8264ec86ade1caffe8d69a630b21d4abfed1d0c1e8ef079f874046a713fcdf4f0d72f3f0b6386
-DIST boost_1_57_0.tar.bz2 60821561 SHA256 910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 SHA512 61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d WHIRLPOOL ff092af332434082a774645a5eb42829cdbdac805ef86dccce8988542062901524bd4d5fc890e3a9c01f0a721047501e5d8b13d50ffa5368066c3438dcf719d6
-EBUILD boost-build-1.57.0.ebuild 3887 SHA256 0e9bff94263947f8c706d6278e88963d67defc910d7241fba7531739dc79f906 SHA512 822b44b147bbaa6c51fd22b331994afba0224741f29ce434ef4d50b6bd6ff6be3c3e59e99c9b7cf31f6bbe4f324ede33b18a620a0b1cbdd423b1f6e82ab3b471 WHIRLPOOL f98e089399fa46e5b624329e4a0090fe83c71bd0f56d46133d7b05fb3bb88ff4adbe0b676f12328a06bcc64cd710e7c987917d2e2bc9c205b1bbf5f7c031d676
+DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
+EBUILD boost-build-1.59.0.ebuild 3887 SHA256 0e9bff94263947f8c706d6278e88963d67defc910d7241fba7531739dc79f906 SHA512 822b44b147bbaa6c51fd22b331994afba0224741f29ce434ef4d50b6bd6ff6be3c3e59e99c9b7cf31f6bbe4f324ede33b18a620a0b1cbdd423b1f6e82ab3b471 WHIRLPOOL f98e089399fa46e5b624329e4a0090fe83c71bd0f56d46133d7b05fb3bb88ff4adbe0b676f12328a06bcc64cd710e7c987917d2e2bc9c205b1bbf5f7c031d676
diff --git a/dev-util/boost-build/boost-build-1.57.0.ebuild b/dev-util/boost-build/boost-build-1.59.0.ebuild
similarity index 100%
rename from dev-util/boost-build/boost-build-1.57.0.ebuild
rename to dev-util/boost-build/boost-build-1.59.0.ebuild
|
mark-kubacki/ossdl-overlay | 4625be485f84e53a4f6e895cdd592057dff9e0a1 | dev-libs/capnproto-0.5.2 | diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
new file mode 100644
index 0000000..ba86f0c
--- /dev/null
+++ b/dev-libs/capnproto/Manifest
@@ -0,0 +1,2 @@
+DIST capnproto-0.5.2.tar.gz 2044383 SHA256 23145a0127c2b1629c4b72e6000e04991640e551947fa39fd06710d64bd942a8 SHA512 f724e1635d8b045e558d00716e4b1b0285ad3229461f8d35a773310659b4e9dd72b0c14e30859d3275bdd6d1e9da49fc0cb87e4ddec26a0ab77dcc8ed057fddd WHIRLPOOL 1dcda3d03c6dec59cacd64aa6f900e69f11c2189d6f4ddebe2821cd889a4c2d067a9b627db16b286eb030e28065bc660b3aeaeef189f2e7509705c85d5316e43
+EBUILD capnproto-0.5.2.ebuild 567 SHA256 aded2aa65eca343f1f922c7b936a3932e21e3b6386698a5c6772d4c70a8db506 SHA512 56a406e23b8e97d05b7a58734843fb9af92c6434cd426854fe3a223d4efcc0527fbf77887ac40c3d348f8ba388c585031dd8b6a4bc811fea5b8b92e1bdbc5cd8 WHIRLPOOL a7623939320460dfd20237d29f0b5e15a15611cc539eea4f76524871fabc7b65f69765a8ba0d415de4f501c2891e8ee3214180c90f48016bbf849cfd011d2d24
diff --git a/dev-libs/capnproto/capnproto-0.5.2.ebuild b/dev-libs/capnproto/capnproto-0.5.2.ebuild
new file mode 100644
index 0000000..f8499f9
--- /dev/null
+++ b/dev-libs/capnproto/capnproto-0.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2015 W-Mark Kubacki
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI="5"
+
+inherit eutils autotools-multilib
+
+DESCRIPTION="serialization library, like protobuf"
+HOMEPAGE="https://capnproto.org/"
+SRC_URI="https://capnproto.org/${PN}-c++-${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="primaryuri"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND=""
+DEPEND=">=sys-devel/gcc-4.8.0"
+
+S="${WORKDIR}/${PN}-c++-${PV}"
+
+src_prepare() {
+ sed -i \
+ -e '/^\s*ldconfig/d' \
+ Makefile.am || die
+ eautoreconf
+}
|
mark-kubacki/ossdl-overlay | 6a6251a3261f904377b1e8acb0e257d5137a2ca9 | net-misc/youtube-dl-2015.06.04.1 | diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 901ec50..89b7f63 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 765 SHA256 74359a5967116a63443d35fc8b8014b70829a7e1d40695f22cb7666464c7edd9 SHA512 e0934cf72bb53a5e62aef12c245f6d1199b42256114890e2cb0e23b1778047d6ffc453943a4a34c774c2e0a8cc29b51ce1477e7433d8f071291fabef3d2e9551 WHIRLPOOL cce5d5048062fb9581ac63fe47d1c20db8b6a640c244bf7461ecdcaec2ffcd69a9f72b712a9fc3463acba7aa33b797674d09d171b3223424a688e777ca00ab5c
-DIST youtube-dl-2015.04.17.tar.gz 1496887 SHA256 7bf51aec0646abed904a91cbff9747c2582247987fffce5f392c58d82c6a9894 SHA512 e42bd2f9eb04d461dad8f4ff4e031ca47e3c9e7f74763610e5e7ff50112509fef6bafcb8a83e6960c61f049debe59a37b28549583267394a22255050bf4edb23 WHIRLPOOL b2a6db7184f999c3293369072823084c41aa0494f7e80fbeccf3c0c6c7e4228075d13e3c157a658aefb4fa05ad0de15270f0fce1437b5c05d7f5cc29f13f9f2e
-EBUILD youtube-dl-2015.04.17.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
+DIST youtube-dl-2015.06.04.1.tar.gz 1562426 SHA256 cffb1edb9637962e6a2ea1d26284f52aa53c7f5cd2a3e1e94a21f414aa606566 SHA512 b0003c6d91c132fd5dcc7fb1b4c3870dc644cb20beb9e541bf90ab897828b31b4aa15582c984d9963e071b4160e0e334dbbb2cadc3a24aded52a78fbe8cc2959 WHIRLPOOL e027bb8b07be6f11ebb878719e3dcfd479255197cfa242b287a5a45118574e286e8d74a3cadb2856f6331aeae61a962be285230c7f4208e99367ebd8b74aa02a
+EBUILD youtube-dl-2015.06.04.1.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
diff --git a/net-misc/youtube-dl/youtube-dl-2015.04.17.ebuild b/net-misc/youtube-dl/youtube-dl-2015.06.04.1.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2015.04.17.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.06.04.1.ebuild
|
mark-kubacki/ossdl-overlay | f48ab35d540de11f3be26f5f024db3ce4a6d6948 | app-shells/fish: fix grep usage | diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2cc1cee..a7e9361 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,6 @@
AUX fish-2.1.0-putty-xterm.patch 1627 SHA256 2db412f96a3a1d59c252b7c1032fb0428cc0ba1b9864ebe9215e4f5025b72ddb SHA512 f1d7e0d56b6a223068e8fd6f3f5ba6409f59a793abefa2ec6d57e41c25070dbf6bd037ab4bf1a9c86f217e048062b799a9aa55dc89616c2b06859c06765b3fcf WHIRLPOOL 00a85722ff9631e5de0ae8964f11c27be77302e2d407f52555a48175c7269f966644f109da5caceac7ac9d57490c07210466b821727f8fd0c44a7fbc9e7c14da
AUX fish-2.1.0-tinfo.patch 1037 SHA256 eb6c44ec4d5ece0dbe305112504083f011b3999c274fc86786a7bf9c5ee967b4 SHA512 8ec3c9a003f30a4e05685de1492bc3a795dbbdb1cd5ab95769fc3a8f9df478e15f64a12730e71ed4d2485867c0a59268620ef3ef08982d0a481282f9a20d59a8 WHIRLPOOL e594423661107afb10b09acac4026c58ad708eac27ae3781dd4056a8ddc29d7b12fba66709fc0077f5645905907b00a849515e9a0e3c98a035920177363f46ec
+AUX fish-2.1.1-fix-grep-usage.patch 437 SHA256 1c4fcdd129975d92ac4bf75ee4bf04195cb8443e51bccdf6ade93ac8c5400ec5 SHA512 5c677425dd0a885f1342ebb79bb33132a16774325f99dd9dc7a5ad6b3aab1f3ea874e64985a4f60a2eb2d0435b7d16485de37d5f7e1feb126f115bce96fbed7e WHIRLPOOL 5af8085d49542c3130547054b19cd5c90ccfb0a424adf605ba18ab4c96141de51ed8ed1c551649af05a82a5ae63a2ae8f007f91012961dfbd4a1d93539fea555
AUX fish_prompt_mark.fish 2741 SHA256 ce5a49cdf7d08134a4f0e537a84f7474d366860f7c2e2b23acee1dd7a77f2de9 SHA512 9b52ff1654a3c110622616cd23753aa47c5e38e049c9644acaad6b26af7a2e6c39bff2c54fe522c9053853ee2f935546367dddb5a520719d4ee9f701bda68deb WHIRLPOOL c6362ae10322011ead9268a9cc39bcafeae335e2a6dcb0afad3d25aab58ef32c4b5d31de7596a5c12d9e20211fc7f5d56a71cd13a22373ed5fc8939d6d38225c
DIST fish-2.1.2.tar.gz 1730198 SHA256 c6c20d5ca3a2a0168461de8abfe85f9e6b255132698ea0109998d4ab68f9f6dd SHA512 4f8f0133094d4d2295546a5b96e044646de2266364610368210b0db529b2d865c1b389f01f311b9b6d6d6dcd2a29040b7a9499d491605ae52a765a76d83db2a5 WHIRLPOOL 2a02dd0f91731cfc79de64245c34fc4361f42406d0c0a60afbafa08c2b9265d11c4adadc96ca5eb49b9053db1eb949c297eee23a7cbc63a30f56ce577b650779
-EBUILD fish-2.1.2.ebuild 2460 SHA256 50f3000782aa9dbfa3955182186f8d3568325c0b3760c0a4fc7c08b44cfa17f0 SHA512 08286eb104b93c5e46e88a0a5b1d8ac4da579b74e097b46d5fae2b24a4031e43b2d2696c540e59da0e349aeed850175c2d83368c59b141d417ae77e503ce3a1c WHIRLPOOL eff4d85d959cab40e8fd158bc270b8a4231896afc15862dc8766d81666ab62d59faaaca0fa42a8f9957eb34fd5432f78a6e42a70ef5bc2e943d6e41e83e89bd7
+EBUILD fish-2.1.2.ebuild 2515 SHA256 9a03df010067853e13a796b3f8459d54a08ae646d2749fd7cae65ad1c46ace76 SHA512 7bf49b1f1cf961652a217d287ba68e1b8a4ffba47be7b6b4664d4407133d1886cfd244cd424673f6ea345117f7adf3d949a970dab0a0b04e161133d1fb1de6d3 WHIRLPOOL ee844abe0675c37687e2b34e03b52894b7431cda4553d016f81d8801abf504826a5401794d819c21b22ae578c23e6363278c5d4ecd8b5c65852c3661069a3af5
diff --git a/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch b/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch
new file mode 100644
index 0000000..aea1760
--- /dev/null
+++ b/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch
@@ -0,0 +1,18 @@
+diff --git a/share/functions/grep.fish b/share/functions/grep.fish
+index b0dc958..73f2192 100644
+--- a/share/functions/grep.fish
++++ b/share/functions/grep.fish
+@@ -3,11 +3,8 @@
+ #
+
+ if command grep --color=auto --help 1>/dev/null 2>/dev/null
+- if not set -q GREP_COLOR
+- set -gx GREP_COLOR '97;45'
+- end
+- if not set -q GREP_OPTIONS
+- set -gx GREP_OPTIONS --color=auto
++ function grep
++ command grep --color=auto $argv
+ end
+ end
+
diff --git a/app-shells/fish/fish-2.1.2.ebuild b/app-shells/fish/fish-2.1.2.ebuild
index 1d8a64b..5ebf79e 100644
--- a/app-shells/fish/fish-2.1.2.ebuild
+++ b/app-shells/fish/fish-2.1.2.ebuild
@@ -1,81 +1,82 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
inherit base autotools
DESCRIPTION="fish is the Friendly Interactive SHell"
HOMEPAGE="http://fishshell.com/"
SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="arm64 amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="X"
DEPEND="sys-libs/ncurses
sys-devel/bc
sys-devel/gettext
X? ( x11-misc/xsel )"
# fish can add man-page completions from lzma and xz compressed man pages
# through a python script. That's why we depend on python here (bug #490478)
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.1.0-tinfo.patch #459768
epatch "${FILESDIR}"/${PN}-2.1.0-putty-xterm.patch
+ epatch "${FILESDIR}"/${PN}-2.1.1-fix-grep-usage.patch
mv share/functions/fish_prompt.fish share/tools/web_config/sample_prompts/
cp "${FILESDIR}"/fish_prompt_mark.fish share/functions/fish_prompt.fish
eautoreconf
}
src_configure() {
# Set things up for fish to be a default shell.
# It has to be in /bin in case /usr is unavailable.
# Also, all of its utilities have to be in /bin.
econf \
docdir="${EPREFIX}"/usr/share/doc/${PF} \
--bindir="${EPREFIX}"/bin
}
src_test() {
if has_version ~${CATEGORY}/${P} ; then
emake test
else
ewarn "The test suite only works when the package is already installed"
fi
}
pkg_postinst() {
elog "fish is now installed on your system."
elog "To run fish, type 'fish' in your terminal."
elog
elog "To suppress fish's intro message on this machine type, using fish:"
elog " set -U fish_greeting \"\""
elog
elog "To use fish as your login shell:"
elog "* add the line '${EPREFIX}/bin/${PN}'"
elog "* to the file '${EPREFIX}/etc/shells'."
elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
elog
elog "To set your colors, run 'fish_config'"
elog "To scan your man pages for completions, run 'fish_update_completions'"
elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
elog
elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
elog "browser of your choice to get acces to ${PN}'s help system:"
elog " BROWSER=\"/usr/bin/firefox\""
elog
elog "In order to get lzma and xz support for man-page completion please"
elog "emerge one of the following packages:"
elog " dev-python/backports-lzma"
elog " >=dev-lang/python-3.3"
elog
elog "Have fun!"
elog
}
|
mark-kubacki/ossdl-overlay | cc97e32844edcc142ce8d8ca22b083c127572b0c | dev-db/redis-3.0.2 | diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index ce1c9a9..7b178be 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,9 +1,9 @@
AUX configure.ac-2.2 1522 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34 WHIRLPOOL a78a56a8e5963fee703b90d4eba112591693ded8ff8b780b049864be4fe712815ef0743d32b120edadca4e5909982d841cfa4ed1483b9eb91bc030ecdf3d7c70
AUX redis-2.8.17-config.patch 1660 SHA256 2fe9ddae4bd1198850eabd1c2c34258cf0e089aa79575124a72e2333b634392a SHA512 4b7f88361ca33fb676d47e6e5e364cd33731031cf83d0cec34d6542e6e832a6b7187b847fde7c65b8c838b309feec7033e0d44f5a5690d6ed0e6694773d4195e WHIRLPOOL 9dde5a6b75a3d91d5ff785c4d4fa96ee0ccbc6c4d853e41073d957b11176265f1ded151f3a62a23228e28f1da604c9c64a5b0ae6b718b2f8d0e84221b048be74
AUX redis-2.8.3-shared.patch 909 SHA256 fe95148b87d4fe70b655638a3355865fdb5f52d344d07dfd60ae2350d04b7862 SHA512 1070d9d22654a0ee00ecb2536dd2644cc59917650aa56af10689302c3ac962c172bc24a0c493c17f78aa2632bfd3d924ceef221340622d46fd6bf7346e69f49d WHIRLPOOL eeedadd088bf9a2449406d62bfd386b2c8bf484d6b835948d879d6441e35ee20e80c489fc8d81b4c9cb23dd4ebfe1dc07217fed058bd4e5be44f9c6f17a9ac81
AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b WHIRLPOOL 72fb07431293f0e382af98c5a0b7eeca146cab84153befdd808328aa27404cd74d55d524b5442ad10de5989917351299bc7610e0be75d11d2e31fb5353beb45a
AUX redis.initd-4 795 SHA256 48e7fbbe5b088cff98d4ca9b3fb38503ae1210e2cf6e10d5f17fb1938769dfaf SHA512 4f561a3a9f5b166bd5644e0ed3e6f46b7145273dca47c8ee30866c56edd711ad58ef5c1df6434896fbbb293bcdaa2298cae86bd3b60ccceacc9f0f224d91f12b WHIRLPOOL 04587ef02d09f27cb04ffcc50b7a276e87d2899cd7fc73c0593cadca34b02816eee438dcc82a1effa3fcd90a561f57bfba1843c0b7429bad1003140814d79822
AUX redis.service 254 SHA256 e4b1b282612bf496f92a9287c171227802d79a9aa7e58e77f1cdbefd5b13551b SHA512 a8735fb3d2fff552f0f0dc982224ac73a8b9ca3a5c633d64c5fc528dc1f5a965f693d7aa19801eebaf663992e3d4ef96aa65bdefab47fef98c94aeab2b165b87 WHIRLPOOL c39a75713dca525ff1c1fec9a8972184f19204e08054b3dc62ec265c42abca69d5cfa90fd19097e2e4a35b1829c0c3743f19301a6ba5c7765320a91ee68eb1b9
AUX redis.tmpfiles 61 SHA256 68e4c7e3159068400cbc7d07e84b5618f9d829dc7a4f18253783c6256a53031a SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 WHIRLPOOL 2c6f4d9e5382c43e935db16bf120b24cd8de517bc067dcab91b3230a8ddced7ecc5ed37626464d3f1a7880d2d41efdf3cecfd1029a38aaa2edf3d20de74489b4
-DIST redis-3.0.0.tar.gz 1358081 SHA256 654c95c6236692dcb916fccba9a34d0877cc91338c8b6a372511e6eb080e34bf SHA512 c7403eaa58dcdb8c85d53531b262a07099fc38ecb5e4e41622ad9355d356ecd269d691f15ef65da9fb9241395c2a3cb72eea27325d632b7cd8eaf3c4d2e3fe72 WHIRLPOOL 29e96f06b6a11fe98ea9112de61f01641dec2f45e98e925298ffbae515564a9e7ab07f9bd105bfe62206b4ecee6a65193a54bc04ffe19ec1873830d98c35837a
-EBUILD redis-3.0.0.ebuild 3109 SHA256 cd10d210be22b6887167092579e6dd72629e096348fa78feba1db325d0c9eb8b SHA512 41510633b4fa0682a12ede179ed2fec6b07b7f25def8a0ac3fec750fa05a2f8f991b3d823f43de669ce4ef5462fcd2d7f20f1db94ebbaa60ea2e37032ed03b3d WHIRLPOOL 6d73409325efda06c0f29c488bfe4454e5c87428c5ffe2913a1e1647ea547a4d27034d558530d27aad6f040bfc01a236cd333ae1c3d9217c5737ed4064a6772f
+DIST redis-3.0.2.tar.gz 1360182 SHA256 93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f SHA512 0f72ca45c2970d595a3c533946b77ea293c7588eb59dd48491921ef5e3f3f1463a96a8095b5782a424451007702fbcab243140cc2d885306b5cb821308d0607a WHIRLPOOL 2d47fb142a63233230a9416e7833f8cdc0f630c12f326c73ae0078c82866496459a90e53eb6d0d381284284cd3941f392882ba27d8751651f22550230683950b
+EBUILD redis-3.0.2.ebuild 3109 SHA256 cd10d210be22b6887167092579e6dd72629e096348fa78feba1db325d0c9eb8b SHA512 41510633b4fa0682a12ede179ed2fec6b07b7f25def8a0ac3fec750fa05a2f8f991b3d823f43de669ce4ef5462fcd2d7f20f1db94ebbaa60ea2e37032ed03b3d WHIRLPOOL 6d73409325efda06c0f29c488bfe4454e5c87428c5ffe2913a1e1647ea547a4d27034d558530d27aad6f040bfc01a236cd333ae1c3d9217c5737ed4064a6772f
diff --git a/dev-db/redis/redis-3.0.0.ebuild b/dev-db/redis/redis-3.0.2.ebuild
similarity index 100%
rename from dev-db/redis/redis-3.0.0.ebuild
rename to dev-db/redis/redis-3.0.2.ebuild
|
mark-kubacki/ossdl-overlay | 2701200c86ee2e23c38c2757e43a8a2668b76de0 | dev-db/redis-3.0.0: uses its own LUA, enables us to upgrade to 5.3 | diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
new file mode 100644
index 0000000..ce1c9a9
--- /dev/null
+++ b/dev-db/redis/Manifest
@@ -0,0 +1,9 @@
+AUX configure.ac-2.2 1522 SHA256 349b9f826578a886930bf395b59e6bdf1802c453ffd4cadbfcc3cca49c07313f SHA512 7a67bbd2f5fcfd7e1bfe18b739438342d40484c3f178ef5e2ddb617480715626e7f5a47d58660761489867ae460a58457a85a14bb2af90fe2e2ab3b8bd940b34 WHIRLPOOL a78a56a8e5963fee703b90d4eba112591693ded8ff8b780b049864be4fe712815ef0743d32b120edadca4e5909982d841cfa4ed1483b9eb91bc030ecdf3d7c70
+AUX redis-2.8.17-config.patch 1660 SHA256 2fe9ddae4bd1198850eabd1c2c34258cf0e089aa79575124a72e2333b634392a SHA512 4b7f88361ca33fb676d47e6e5e364cd33731031cf83d0cec34d6542e6e832a6b7187b847fde7c65b8c838b309feec7033e0d44f5a5690d6ed0e6694773d4195e WHIRLPOOL 9dde5a6b75a3d91d5ff785c4d4fa96ee0ccbc6c4d853e41073d957b11176265f1ded151f3a62a23228e28f1da604c9c64a5b0ae6b718b2f8d0e84221b048be74
+AUX redis-2.8.3-shared.patch 909 SHA256 fe95148b87d4fe70b655638a3355865fdb5f52d344d07dfd60ae2350d04b7862 SHA512 1070d9d22654a0ee00ecb2536dd2644cc59917650aa56af10689302c3ac962c172bc24a0c493c17f78aa2632bfd3d924ceef221340622d46fd6bf7346e69f49d WHIRLPOOL eeedadd088bf9a2449406d62bfd386b2c8bf484d6b835948d879d6441e35ee20e80c489fc8d81b4c9cb23dd4ebfe1dc07217fed058bd4e5be44f9c6f17a9ac81
+AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b WHIRLPOOL 72fb07431293f0e382af98c5a0b7eeca146cab84153befdd808328aa27404cd74d55d524b5442ad10de5989917351299bc7610e0be75d11d2e31fb5353beb45a
+AUX redis.initd-4 795 SHA256 48e7fbbe5b088cff98d4ca9b3fb38503ae1210e2cf6e10d5f17fb1938769dfaf SHA512 4f561a3a9f5b166bd5644e0ed3e6f46b7145273dca47c8ee30866c56edd711ad58ef5c1df6434896fbbb293bcdaa2298cae86bd3b60ccceacc9f0f224d91f12b WHIRLPOOL 04587ef02d09f27cb04ffcc50b7a276e87d2899cd7fc73c0593cadca34b02816eee438dcc82a1effa3fcd90a561f57bfba1843c0b7429bad1003140814d79822
+AUX redis.service 254 SHA256 e4b1b282612bf496f92a9287c171227802d79a9aa7e58e77f1cdbefd5b13551b SHA512 a8735fb3d2fff552f0f0dc982224ac73a8b9ca3a5c633d64c5fc528dc1f5a965f693d7aa19801eebaf663992e3d4ef96aa65bdefab47fef98c94aeab2b165b87 WHIRLPOOL c39a75713dca525ff1c1fec9a8972184f19204e08054b3dc62ec265c42abca69d5cfa90fd19097e2e4a35b1829c0c3743f19301a6ba5c7765320a91ee68eb1b9
+AUX redis.tmpfiles 61 SHA256 68e4c7e3159068400cbc7d07e84b5618f9d829dc7a4f18253783c6256a53031a SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 WHIRLPOOL 2c6f4d9e5382c43e935db16bf120b24cd8de517bc067dcab91b3230a8ddced7ecc5ed37626464d3f1a7880d2d41efdf3cecfd1029a38aaa2edf3d20de74489b4
+DIST redis-3.0.0.tar.gz 1358081 SHA256 654c95c6236692dcb916fccba9a34d0877cc91338c8b6a372511e6eb080e34bf SHA512 c7403eaa58dcdb8c85d53531b262a07099fc38ecb5e4e41622ad9355d356ecd269d691f15ef65da9fb9241395c2a3cb72eea27325d632b7cd8eaf3c4d2e3fe72 WHIRLPOOL 29e96f06b6a11fe98ea9112de61f01641dec2f45e98e925298ffbae515564a9e7ab07f9bd105bfe62206b4ecee6a65193a54bc04ffe19ec1873830d98c35837a
+EBUILD redis-3.0.0.ebuild 3109 SHA256 cd10d210be22b6887167092579e6dd72629e096348fa78feba1db325d0c9eb8b SHA512 41510633b4fa0682a12ede179ed2fec6b07b7f25def8a0ac3fec750fa05a2f8f991b3d823f43de669ce4ef5462fcd2d7f20f1db94ebbaa60ea2e37032ed03b3d WHIRLPOOL 6d73409325efda06c0f29c488bfe4454e5c87428c5ffe2913a1e1647ea547a4d27034d558530d27aad6f040bfc01a236cd333ae1c3d9217c5737ed4064a6772f
diff --git a/dev-db/redis/files/configure.ac-2.2 b/dev-db/redis/files/configure.ac-2.2
new file mode 100644
index 0000000..3ff6650
--- /dev/null
+++ b/dev-db/redis/files/configure.ac-2.2
@@ -0,0 +1,58 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.63)
+AC_INIT(redis, 2.0.0, [email protected])
+AM_CFLAGS="-std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6"
+if test x"$CFLAGS" = x""; then
+ AM_CFLAGS="$AM_CFLAGS -O2"
+else
+ AM_CFLAGS="$AM_CFLAGS $CFLAGS"
+fi
+
+# options
+AC_MSG_CHECKING([whether to build with debug information])
+AC_ARG_ENABLE([debug],
+ [AS_HELP_STRING([--enable-debug],
+ [enable debug data generation (def=no)])],
+ [debugit="$enableval"],
+ [debugit=no])
+AC_MSG_RESULT([$debugit])
+
+if test x"$debugit" = x"yes"; then
+ AC_DEFINE([DEBUG],[],[Debug Mode])
+ AM_CFLAGS="$AM_CFLAGS -g -rdynamic -ggdb"
+else
+ AC_DEFINE([NDEBUG],[],[No-debug Mode])
+fi
+AC_SUBST([AM_CFLAGS])
+
+# Checks for programs.
+AC_PROG_CC
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+
+# Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_FORK
+AC_FUNC_STRCOLL
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([dup2 gethostbyname gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strstr strtol])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/dev-db/redis/files/redis-2.8.17-config.patch b/dev-db/redis/files/redis-2.8.17-config.patch
new file mode 100644
index 0000000..c9f6b2a
--- /dev/null
+++ b/dev-db/redis/files/redis-2.8.17-config.patch
@@ -0,0 +1,46 @@
+--- a/redis.conf 2014-12-02 16:22:38.722433643 +0100
++++ b/redis.conf 2014-12-02 16:22:16.252249350 +0100
+@@ -38,7 +38,7 @@
+
+ # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
+ # default. You can specify a custom pid file location here.
+-pidfile /var/run/redis.pid
++pidfile /run/redis/redis.pid
+
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -61,7 +61,7 @@
+ # Examples:
+ #
+ # bind 192.168.1.100 10.0.0.1
+-# bind 127.0.0.1
++bind 127.0.0.1
+
+ # Specify the path for the Unix socket that will be used to listen for
+ # incoming connections. There is no default, so Redis will not listen
+@@ -100,7 +100,7 @@
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile /var/log/redis/redis.log
+
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -184,7 +184,7 @@
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir /var/lib/redis/
+
+ ################################# REPLICATION #################################
+
+@@ -403,6 +403,7 @@
+ # output buffers (but this is not needed if the policy is 'noeviction').
+ #
+ # maxmemory <bytes>
++maxmemory 67108864
+
+ # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+ # is reached. You can select among five behaviors:
diff --git a/dev-db/redis/files/redis-2.8.3-shared.patch b/dev-db/redis/files/redis-2.8.3-shared.patch
new file mode 100644
index 0000000..d32484f
--- /dev/null
+++ b/dev-db/redis/files/redis-2.8.3-shared.patch
@@ -0,0 +1,36 @@
+commit 388a76f24c96767c831ee7682234fd9f2bc5b9ac
+Author: Johan Bergström <[email protected]>
+Date: Mon Nov 25 09:17:14 2013 +1100
+
+ Use shared jemalloc
+
+diff --git src/Makefile src/Makefile
+index c37549d..77e6255 100644
+--- src/Makefile
++++ src/Makefile
+@@ -26,12 +26,7 @@ PREFIX?=/usr/local
+ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
+
+-# Default allocator
+-ifeq ($(uname_S),Linux)
+- MALLOC=jemalloc
+-else
+- MALLOC=libc
+-endif
++MALLOC?=jemalloc
+
+ # Backwards compatibility for selecting an allocator
+ ifeq ($(USE_TCMALLOC),yes)
+@@ -79,9 +74,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+ endif
+
+ ifeq ($(MALLOC),jemalloc)
+- DEPENDENCY_TARGETS+= jemalloc
+- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
++ FINAL_LIBS+= -ljemalloc -ldl
+ endif
+
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git a/dev-db/redis/files/redis.confd b/dev-db/redis/files/redis.confd
new file mode 100644
index 0000000..07585fa
--- /dev/null
+++ b/dev-db/redis/files/redis.confd
@@ -0,0 +1,20 @@
+# Redis user.
+REDIS_USER="redis"
+
+# Redis group.
+REDIS_GROUP="redis"
+
+# Redis configuration file.
+REDIS_CONF="/etc/redis.conf"
+
+# Redis dump directory.
+REDIS_DIR="/var/lib/redis"
+
+# Redis pid file.
+# (Be sure to change the main redis configuration file as well if you change
+# this from the default.)
+REDIS_PID="/var/run/redis/redis.pid"
+
+# Redis options.
+# (Redis expects the first argument to be the configuration file.)
+REDIS_OPTS="${REDIS_CONF}"
diff --git a/dev-db/redis/files/redis.initd-4 b/dev-db/redis/files/redis.initd-4
new file mode 100644
index 0000000..96c962c
--- /dev/null
+++ b/dev-db/redis/files/redis.initd-4
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+
+REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
+REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
+REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
+REDIS_USER=${REDIS_USER:-redis}
+REDIS_GROUP=${REDIS_GROUP:-redis}
+REDIS_TIMEOUT=${REDIS_TIMEOUT:-30}
+
+command=/usr/sbin/redis-server
+pidfile=${REDIS_PID:-/run/redis/redis.pid}
+start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile}
+ --chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}"
+command_args="${REDIS_OPTS}"
+
+depend() {
+ use net localmount logger
+ after keepalived
+}
+
+start_pre() {
+ checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop \
+ --exec ${command} \
+ --retry ${REDIS_TIMEOUT} \
+ --pidfile ${pidfile}
+ eend
+}
diff --git a/dev-db/redis/files/redis.service b/dev-db/redis/files/redis.service
new file mode 100644
index 0000000..f1322f6
--- /dev/null
+++ b/dev-db/redis/files/redis.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=A persistent key-value database
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/redis/redis.pid
+ExecStart=/usr/sbin/redis-server /etc/redis.conf
+User=redis
+Group=redis
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/dev-db/redis/files/redis.tmpfiles b/dev-db/redis/files/redis.tmpfiles
new file mode 100644
index 0000000..657d8a5
--- /dev/null
+++ b/dev-db/redis/files/redis.tmpfiles
@@ -0,0 +1,2 @@
+# redis runtime directory
+d /var/run/redis 0755 redis root -
diff --git a/dev-db/redis/redis-3.0.0.ebuild b/dev-db/redis/redis-3.0.0.ebuild
new file mode 100644
index 0000000..af794d6
--- /dev/null
+++ b/dev-db/redis/redis-3.0.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2010-2012 W-Mark Kubacki, Mao Pu
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ~hppa ~ppc64 ~x86 amd64-linux x86-linux ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND="
+ tcmalloc? ( dev-util/google-perftools )
+ jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND="virtual/pkgconfig
+ >=sys-devel/autoconf-2.63
+ test? ( dev-lang/tcl:0= )
+ ${RDEPEND}"
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+ enewgroup redis 75
+ enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch
+ epatch "${FILESDIR}"/${PN}-2.8.17-config.patch
+
+ # don't compile everything, just what we need
+ sed -i \
+ -e '/cd lua\/src/{s:all:liblua.a:}' \
+ deps/Makefile
+
+ # You'll notice Gentoo's authors have stolen this ebuild and removed
+ # attribution when looking through these lines:
+ # now we will rewrite present Makefiles
+ local makefiles=""
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do
+ mv "${MKF}" "${MKF}.in"
+ sed -i -e 's:$(CC):@CC@:g' \
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+ -e 's: $(DEBUG)::g' \
+ -e 's:$(OBJARCH)::g' \
+ -e 's:ARCH:TARCH:g' \
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+ "${MKF}.in" \
+ || die "Sed failed for ${MKF}"
+ makefiles+=" ${MKF}"
+ done
+ # autodetection of compiler and settings; generates the modified Makefiles
+ cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+ sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ configure.ac || die "Sed failed for configure.ac"
+ eautoconf
+}
+
+src_configure() {
+ econf
+
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+ # also, don't define ANSI/c99 for lua twice
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+
+ local myconf=""
+
+ if use tcmalloc ; then
+ myconf="${myconf} USE_TCMALLOC=yes"
+ elif use jemalloc ; then
+ myconf="${myconf} JEMALLOC_SHARED=yes"
+ else
+ myconf="${myconf} MALLOC=yes"
+ fi
+
+ emake ${myconf} V=1 CC="${CC}" AR="${AR}" RANLIB="${RANLIB}"
+}
+
+src_install() {
+ insinto /etc/
+ doins redis.conf sentinel.conf
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+ fperms 0644 /etc/{redis,sentinel}.conf
+
+ newconfd "${FILESDIR}/redis.confd" redis
+ newinitd "${FILESDIR}/redis.initd-4" redis
+
+ systemd_dounit "${FILESDIR}/redis.service"
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+ nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
+
+ dobin src/redis-cli
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
+ fperms 0750 /usr/sbin/redis-benchmark
+ dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+ if use prefix; then
+ diropts -m0750
+ else
+ diropts -m0750 -o redis -g redis
+ fi
+ keepdir /var/{log,lib}/redis
+}
|
mark-kubacki/ossdl-overlay | c91340eaaf0ada20963f3304d8eb2e8bfc100c14 | app-shells/fish-2.1.2: version bump | diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 6e8b0f4..2cc1cee 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,5 @@
AUX fish-2.1.0-putty-xterm.patch 1627 SHA256 2db412f96a3a1d59c252b7c1032fb0428cc0ba1b9864ebe9215e4f5025b72ddb SHA512 f1d7e0d56b6a223068e8fd6f3f5ba6409f59a793abefa2ec6d57e41c25070dbf6bd037ab4bf1a9c86f217e048062b799a9aa55dc89616c2b06859c06765b3fcf WHIRLPOOL 00a85722ff9631e5de0ae8964f11c27be77302e2d407f52555a48175c7269f966644f109da5caceac7ac9d57490c07210466b821727f8fd0c44a7fbc9e7c14da
AUX fish-2.1.0-tinfo.patch 1037 SHA256 eb6c44ec4d5ece0dbe305112504083f011b3999c274fc86786a7bf9c5ee967b4 SHA512 8ec3c9a003f30a4e05685de1492bc3a795dbbdb1cd5ab95769fc3a8f9df478e15f64a12730e71ed4d2485867c0a59268620ef3ef08982d0a481282f9a20d59a8 WHIRLPOOL e594423661107afb10b09acac4026c58ad708eac27ae3781dd4056a8ddc29d7b12fba66709fc0077f5645905907b00a849515e9a0e3c98a035920177363f46ec
AUX fish_prompt_mark.fish 2741 SHA256 ce5a49cdf7d08134a4f0e537a84f7474d366860f7c2e2b23acee1dd7a77f2de9 SHA512 9b52ff1654a3c110622616cd23753aa47c5e38e049c9644acaad6b26af7a2e6c39bff2c54fe522c9053853ee2f935546367dddb5a520719d4ee9f701bda68deb WHIRLPOOL c6362ae10322011ead9268a9cc39bcafeae335e2a6dcb0afad3d25aab58ef32c4b5d31de7596a5c12d9e20211fc7f5d56a71cd13a22373ed5fc8939d6d38225c
-DIST fish-2.1.1.tar.gz 1681744 SHA256 b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924 SHA512 c6b41a7514d684bc165bdf03edd0f07b0cdfbcc827a3bcc6e9105bbf6b94a60962bd7fffaf5f9c44c450da3d4b6af4bdcf72fbbaaa043851c631d8c2a1344dd6 WHIRLPOOL c6bcbfea35d68f99903633f06a436cf982f6fc01123cebbb4342be1b3f3be106c0ac144d24b2069bf34bc7e3540d26526a8ef8b74e4f27255525ad0d7cb70774
-EBUILD fish-2.1.1.ebuild 2460 SHA256 50f3000782aa9dbfa3955182186f8d3568325c0b3760c0a4fc7c08b44cfa17f0 SHA512 08286eb104b93c5e46e88a0a5b1d8ac4da579b74e097b46d5fae2b24a4031e43b2d2696c540e59da0e349aeed850175c2d83368c59b141d417ae77e503ce3a1c WHIRLPOOL eff4d85d959cab40e8fd158bc270b8a4231896afc15862dc8766d81666ab62d59faaaca0fa42a8f9957eb34fd5432f78a6e42a70ef5bc2e943d6e41e83e89bd7
+DIST fish-2.1.2.tar.gz 1730198 SHA256 c6c20d5ca3a2a0168461de8abfe85f9e6b255132698ea0109998d4ab68f9f6dd SHA512 4f8f0133094d4d2295546a5b96e044646de2266364610368210b0db529b2d865c1b389f01f311b9b6d6d6dcd2a29040b7a9499d491605ae52a765a76d83db2a5 WHIRLPOOL 2a02dd0f91731cfc79de64245c34fc4361f42406d0c0a60afbafa08c2b9265d11c4adadc96ca5eb49b9053db1eb949c297eee23a7cbc63a30f56ce577b650779
+EBUILD fish-2.1.2.ebuild 2460 SHA256 50f3000782aa9dbfa3955182186f8d3568325c0b3760c0a4fc7c08b44cfa17f0 SHA512 08286eb104b93c5e46e88a0a5b1d8ac4da579b74e097b46d5fae2b24a4031e43b2d2696c540e59da0e349aeed850175c2d83368c59b141d417ae77e503ce3a1c WHIRLPOOL eff4d85d959cab40e8fd158bc270b8a4231896afc15862dc8766d81666ab62d59faaaca0fa42a8f9957eb34fd5432f78a6e42a70ef5bc2e943d6e41e83e89bd7
diff --git a/app-shells/fish/fish-2.1.1.ebuild b/app-shells/fish/fish-2.1.2.ebuild
similarity index 100%
rename from app-shells/fish/fish-2.1.1.ebuild
rename to app-shells/fish/fish-2.1.2.ebuild
|
mark-kubacki/ossdl-overlay | 97a5e81d3ca4fc4ce097175129171eb3e20fa3d9 | app-shells/bash-4.3_p39 | diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index d6f9b73..a6e8886 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,42 +1,52 @@
AUX bash-4.3-append-process-segfault.patch 675 SHA256 cadbc77924ce5e2ba3984263f1e5d5c877214f4b78bd7597c637aec059ee9592 SHA512 2c243f7ca4f689decb0171ae2f5b5babf6b37f8f0988ecfbcb952a8df22dde9a543719d48b64ce45d2308340e9c601c9bd2f14f3f11bd9b9374c0f6fccaf0c7a WHIRLPOOL e614268546796cafd1acc076c3b1212b3f047b809d62480392b0e41283be8decbf32f5db96f4b62fe8d21a61aa95b16b39b93be41e946311490ba198a222feb6
+AUX bash-4.3-arrayfunc.patch 439 SHA256 9407d53d357166464c7c4e3341a72027faba295f416e73f7b5919e10ea15577a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867 WHIRLPOOL 038eb157225aadf2c7d57aa63b1ca7871986ceea982ae91d319b55551377e79b6023a1844c752586083056ae377813366f032e8c51df0f42e35bef0c037ed803
AUX bash-4.3-compat-lvl.patch 628 SHA256 3303c12a499c5fb3f3c9ac7b11b020c83d4d4e3d672cc2df734709b22a6d92d7 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286 WHIRLPOOL 066fbb358f4fb9e32a58b4c4edd10d9c47c50f6aa202e0197c6b6d86a0836d48677561b834e5642b9052e64077efe240cb27144e5032c3e5f4bd9cb62201736e
+AUX bash-4.3-declare-visibility.patch 1332 SHA256 9a8d04e689944f11d0328635885ae36044cf35e94c77b9b49aa67b9839209154 SHA512 4fcfacafab04abc00f02bcaf372a08fb795cae008ac7982364aff923cd347a2ea2e4362fc4f080e81a6046087316a969a8f5cbac3acb01129969af7939a16083 WHIRLPOOL 0bdb8a7e3cb38ebe6f4cd201fd622a155d02a2d682afb2e56edcaef2e595b45ff72811bc6023f50b5e79686b1adbfa2f648af6d672d1334b881bd6ace8ecde22
+AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 SHA256 0302e96630afc5106ea446defd6890fb0b4c96bb27b375e8fbfd96b09eb10335 SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356 WHIRLPOOL 3bf136afd45fe614e3429079b6f41102dda55390d4a3d190f4584aa189f8e623439c13f9efe623644d3990e0f5d2d1b90a8b61eee322f22050b3d5e63d8f5eda
AUX bash-4.3-parse-time-keyword.patch 790 SHA256 44c83641d4f8e7357b0b63b1a5095e751643c30f84fdf5dbc868c9d4a200c15d SHA512 070ab4a46adec60434ef45e04ca0d453fd02c40da8db7051800160c8fa8d3846a6e6bf57db02c583fd699eab69fa03b268107dc58e3332d2f7ed66f00432d6cd WHIRLPOOL ab37acf37bf497bc7c041f341b44dbd755d6e0170d8b74436d79aa63aac1c3cf35c13bd0c56a4eae071639bac27ea81a194c691c42fd4089de8df859745caf5c
-AUX bash-4.3-remove-importing-of-functions-from-variables.patch 1741 SHA256 fb31d828da0d98ae1a896fbb3aa7c8f1ed02dc613b435412048fb5f3ccc3d0d8 SHA512 0a3580d391e75c1ef9155f97338794724cc35991fbe94e26dddead56d6d5ebacc473923e957b694c8c5b4581dd995d87472cc5ff0a2f36f9fbf9a4998664dcde WHIRLPOOL aed2de9fed8dc1211e302ddf71f47007454cddc9076fd0931cfb76aa8a436a872bdbcc5cad2b41c621aaa628901c06c22c593ece01731f211e7832bfb7912cf5
-AUX bash-4.3-term-cleanup.patch 2152 SHA256 9f2d0faac988273dd1d838e8904325d524c996c1560e805c184c5387e31ed28d SHA512 3c13505e292532f10f4ac98ffd0044438b4d77f76d199018f1ff914ed1eb454c2ca12c6ef6996746c6300e37a78a4a0d111ac65f1c8d6897cfbc70bea457adf3 WHIRLPOOL 1db7ca7f51f3ed040a25f24d24221f024baf3a786dbb0477ba62e94f8c64b12d7266045df76ca316e63c0af62232cdd8b77028a86708fe4877b3ff52bec40fe3
AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b
-AUX bashrc 2879 SHA256 72a0b0bf010e72667c229475961f56b3684e02bcf1ccb22da63564ea16c08b54 SHA512 cb89537d4f7bc03c0e05d339f0c6c63cbd61f7963d97d0af13fe3cc2e9ac74755573d8acb28f3c6133a7cbd8f9f6c6c745e0bc215702456b2892a9438876c8a2 WHIRLPOOL 2e6ca7bcb3c2fe0923320f43094f6a11729c128a2f78ba2d51adbb07eb477d3e0573a2af844939fbc8dc1aba52eaf9dce043592a8ceb893148ec855a852e7674
+AUX bashrc-r2 3573 SHA256 38db72531b3e325dc9b5ba022b887267504b8fb2b0afa2ed07c10692eb617295 SHA512 2dc6a49d97f565c6d143d242d96e8979c07c5a7cba68659cdcb07696ec707060f1ea0f7c5d775f9cfdfb20ed8ed70c46da71cb6955f66e9e94fc7248cb065719 WHIRLPOOL ecfdb7263691dc7d4a390fbcc7976f28b472e9831be8304e02c8afb4aea3cc2c87923ce92e8819f7664f5a4089fb5fb6b34878b7855dfea611cb0a27b65c4e4e
AUX dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd WHIRLPOOL 3dc6bc364f8229d123873940743866dfc330e193ab6ec7c5162c61d0ecc319198a64f27176521bfb979c31eed9ed0b2ee2ffce31b050d4cb8e3aa8a5c12c38cf
AUX dot-bash_profile 193 SHA256 ae12206aaa35dc96273ed421f4e85ca26a1707455e3cc9f054c7f5e2e9c53df6 SHA512 064227bb7658f5ac0aaddd7ddda39daa0ffa924601445afa61c02aa19a990a5def377b125111e4817bf80ed80d33e1c111ee13034958b5de1ff8e50c093359a2 WHIRLPOOL cde8efc527122adbfa90d60a79fbdffd953c5573c5c6c5d499e56093517ceb7b48d9cfadd10b7c1d161b6d7f84276403fc233fca2d6798bcff2d0d052023672b
AUX dot-bashrc 551 SHA256 e280e34af6e830c93adb6285f66ead4812ddfb2bbc6a7ff618467f4c933f6446 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b WHIRLPOOL 27c53e3f59bd89d5517b5b22bcf04a9adddee0492c52d34d26a707062fb4c4fa853cdf2726d6ec2621a08f24c32a53651ce5693b6de1be764de3e088eb9f7ee6
DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
DIST bash43-001 1617 SHA256 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 WHIRLPOOL 94d34b6ae2496b4007bf9b3af69847828179dfa90528d7fc2f9a91facc451535e2fa46120cc3ea22156974c92f2633f91423f2d43b4733f8960cde69dfff81b9
DIST bash43-002 1594 SHA256 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 WHIRLPOOL 2d1b6679a1263f7a4325b692c3edac9f5daaa72e3f06dfa88958e70ad64c1fc74b92d8325becfff2c21dd28c002470bdaad50f57037c2676352078291bf0b0bc
DIST bash43-003 1465 SHA256 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 WHIRLPOOL 1ef78321cfe3ca6e9f690ae3dd6a7c06bc72d2e6590bfdaa8543b0ac3ff84eae998e4a2aa44531423cab1137c974b09ac30baf5fa2746e2e5a2006cde03a2b32
DIST bash43-004 1534 SHA256 5ea0a42c6506720d26e6d3c5c358e9a0d49f6f189d69a8ed34d5935964821338 SHA512 6a5177d5f4205ca9d3824601052dc6d0cd768638cdfc125501c5643dd51d537f5d075cbd11a10356caf4205e47a0287c72636065789ecce264129fc92fbda420 WHIRLPOOL 90c2f4f7752cf84a67b1f648137b6c25b8a6f5212fc5dde26d6f0fb6f316e923bec916368ba9ebc6b608bfa0fd82f86b6ac7ec6db32d06b83c3d22730788cfa1
DIST bash43-005 2636 SHA256 1ac83044032b9f5f11aeca8a344ae3c524ec2156185d3adbb8ad3e7a165aa3fa SHA512 e201aa8ef0ce0d74fa5ee42e8171bbb5ba633d831d863a8e8afc5d5157581bb055d16c52b316cc945979a852b0eae7921244a24b89818acfb7c96572ed04d1f8 WHIRLPOOL fd4c6b03fb8b4344cc3833beb0310738af9826c56d2b0cf7c5262f3d2a99e83f700485dafe0e726e84a2dffcb1b907efcc860a685160ff22c99e40c8a2b659b0
DIST bash43-006 1445 SHA256 a0648ee72d15e4a90c8b77a5c6b19f8d89e28c1bc881657d22fe26825f040213 SHA512 d1da3c9d3781482d87cdcbfd69ab3958ed4950f2a00e9d15228ecb4ad5ca8ae253eff378010b4908d04df2ecf658e08f7c2efc97d6a0b8dd2317552c1895d7b2 WHIRLPOOL 55e3c5e7be01f5928247a7677482dde1f0c89a0344ca23c947e9f84bf93d43ce1d7f621b39d74e09f0dd2de85ef304c5d34e68eb0af35cdf61c611e649dcbf68
DIST bash43-007 1331 SHA256 1113e321c59cf6a8648a36245bbe4217cf8acf948d71e67886dad7d486f8f3a3 SHA512 c445b5cdd486d06991c78d4c88e2e44e49f74d1fc07b8e4bc9492cccfc4ff4045587bed6b24d745974c6339340e45b9756c27723fdb79e7591e7d6c5d350a86e WHIRLPOOL 0537006403347466536de5843d62725be75b6f5b4e6d9228c9f5671201de6a473ba04d8fcfa29894584b51f3ee35718bb46c2acc5c014713e03ee24828f10d43
DIST bash43-008 4575 SHA256 9941a98a4987192cc5ce3d45afe879983cad2f0bec96d441a4edd9033767f95e SHA512 53bae88cd3341a4ef8c60d6a294c09402103d1b20f485cf85775e6730a3d2eec8e6ebe15aa6dd95336e4a1f540f21db394823b9d04b416e5af071a7a6c618900 WHIRLPOOL 94a3e9f004729490f70cb3a33de0605fc11f498b6bde2dc37bc08578283e47a3b625619de9d823b2796ce6fbd4982871fa2d428e94c892c863fc448ef2711482
DIST bash43-009 2413 SHA256 c0226d6728946b2f53cdebf090bcd1c01627f01fee03295768605caa80bb40a5 SHA512 8d06fe612cd32cb414fdcdc34d4420b8991b268dd3ddd2dd47b3d01679954debd78e21f697a7f495d2340f0dcc8acdc3ad6809b8870bf5fd300afb1439788776 WHIRLPOOL 66e13efba99362a361e9e7d317773d51862f4c474f5c213654eba875a86b6d83b531b246bbd22c53e8a81fa7b67cb564c2de264ce28063967426fcf586ddda4d
DIST bash43-010 5357 SHA256 ce05799c0137314c70c7b6ea0477c90e1ac1d52e113344be8e32fa5a55c9f0b7 SHA512 e36e550d749f52bab01256ed5f8f1b48fe53190c1a0a0a15c545328261c1f50b85f574b44188855858de1f2d045945770c4940bdecadd8381ea2cf174bde2fee WHIRLPOOL 830e7c82afd2650cbb00818928d22be0e0518aec2752736ff7a5085c5628bc8852c6c409f21684beec0c675d79898917efafb3f8dc1bc6bfcea41e1a8521d4fb
DIST bash43-011 1533 SHA256 7c63402cdbc004a210f6c1c527b63b13d8bb9ec9c5a43d5c464a9010ff6f7f3b SHA512 678bbcd92b927c86631cd42d6d3ab7596a3ffd20b640f471a9783a7972f05d2d4fb15970c12e7645e90d407c5a2d2aadcad698113211724b0ef8d89eccd2cd66 WHIRLPOOL 1d0b84ff75d19db1bfbd60b37551978825902be2187b6407471a8810ebeb9136b2846e6c76505fec0c828a3e83ba8d4dd0950c5e6020b649da7ae530f7d5bf05
DIST bash43-012 1365 SHA256 3e1379030b35fbcf314e9e7954538cf4b43be1507142b29efae39eef997b8c12 SHA512 169453248edb55baf761b0c9c7b296ed2c24543b80fcf4756b8dd398054b6317da285c5e9cd68828f2620b05874f21a08773844ee32416daef76b88d0ef3ee6d WHIRLPOOL 52b6c6d6c374b307ac562c1dfda730dc3ba322d3d6e9c7acb3f2a40461bb61ad5cb54dd65e2e4b72e492b55b436c323cae95ed63948df3b06bcd64a3487b3374
DIST bash43-013 2151 SHA256 bfa8ca5336ab1f5ef988434a4bdedf71604aa8a3659636afa2ce7c7446c42c79 SHA512 536bbf0c9b23eb824579955e7fce892cfc1e1d9fbcfc66810353ac4ff238e9e57361c0a46b3f3573ca8ca563331070ce55442ffea38e2a632840b6a318db1c88 WHIRLPOOL 15fe2e97ac2a07a1d4c0f9946adc63e64b9141a3837391206fd5c934853f7e9ad9ede3baeecdd7a0dbb73e2bf007db8a5b57f0f8e2d03d693de09502dff32636
DIST bash43-014 3533 SHA256 5a4d6fa2365b6eb725a9d4966248b5edf7630a4aeb3fa8d526b877972658ac13 SHA512 79fb50f62dbdca5e45a1359570e6d2173d442b3d4ddd4eb44809ed45ac022de4fe3f0aadd7672b4c8d9739405d51762486ee0c677b56f9c7d60e6224be84b87a WHIRLPOOL 10b6a2b7a7e5e6dfb3dd730b9ccc2ce3152bda1983a78745aa7367e9f5671695577d45070ad800158a36ffeb7db176e29f6b48d139075770ec773a478adfa1b2
DIST bash43-015 1894 SHA256 13293e8a24e003a44d7fe928c6b1e07b444511bed2d9406407e006df28355e8d SHA512 38a7af22f13f1f45705ceadf3abb52be75f3239959c2b1d57f333d137f25f14ed92c4d209b35417d449b1ec4291bbd984bb5fd11ad40375b22d2668b33fb8efb WHIRLPOOL c06aa4977f891ec606f107157a0295d5025fbd24a620644547ee3f3a79582aae1ea4cd4be4254f92c6d2aee9322934839f01cc118148cea85af700e6f83c21cc
DIST bash43-016 3674 SHA256 92d60bcf49f61bd7f1ccb9602bead6f2c9946d79dea0e5ec0589bb3bfa5e0773 SHA512 52ab2966ccd42554c8bd76041e07921388220b46c93c34190197cdda38a085fd499d71e2e0a10daea130e6782ada556f35b1a37d06d023e83c4c4d665d07cd3f WHIRLPOOL 9b7eb252291680d5db2596700774fddcab7e5c6c14ed5b1da7f8e23e1eaae85a927cf69d7662807b99c63fa083d2267f7e70076d4d4927a8bd4cb9273c416b4c
DIST bash43-017 1565 SHA256 1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c3b8a23e7780 SHA512 88b11f324a780823b459b1e8a0904348c56079b4103cb86025d34dbba02543b0b7fbc2397bf043c24c1363f30539a6fe9b9f9fc717be9798f466071d1d420bb9 WHIRLPOOL 1aa1160771b98d393a2fb341e9025c2169aa43123f682bbe7648038e555b4f70eb1dbdba90492edb514c9621468f5005c2cf5fff82921e941ad3ca42534e7b1d
DIST bash43-018 1315 SHA256 7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58 SHA512 f83d8e1d6d8fa8adf1715b8d4130730a13f5cd626f75e9e4b8c63244645a45a3f1fbac03081bb9d1e46864919d1b3189a9bb6d7a5e7a8854e6270ab3269c771f WHIRLPOOL 14a216257c3d1d3501dfc23d72ad8c085a216cdac83d5d909922d51b502ce83fb454c7e64a8d44e91a87a1a09237d965272fb563ae945c5d81688e9f0686264e
DIST bash43-019 2610 SHA256 a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23 SHA512 77e6dac3079d9282f6f85940a762b0da2473ac0d35e9bad2ebc2862bf0f3c4376a6220c746c1c37de0b4d492251ec9531a62c8a042a1be5e485f8f5ae6fa0704 WHIRLPOOL 5acde269ea62e2074ca5eb30750dbd67512b69658908f532165a90873f54de7705b0d41515ac6278e942f8ea66e0abe67c13b842e404a41cd7684ec0683928ef
DIST bash43-020 2777 SHA256 ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98 SHA512 fa06563eb46609115750ffa88098b07c608cc8b13fc31356f33e1428a4da4d2610e122e0241356afcfadfecc5ccee5db4b7cf07f74005e7f30240ada4a81b5f7 WHIRLPOOL 9f05ce5028f20e7cbc11c1995d99a47274f782f228faa752919e0444afe1df748adb7837c0a3affa20633c63ad0175780327b9a02a39f5ada494736f0fd694dd
DIST bash43-021 1623 SHA256 41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9 SHA512 90dc85302d9bc60e68fa8cce472b7e022d8a6ccee361f97aad4cbe5f1585b4870ab9997a3e6fac420aaf84c3dce9757716eb08f4fa6b38e14bac4f2d5d503731 WHIRLPOOL e7930992f6e2a1f5a07458eee74ed118fe93152ceb78fbdb41a4a3d799c5f9aa71fac52bc3cd43c321b983c5a4309e9884d37cac1facb54a2f38383527c8e765
DIST bash43-022 1782 SHA256 fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88 SHA512 721b772349f9e0cc65975e419fabe4acdb23c77796a5d8fde01f110687ea1cb7d23fb706fc0452fb3c2082958a81c95b82f277e1f8f722b1156913efd59afc30 WHIRLPOOL 7387429460d85bffb9f7ce9cbd524f4b2c21b116beff30424db2cb66d48ec81707c7cb9479d5d72bcf36879248963a405dcdf87515fc0f5b6642568d9d236df2
DIST bash43-023 3414 SHA256 9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4 SHA512 d45b5f5dc4682c7260c8b6ef6faa99c929d2159cc34534931790f71f76e7324376e4a5d4a2a3bc21c16c25a8206554580943e7a3f672ec5a4af16cbccd216819 WHIRLPOOL 4cee4cdbe8525aff748a42a19d1d7cbc659cc8fe99b0bca3b2875ddfe5b8325f504cfdf09fb6edc70b1040f00eae3a4ab5fcda64cfa93ce96ce1e8d8c902b78f
DIST bash43-024 1909 SHA256 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c SHA512 eada2b4839b81f28f63a874e08c72dfee9708c0982d2447347c17770a29c8fbb3d3f8c58c8a22b0d46a9d10abbd79dec11b5815257fb39af06420ef3602f8499 WHIRLPOOL 06059921dccb590aa7847ff5212bcb3e6a177aa96749eb19012d633ebf86badb83aad3b75ba8b304c620380d08395c0e37da4e2934a833ef1c0e1daf0f42ca72
DIST bash43-025 3940 SHA256 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251 SHA512 b4ea28ea0a24c8609d5c3a10114c5fec87ab978ec60700c36992d093e7afd976dbaee4a0d62c6e41e8ed6674c356fc26589f4c5168642dec8df8d727d7127822 WHIRLPOOL b3385e49dfbbf156bea9ebbd10f18dcb88c1d489c61c5bd6c16d1caac8a2ebf1ce057ec350d661ebd0307330a61f8c1088bef1cb133368919ccd0b5e81c3e7e3
DIST bash43-026 1575 SHA256 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d SHA512 d55620c86ab4835eaf53c18033a939e00ebbef7045d1429bd6fb212be6da167c368b4c03aec6c00ba60a1363b9cf8a4828e85c8108c5476b4a342e6c57f03897 WHIRLPOOL 3c21e3b21f1967d85b49386c05945859ee0fab2bbe0062052319876bbe3283bf3a7b50a9e160e36e9ee96fbe79ac13c90d86ffb4157ef0cb0641acd9dafb917e
DIST bash43-027 6889 SHA256 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe SHA512 6941156db9a6ab35b2d6ddc63eec064e03da779e29f47e33b467711e3405c9adb58ad33be3ad3c77aea1e84a314d5404c8e1a8475408991f5f719b93c5a276b3 WHIRLPOOL 241a77807f142765fac71490987bd62a93bbd57c6ad2f83fbc645bf0618286fbfc3cd269eadf99e7f973a9e88ac08c5065868f8ad38727c17bb6056cedc83888
DIST bash43-028 69606 SHA256 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88 WHIRLPOOL f01e8fe2c09a7bdefacd7114cc8377f7ccd65de6c3bafac05595f1400f330ba0ba63ce97fe7b9b49957639c75438bb5ceb853890094cb0c4e43fadc1795b89b6
DIST bash43-029 1824 SHA256 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07 WHIRLPOOL 857275184a8a449461b5aebba12d8231e1e33a2119693fa2c865ead18d4c462dea8151cfc3e0d121c2e5569d9984856ba69820aaa54399ddc77bb849ea9de890
DIST bash43-030 63206 SHA256 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4 WHIRLPOOL 2184fa715fb90de89f18ba2b27dca612b684a85e9228d58ccf2d62a96a2e575929b3e1a47fbb5809e4c231a6657084be4a076271cfdd5b8b7dde493f2cb40a01
-EBUILD bash-4.3_p30-r1.ebuild 7664 SHA256 c92708299e58189c9c0fd333dd4e21f459567f9ca74bb544a36431ae596797e0 SHA512 d9e31fcc2ca2ede5316592d6a1ff383ebc3ca3d39b1cca336ae14b5bd09811a6109a136f9228d0f8a1b7af6d91064edc31c839130e844cee136938cfc800344b WHIRLPOOL 1f393b14404f7303d3587e37ffea7aaf4f771afaf74d46cc4e1e08d1a928c99e628d4cffebe50950b3e867a8a4c41fb0ea14edf3a280e086844ab709e598bf3e
+DIST bash43-031 3689 SHA256 cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d SHA512 3178b4ab48860ed284bb64ac9b36b6d4d1681c0d4bc37ceeb93e73c9dd140bd0a71e86a86ae595aab43babedae79d75a4b11c57e6ad6800f43ab5f7647f6c4c9 WHIRLPOOL 1e21f10a8ade1317e6672fc76e7b0e988d7c02feed3b1e553c60e4717df0b6036ce0822e9f9bf603abaf5b9b248ffa63421601a7f5c2dfcc9c60a98fe77b23dc
+DIST bash43-032 1734 SHA256 889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a SHA512 47afc6308bd4bed20661a87761330854508a745a1c2a7f2d661fbe0d95b00d2d5707cc04f510fcd027b3fdb065d9414697715bff33c707a56955e27341d1bfd0 WHIRLPOOL 4b7ef4ac84269a292fa4527d2796508f4da16f9579726d90664305bbd3c2a3fa9002db6c0d60b022a54e756590a196f5dfcb86492a6d776476189546edb488c7
+DIST bash43-033 7038 SHA256 fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16 SHA512 3eed328960d77317e1742a9b53ccf40b304657cd535d7f283bdc24219c65ebdcb7aca3019fc8fd9e7152f42dc411625acb1b529f80e4a6c5b750b8f7cbd2e4d0 WHIRLPOOL bdfa9cd681ff499daa14b2c28e294b929f4c8526f11d555046158f035cc2c7a9c48f49aa0837c3ea80cdbc6d960119f40260da4a664944d7e599e40d6227254e
+DIST bash43-034 2392 SHA256 f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889 SHA512 95d09b843287dc18845b75ac6657a2bd7bd71c31a62f922e7177368678ddf13c0f20498bc17bdf4cd5c1c34d40838174791d1e464ceca168957c68e789e34d06 WHIRLPOOL b9919bf7aabb11e6cc4dd17dd9433775320bc025a22e23b40edbc649e54dfae3e86a3670e30af4863ff8612ade43c91906d15acdb652ac2c37f84f731fba3279
+DIST bash43-035 1800 SHA256 370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3 SHA512 1ea68e7ffb15356fdcf5eed08dd7fe0e16aea2928a4510fcfafe79e926d7ac25f013641bf547bfff0401bbb7e1476a802208e4f1ccb8b02ed20c094f99e450d2 WHIRLPOOL a5818ea98353c191210e8d66af0ea998c0b831e6af73035112405c228e18afc8ff243bdc2f3263728fc1d8aa2e7be43ae559cb02662b277478081e127b4fc37a
+DIST bash43-036 1539 SHA256 ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c SHA512 089a05879b8b65c9f11c55127364a3281b651e71cbedfad6221e31dc88eca15d813986f999a22921726873db9590b7b50afcd6162027fe516c2a94e8734e3ee7 WHIRLPOOL 3468783b0c10ae74c548e0d0cca3694c21775e6ea83ea1a071ae27b24542b67ffc785e17d6bc849c8030c667c7f531ba1a2de8e808f7820b19e88576e12e098c
+DIST bash43-037 1284 SHA256 33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813 SHA512 7977c0fb9142cdea259b06322092aab3231b9773cc397519bedb6f731aea02a46441c67615b31fd19c886678eb1985687d07357d15fc7f08e946404efc564966 WHIRLPOOL fc3e010f065aa3087ac4e22352459dc2cdd5a232653749250dfebf17023a405ed78e0b2dd8ad66727aaa2645173dc14be111e32e8fb71a13786f4fe6ac6875ac
+DIST bash43-038 2354 SHA256 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367 SHA512 2ef2557b17867b5820a9e5619daa1cddb3fadcff7470504c148828a3007217767da4bf540dc835cf263f9c943b2c1aa909c845f8410f69e2d04c8b3d659efee3 WHIRLPOOL 66a2878b850cce96e532625cdcd88d0402c775dc585419c946ddebb206fbf8bee91846cbdce7a88b9caef09e1b02c144e3e71734c918c1b2c09cec67c68fa8d0
+DIST bash43-039 1531 SHA256 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 WHIRLPOOL 3ee69bc81a25afe4998f76d43c9c2f4f6aca61f545a7304156fceda0f8a99c86379b673967bc7f72c26f5bde01248f77d7aee6372164c2e3b94c7781c7f6bd08
+EBUILD bash-4.3_p39.ebuild 7715 SHA256 3befb78c0c8a71ee6e40c07e6e5ca910bd6b92378ed41770da32e8f5e2da68a4 SHA512 c0b2c4eddb50c2411532c916b26fb79573fc91875cb165be750d9bdcb56fa7a70ae95de8615d5f941402703caabf7d495b7e596004f23fa4fcbe0af6ac6ccd49 WHIRLPOOL 71eb8c25d4b86eb31716e862817d945e4bc41d47fe7b6e7c24c9a39874f705ebb4abd58358c5cfc4e1928899a678a4b8370d360740f67cc4dd294cabd11651ea
diff --git a/app-shells/bash/bash-4.3_p30-r1.ebuild b/app-shells/bash/bash-4.3_p39.ebuild
similarity index 94%
rename from app-shells/bash/bash-4.3_p30-r1.ebuild
rename to app-shells/bash/bash-4.3_p39.ebuild
index d40b73f..5fe43ab 100644
--- a/app-shells/bash/bash-4.3_p30-r1.ebuild
+++ b/app-shells/bash/bash-4.3_p39.ebuild
@@ -1,256 +1,255 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
inherit eutils flag-o-matic toolchain-funcs multilib
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
PLEVEL=${PV##*_p}
MY_PV=${PV/_p*}
MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
if [[ ${opt} == -s ]] ; then
echo "${@/#/${DISTDIR}/}"
else
local u
for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
printf "${u}/${pn}-${pv}-patches/%s " "$@"
done
fi
}
# The version of readline this bash normally ships with.
READLINE_VER="6.3"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 amd64-fbsd ~sparc-fbsd x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
readline? ( >=sys-libs/readline-${READLINE_VER} )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"
S=${WORKDIR}/${MY_P}
pkg_setup() {
if is-flag -malign-double ; then #7332
eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
eerror "as it breaks LFS (struct stat64) on x86."
die "remove -malign-double from your CFLAGS mr ricer"
fi
if use bashlogger ; then
ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
ewarn "This will log ALL output you enter into the shell, you have been warned."
fi
}
src_unpack() {
unpack ${MY_P}.tar.gz
}
src_prepare() {
# Include official patches
- if [[ ${PLEVEL} -gt 0 ]] ; then
- epatch $(patches -s)
- fi
+ [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
# Clean out local libs so we know we use system ones w/releases.
if [[ ${PV} != *_rc* ]] ; then
rm -rf lib/{readline,termcap}/*
touch lib/{readline,termcap}/Makefile.in # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
fi
# Avoid regenerating docs after patches #407985
sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
touch -r . doc/*
epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
- epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
- epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
+ epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
+ epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
# removes importing of functions from variables
sed_prefix='\(if (privmode[^\n]*STREQN ("() {"[^\n]*\n\s*{\)'
sed_suffix='\(}\s*\n\s*#if defined (ARRAY_VARS)\s*\n#\s*if ARRAY_EXPORT\)'
display_err='report_error (_("importing of functions has been removed completely"))\;'
#sed -i -n '1h;1!H;${g;s:'${sed_prefix}'.*'${sed_suffix}':\1'${display_err}'\2:;p;}' \
sed -i -n '1h;1!H;${g;s:\(if (privmode[^\n]*STREQN ("() {"[^\n]*\n\s*{\).*\(}\s*\n\s*#if defined (ARRAY_VARS)\s*\n#\s*if ARRAY_EXPORT\):\1report_error (_("importing of functions has been removed completely"))\;\2:;p;}' \
- variables.c \
- || die
+ variables.c || die
epatch_user
}
src_configure() {
local myconf=()
# For descriptions of these, see config-top.h
# bashrc/#26952 bash_logout/#90488 ssh/#24762
append-cppflags \
-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-DNON_INTERACTIVE_LOGIN_SHELLS \
-DSSH_SOURCE_BASHRC \
$(use bashlogger && echo -DSYSLOG_HISTORY)
# Don't even think about building this statically without
# reading Bug 7714 first. If you still build it statically,
# don't come crying to us with bugs ;).
#use static && export LDFLAGS="${LDFLAGS} -static"
use nls || myconf+=( --disable-nls )
# Historically, we always used the builtin readline, but since
# our handling of SONAME upgrades has gotten much more stable
# in the PM (and the readline ebuild itself preserves the old
# libs during upgrades), linking against the system copy should
# be safe.
# Exact cached version here doesn't really matter as long as it
# is at least what's in the DEPEND up above.
export ac_cv_rl_version=${READLINE_VER}
# Force linking with system curses ... the bundled termcap lib
# sucks bad compared to ncurses. For the most part, ncurses
# is here because readline needs it. But bash itself calls
# ncurses in one or two small places :(.
if [[ ${PV} != *_rc* ]] ; then
# Use system readline only with released versions.
myconf+=( --with-installed-readline=. )
fi
if use plugins; then
append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
else
# Disable the plugins logic by hand since bash doesn't
# provide a way of doing it.
export ac_cv_func_dl{close,open,sym}=no \
ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
sed -i \
-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
configure || die
fi
tc-export AR #444070
econf \
--docdir='$(datarootdir)'/doc/${PF} \
--htmldir='$(docdir)/html' \
--with-curses \
$(use_with afs) \
$(use_enable net net-redirections) \
--disable-profiling \
$(use_enable mem-scramble) \
$(use_with mem-scramble bash-malloc) \
$(use_enable readline) \
$(use_enable readline history) \
$(use_enable readline bang-history) \
"${myconf[@]}"
}
src_compile() {
emake
if use plugins ; then
emake -C examples/loadables all others
fi
}
src_install() {
local d f
default
dodir /bin
mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
dosym bash /bin/rbash
insinto /etc/bash
- doins "${FILESDIR}"/{bashrc,bash_logout}
+ doins "${FILESDIR}"/bash_logout
+ newins "${FILESDIR}"/bashrc-r2 bashrc
+ keepdir /etc/bash/bashrc.d
insinto /etc/skel
for f in bash{_logout,_profile,rc} ; do
newins "${FILESDIR}"/dot-${f} .${f}
done
local sed_args=(
-e "s:#${USERLAND}#@::"
-e '/#@/d'
)
if ! use readline ; then
sed_args+=( #432338
-e '/^shopt -s histappend/s:^:#:'
-e 's:use_color=true:use_color=false:'
)
fi
sed -i \
"${sed_args[@]}" \
"${ED}"/etc/skel/.bashrc \
"${ED}"/etc/bash/bashrc || die
if use plugins ; then
exeinto /usr/$(get_libdir)/bash
doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
insinto /usr/include/bash-plugins
doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
fi
if use examples ; then
- for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
+ for d in examples/{functions,misc,scripts,startup-files} ; do
exeinto /usr/share/doc/${PF}/${d}
insinto /usr/share/doc/${PF}/${d}
for f in ${d}/* ; do
if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
doexe ${f}
else
doins ${f}
fi
done
done
fi
doman doc/*.1
newdoc CWRU/changelog ChangeLog
dosym bash.info /usr/share/info/bashref.info
}
pkg_preinst() {
if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
mkdir -p "${EROOT}"/etc/bash
mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
fi
if [[ -L ${EROOT}/bin/sh ]] ; then
# rewrite the symlink to ensure that its mtime changes. having /bin/sh
# missing even temporarily causes a fatal error with paludis.
local target=$(readlink "${EROOT}"/bin/sh)
local tmp=$(emktemp "${EROOT}"/bin)
ln -sf "${target}" "${tmp}"
mv -f "${tmp}" "${EROOT}"/bin/sh
fi
}
pkg_postinst() {
# If /bin/sh does not exist, provide it
if [[ ! -e ${EROOT}/bin/sh ]] ; then
ln -sf bash "${EROOT}"/bin/sh
fi
}
diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch
new file mode 100644
index 0000000..f44d184
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-arrayfunc.patch
@@ -0,0 +1,15 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html
+
+diff --git a/arrayfunc.c b/arrayfunc.c
+index 804e6da..0f900aa 100644
+--- a/arrayfunc.c
++++ b/arrayfunc.c
+@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags)
+
+ for (list = nlist; list; list = list->next)
+ {
+- iflags = flags;
++ iflags = (flags & ~ASS_APPEND);
+ w = list->word->word;
+
+ /* We have a word of the form [ind]=value */
diff --git a/app-shells/bash/files/bash-4.3-declare-visibility.patch b/app-shells/bash/files/bash-4.3-declare-visibility.patch
new file mode 100644
index 0000000..0343155
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-declare-visibility.patch
@@ -0,0 +1,60 @@
+http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00075.html
+
+assign_array_var_from_word_list: after assignment, mark variable as no
+longer invisible
+
+assign_array_var_from_string: after assignment, mark variable as no
+longer invisible
+
+diff --git a/arrayfunc.c b/arrayfunc.c
+index c2ea0e5..6dab71c 100644
+--- a/arrayfunc.c
++++ b/arrayfunc.c
+@@ -407,6 +407,9 @@ assign_array_var_from_word_list (var, list, flags)
+ (*var->assign_func) (var, l->word->word, i, 0);
+ else
+ array_insert (a, i, l->word->word);
++
++ VUNSETATTR (var, att_invisible); /* no longer invisible */
++
+ return var;
+ }
+
+@@ -639,6 +642,10 @@ assign_array_var_from_string (var, value, flags)
+
+ if (nlist)
+ dispose_words (nlist);
++
++ if (var)
++ VUNSETATTR (var, att_invisible); /* no longer invisible */
++
+ return (var);
+ }
+
+
+bind_int_variable: make sure `v' is non-null before making it visible
+
+diff --git a/variables.c b/variables.c
+index 2f07ebb..cbe7806 100644
+--- a/variables.c
++++ b/variables.c
+@@ -2872,10 +2872,12 @@ bind_int_variable (lhs, rhs)
+ #endif
+ v = bind_variable (lhs, rhs, 0);
+
+- if (v && isint)
+- VSETATTR (v, att_integer);
+-
+- VUNSETATTR (v, att_invisible);
++ if (v)
++ {
++ if (isint)
++ VSETATTR (v, att_integer);
++ VUNSETATTR (v, att_invisible);
++ }
+
+ return (v);
+ }
+--
+2.3.0
+
diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
new file mode 100644
index 0000000..20bf340
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
@@ -0,0 +1,13 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html
+
+--- bash-4.3/builtins/mapfile.def
++++ bash-4.3/builtins/mapfile.def
+@@ -339,7 +339,7 @@
+ else
+ array_name = list->word->word;
+
+- if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0)
++ if (legal_identifier (array_name) == 0)
+ {
+ sh_invalidid (array_name);
+ return (EXECUTION_FAILURE);
diff --git a/app-shells/bash/files/bash-4.3-remove-importing-of-functions-from-variables.patch b/app-shells/bash/files/bash-4.3-remove-importing-of-functions-from-variables.patch
deleted file mode 100644
index a2d2d41..0000000
--- a/app-shells/bash/files/bash-4.3-remove-importing-of-functions-from-variables.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From de3d0af2683ed1aa52913ca593fe672d2176d41e Mon Sep 17 00:00:00 2001
-From: W-Mark Kubacki <[email protected]>
-Date: Sat, 27 Sep 2014 21:32:50 +0200
-Subject: [PATCH] Remove importing of functions from variables.
-
----
- variables.c | 29 +----------------------------
- 1 file changed, 1 insertion(+), 28 deletions(-)
-
-diff --git a/variables.c b/variables.c
-index 92a5a10..f0e18dc 100644
---- a/variables.c
-+++ b/variables.c
-@@ -351,34 +351,7 @@ initialize_shell_variables (env, privmode)
- the environment in privileged mode. */
- if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
- {
-- string_length = strlen (string);
-- temp_string = (char *)xmalloc (3 + string_length + char_index);
--
-- strcpy (temp_string, name);
-- temp_string[char_index] = ' ';
-- strcpy (temp_string + char_index + 1, string);
--
-- /* Don't import function names that are invalid identifiers from the
-- environment, though we still allow them to be defined as shell
-- variables. */
-- if (legal_identifier (name))
-- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
--
-- if (temp_var = find_function (name))
-- {
-- VSETATTR (temp_var, (att_exported|att_imported));
-- array_needs_making = 1;
-- }
-- else
-- {
-- if (temp_var = bind_variable (name, string, 0))
-- {
-- VSETATTR (temp_var, (att_exported | att_imported | att_invisible));
-- array_needs_making = 1;
-- }
-- last_command_exit_value = 1;
-- report_error (_("error importing function definition for `%s'"), name);
-- }
-+ report_error (_("importing of functions has been removed from this BASH"));
- }
- #if defined (ARRAY_VARS)
- # if ARRAY_EXPORT
---
-1.9.3
-
diff --git a/app-shells/bash/files/bash-4.3-term-cleanup.patch b/app-shells/bash/files/bash-4.3-term-cleanup.patch
deleted file mode 100644
index be7a5de..0000000
--- a/app-shells/bash/files/bash-4.3-term-cleanup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00031.html
-
-*** ../bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400
---- bashline.c 2014-09-08 11:28:56.000000000 -0400
-***************
-*** 203,206 ****
---- 203,207 ----
- extern int array_needs_making;
- extern int posixly_correct, no_symbolic_links;
-+ extern int sigalrm_seen;
- extern char *current_prompt_string, *ps1_prompt;
- extern STRING_INT_ALIST word_token_alist[];
-***************
-*** 4209,4214 ****
- /* If we're going to longjmp to top_level, make sure we clean up readline.
- check_signals will call QUIT, which will eventually longjmp to top_level,
-! calling run_interrupt_trap along the way. */
-! if (interrupt_state)
- rl_cleanup_after_signal ();
- bashline_reset_event_hook ();
---- 4262,4268 ----
- /* If we're going to longjmp to top_level, make sure we clean up readline.
- check_signals will call QUIT, which will eventually longjmp to top_level,
-! calling run_interrupt_trap along the way. The check for sigalrm_seen is
-! to clean up the read builtin's state. */
-! if (terminating_signal || interrupt_state || sigalrm_seen)
- rl_cleanup_after_signal ();
- bashline_reset_event_hook ();
-*** ../bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500
---- sig.c 2014-09-08 11:26:33.000000000 -0400
-***************
-*** 533,538 ****
- /* Set the event hook so readline will call it after the signal handlers
- finish executing, so if this interrupted character input we can get
-! quick response. */
-! if (interactive_shell && interactive && no_line_editing == 0)
- bashline_set_event_hook ();
- #endif
---- 533,540 ----
- /* Set the event hook so readline will call it after the signal handlers
- finish executing, so if this interrupted character input we can get
-! quick response. If readline is active or has modified the terminal we
-! need to set this no matter what the signal is, though the check for
-! RL_STATE_TERMPREPPED is possibly redundant. */
-! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
- bashline_set_event_hook ();
- #endif
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc-r2
similarity index 68%
rename from app-shells/bash/files/bashrc
rename to app-shells/bash/files/bashrc-r2
index a398eb1..c9bd88e 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc-r2
@@ -1,88 +1,108 @@
# /etc/bash/bashrc
#
# This file is sourced by all *interactive* bash shells on startup,
# including some apparently interactive shells such as scp and rcp
# that can't tolerate any output. So make sure this doesn't display
# anything or bad things will happen !
# Test for an interactive shell. There is no need to set anything
# past this point for scp and rcp, and it's important to refrain from
# outputting anything in those cases.
if [[ $- != *i* ]] ; then
# Shell is non-interactive. Be done now!
return
fi
# Bash won't get SIGWINCH if another process is in the foreground.
# Enable checkwinsize so that bash will check the terminal size when
# it regains control. #65623
# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
shopt -s checkwinsize
-# Enable history appending instead of overwriting. #139609
+# Disable completion when the input buffer is empty. i.e. Hitting tab
+# and waiting a long time for bash to expand all of $PATH.
+shopt -s no_empty_cmd_completion
+
+# Enable history appending instead of overwriting when exiting. #139609
shopt -s histappend
+# Save each command to the history file as it's executed. #517342
+# This does mean sessions get interleaved when reading later on, but this
+# way the history is always up to date. History is not synced across live
+# sessions though; that is what `history -n` does.
+# Disabled by default due to concerns related to system recovery when $HOME
+# is under duress, or lives somewhere flaky (like NFS). Constantly syncing
+# the history will halt the shell prompt until it's finished.
+#PROMPT_COMMAND='history -a'
+
# Change the window title of X terminals
case ${TERM} in
xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
- PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
+ PS1='\[\033]0;\u@\h:\w\007\]'
;;
screen*)
- PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
+ PS1='\[\033k\u@\h:\w\033\\\]'
+ ;;
+ *)
+ unset PS1
;;
esac
use_color=false
#BSD#@# BSD doesn't typically come with dircolors so we need
#BSD#@# to hardcode some terminals in here.
#BSD#@case ${TERM} in
#BSD#@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|screen|cons25) use_color=true;;
#BSD#@esac
# Set colorful PS1 only on colorful terminals.
# dircolors --print-database uses its own built-in database
# instead of using /etc/DIR_COLORS. Try to use the external file
# first to take advantage of user additions. Use internal bash
# globbing instead of external grep binary.
safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
match_lhs=""
[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
[[ -z ${match_lhs} ]] \
&& type -P dircolors >/dev/null \
&& match_lhs=$(dircolors --print-database)
[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
if ${use_color} ; then
# Enable colors for ls, etc. Prefer ~/.dir_colors #64489
if type -P dircolors >/dev/null ; then
if [[ -f ~/.dir_colors ]] ; then
eval $(dircolors -b ~/.dir_colors)
elif [[ -f /etc/DIR_COLORS ]] ; then
eval $(dircolors -b /etc/DIR_COLORS)
fi
fi
if [[ ${EUID} == 0 ]] ; then
- PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+ PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
else
- PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+ PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
fi
#BSD#@export CLICOLOR=1
#GNU#@alias ls='ls --color=auto'
alias grep='grep --colour=auto'
alias egrep='egrep --colour=auto'
alias fgrep='fgrep --colour=auto'
else
if [[ ${EUID} == 0 ]] ; then
# show root@ when we don't have colors
- PS1='\u@\h \W \$ '
+ PS1+='\u@\h \W \$ '
else
- PS1='\u@\h \w \$ '
+ PS1+='\u@\h \w \$ '
fi
fi
+for sh in /etc/bash/bashrc.d/* ; do
+ [[ -r ${sh} ]] && source "${sh}"
+done
+
# Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs
+unset use_color safe_term match_lhs sh
|
mark-kubacki/ossdl-overlay | f67932785934293fbb5c33463bc3dc53bd6c09b2 | app-arch/pxz-5.0_pre20141018 | diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
new file mode 100644
index 0000000..86b1428
--- /dev/null
+++ b/app-arch/pxz/Manifest
@@ -0,0 +1,2 @@
+DIST pxz-5.0_pre20141018.tar.xz 11392 SHA256 c10347058fc3dba2a5163587d0175752efff5b43706236e183c3b6c48c2b60a2 SHA512 402e1526116d90da03af5393593a7743ad422b3280f87c11e804d6013add3ac979b6caffc3c3f8d50d646e328f3ec5e9bcb4ce416f6b5a0f7d2214a5f2413cbf WHIRLPOOL db581b4336dac1008d1558a5a2bf078b40860bc4eed637bedf1a2498c31d08651d7a232c951205f2ecea570f826e8d1b9e60e289331f3d1a6e7b8731e0fb7ed1
+EBUILD pxz-5.0_pre20141018.ebuild 467 SHA256 c35ae7deedea4e77a7a59dbf3da818ea857d027b882ea14f676efe7a80af397b SHA512 caa3fa74a5ba240cd3bcc2e87cbaaefb34e7e87f35f95ad9f456252e2821c4aa18ebd4c4821d8e58a3e2a872060cc676b396f38be2bb938bbdf109b934faa9be WHIRLPOOL 09f3d18a84694a37d9c117cb600f827b9f41ecd1f73e98988bed665f18b0cb3873d69f1e2409efd9c6356c7923950b4e06488e5d72edb434f83b3ce6170323cd
diff --git a/app-arch/pxz/pxz-5.0_pre20141018.ebuild b/app-arch/pxz/pxz-5.0_pre20141018.ebuild
new file mode 100644
index 0000000..6d57643
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20141018.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit flag-o-matic
+
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
+SRC_URI="mirror://ossdl/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}
+ sys-devel/gcc[openmp]"
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+}
|
mark-kubacki/ossdl-overlay | 6ef9e7e94c9edd63958a8e46532132f7979f9b3f | sys-libs/ncurses-5.9.20150530 | diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 72e298c..be08240 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,8 +1,10 @@
AUX ncurses-5.7-nongnu.patch 361 SHA256 7efcf3daf57d73e348bea1ea7ee77071aef5338631958fd0db595a011570cec4 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f WHIRLPOOL a93e22415092ab51f769e42586813c8fed5b502e1dd86d09844f524876ac025ca81399dde483478087bb6241214f85c29a27f8b4ccadc2aec37be99dc7d6da1b
AUX ncurses-5.8-gfbsd.patch 695 SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2 WHIRLPOOL 6c2f865bc22a3932f6f973f7b53c5a50254505c4944c656af95c2399933c31acc5d5536d59fe9fe7c59ef537ce0d39ca19c9d0558e4aaacb7122749a575cadac
AUX ncurses-5.9-fix-clang-build.patch 1291 SHA256 0ffec4dbc7dc4a2356460c2a001b6ffbd8b060ae0afbdf3551a13575c20830d0 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1 WHIRLPOOL d5d363f6d7cdcc350b195066c8183609bd9351a48603acdae2f374af13afb23a7bd05cbac86b13d2162daf5bd895eb5acce4769fce2f0b4b8da2896e00d1f846
AUX ncurses-5.9-pkg-config.patch 1022 SHA256 8b32d53c4a94eeb78f39c29b1e66813bdb2fd5225f96ab7c26950f96679b58fb SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6 WHIRLPOOL 9056961c1b617ca3286cc4c528a5b5da821a5472da105d82b56c925034454a600e818265627d2f17dbad5184ecf78ea4d14807838bed789ca01a85f39755b656
AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 WHIRLPOOL 1e2fe441d97671b84f49388555c351b235a93704fb7fcf13c14343db569cc91f21d75b60eb635c4c1c3ad18778bcb50e5aa63d25583224ed644edff35356dd2c
DIST ncurses-5.9-20141206-patch.sh.bz2 1279460 SHA256 fad17ae799d9371b1e292c5917c129254440591efce95a4936be46e84542de9a SHA512 2be09ff3ca58fd7258761d85181de2017390a08acc7d87b37c7d0f5fccf736d6736b6d683fc2487f50179ebce0cfddc38c5ed0a1a07956a4267209fa2bb82434 WHIRLPOOL 134d863b663e9c73124316de5c69ec75db03d579c1d58031abc87cfb6f981098299a09b556713f2e73a71596cb14caba5d33980fdd4f5268205a9c3b6e708dd7
+DIST ncurses-5.9-20150530.tgz 3069811 SHA256 fc374174d3e8699d79f45119cd70b397651035bcc830363d49f7cfe8cebf4e24 SHA512 38736898cbafc1564b3c78e18a73510542c9875ae0fd12bfb6684cffee32cd985c15d25907712d70373ca9647e13b76b8257e8b6a09e7011c61e3a3152b88224 WHIRLPOOL bcd4602705675b255f02840b2ac1b906afdba0ac0f900da95ed40ff8aec8b37b931f02cb8cebba131d122ec9d6aa2086cc7f0b266d3de6dddb35c7ee142bc36b
DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 WHIRLPOOL 069e98c6392ce9aca960c72a20f1a502387d33a4b237aaeaa95548024ce4d47b129eafbe0288d21c590e725fe71aaca21cacb300f11a660b7234cb39a777672a
EBUILD ncurses-5.9.20141206.ebuild 7183 SHA256 620fbfeb712d306937a7d335146a562fa8a4dd6c0309ac5b3cef6bc372c549df SHA512 076533baff8f1139b8f046a750be8b066473fe360207acb7f1d0f64c837edd547a4c9da6ff192d9306e98e0c75dbeecef0c62fe3450b7ab6ab54c47c1bb5fe93 WHIRLPOOL dda7ca4b348c00789b96c69367fe519d05ed6ddd69f63362f17d235d1ecf6d8dbe3509fe502bc81a697f026a3591b59e42555770abdca4417d6cfacc9bbe7e22
+EBUILD ncurses-5.9.20150530.ebuild 6870 SHA256 e727430c31e8017bc86a1779573739ba426509ac8c9f0d3b555187c5c6d92f24 SHA512 6c00e55d1cfddd3a964ba7f68975f257e6de66935582ef316ef0d5be06f460fbfbf8b7c73b4c27c60ddf2484c488fb03193f23dca4227bfdafffe0b80c1d9cbf WHIRLPOOL 5bfec93a679061c7bc10c9d7c6267392f31e00859d6fcad8f5b9cacd0dd5a7ddc58eb7559c635b2b6f2bca2321220da9c191f653094d07340e5e5a59796e21e7
diff --git a/sys-libs/ncurses/ncurses-5.9.20150530.ebuild b/sys-libs/ncurses/ncurses-5.9.20150530.ebuild
new file mode 100644
index 0000000..13ce6d1
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.9.20150530.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="ftp://invisible-island.net/ncurses/current/${MY_P}-${PV_SNAP}.tgz"
+RESTRICT="primaryuri"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+# berkdb? ( sys-libs/db )"
+RDEPEND="${DEPEND}
+ !<x11-terms/rxvt-unicode-9.06-r3
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+# Put the MULTILIB_USEDEP on gpm in PDEPEND only to avoid circular deps.
+# We can move it to DEPEND and drop the --with-gpm=libgpm.so.1 from the econf
+# line below once we can assume multilib gpm is available everywhere.
+PDEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}-${PV_SNAP}
+HOSTTIC_DIR=${WORKDIR}/${P}-host
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
+
+ sed -i \
+ -e 's:if test "$PKG_CONFIG" != none ; then:if false ; then:' \
+ -e 's:test -d "$PKG_CONFIG_LIBDIR":true:' \
+ configure
+}
+
+src_configure() {
+ unset TERMINFO #115036
+ tc-export_build_env BUILD_{CC,CPP}
+ BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+ # when cross-compiling, we need to build up our own tic
+ # because people often don't keep matching host/target
+ # ncurses versions #249363
+ if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
+ CHOST=${CBUILD} \
+ CFLAGS=${BUILD_CFLAGS} \
+ CXXFLAGS=${BUILD_CXXFLAGS} \
+ CPPFLAGS=${BUILD_CPPFLAGS} \
+ LDFLAGS="${BUILD_LDFLAGS} -static" \
+ BUILD_DIR="${HOSTTIC_DIR}" do_configure cross --without-shared --with-normal
+ fi
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ do_configure narrowc
+ use unicode && do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
+}
+
+do_configure() {
+ ECONF_SOURCE=${S}
+
+ mkdir "${BUILD_DIR}"-$1
+ cd "${BUILD_DIR}"-$1 || die
+ shift
+
+ local conf=(
+ # We need the basic terminfo files in /etc, bug #37026. We will
+ # add '--with-terminfo-dirs' and then populate /etc/terminfo in
+ # src_install() ...
+ --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+ # Disabled until #245417 is sorted out.
+ #$(use_with berkdb hashed-db)
+
+ # ncurses is dumb and doesn't install .pc files unless pkg-config
+ # is also installed. Force the tests to go our way. Note that it
+ # doesn't actually use pkg-config ... it just looks for set vars.
+ --enable-pc-files
+ --with-pkg-config="$(tc-getPKG_CONFIG)"
+ # This path is used to control where the .pc files are installed.
+ --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+ # Now the rest of the various standard flags.
+ --with-shared
+ --without-hashed-db
+ $(use_with ada)
+ $(use_with cxx)
+ $(use_with cxx cxx-binding)
+ $(use_with debug)
+ $(use_with profile)
+ $(use_with gpm)
+ $(multilib_is_native_abi || use_with gpm gpm libgpm.so.1)
+ --disable-termcap
+ --enable-symlinks
+ --with-rcs-ids
+ --with-manpage-format=normal
+ --enable-const
+ --enable-colorfgbg
+ --enable-echo
+ $(use_enable !ada warnings)
+ $(use_with debug assertions)
+ $(use_enable debug leaks)
+ $(use_with debug expanded)
+ $(use_with !debug macros)
+ $(use_with trace)
+ $(use_with tinfo termlib)
+
+ # The chtype/mmask-t settings below are to retain ABI compat
+ # with ncurses-5.4 so dont change em !
+ --with-chtype=long
+ --with-mmask-t=long
+ --disable-ext-colors
+ --disable-ext-mouse
+ --without-pthread
+ --without-reentrant
+ )
+
+ econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+ # when cross-compiling, we need to build up our own tic
+ # because people often don't keep matching host/target
+ # ncurses versions #249363
+ if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
+ make_flags="-C progs tic"
+ BUILD_DIR="${HOSTTIC_DIR}" do_compile cross
+ fi
+
+ multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+ make_flags=""
+ multilib_is_native_abi || make_flags="PROGS= "
+ do_compile narrowc
+ use unicode && do_compile widec
+}
+
+do_compile() {
+ cd "${BUILD_DIR}"-$1 || die
+
+ # A little hack to fix parallel builds ... they break when
+ # generating sources so if we generate the sources first (in
+ # non-parallel), we can then build the rest of the package
+ # in parallel. This is not really a perf hit since the source
+ # generation is quite small.
+ emake -j1 sources
+ # For some reason, sources depends on pc-files which depends on
+ # compiled libraries which depends on sources which ...
+ # Manually delete the pc-files file so the install step will
+ # create the .pc files we want.
+ rm -f misc/pc-files
+ emake ${make_flags}
+}
+
+multilib_src_install() {
+ # use the cross-compiled tic (if need be) #249363
+ export PATH="${HOSTTIC_DIR}-cross/progs:${PATH}"
+
+ # install unicode version second so that the binaries in /usr/bin
+ # support both wide and narrow
+ cd "${BUILD_DIR}"-narrowc || die
+ emake DESTDIR="${D}" install
+ if use unicode ; then
+ cd "${BUILD_DIR}"-widec || die
+ emake DESTDIR="${D}" install
+ fi
+
+ # Move libncurses{,w} into /lib
+ multilib_is_native_abi && gen_usr_ldscript -a \
+ ncurses \
+ $(usex unicode 'ncursesw' '') \
+ $(use tinfo && usex unicode 'tinfow' '') \
+ $(usev tinfo)
+ if ! tc-is-static-only ; then
+ ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+ fi
+ use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
+
+ # Build fails to create this ...
+ dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+# if ! use berkdb ; then
+ # We need the basic terminfo files in /etc, bug #37026
+ einfo "Installing basic terminfo files in /etc..."
+ for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
+ xterm xterm-color xterm-xfree86
+ do
+ local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+ local basedir=$(basename $(dirname "${termfile}"))
+
+ if [[ -n ${termfile} ]] ; then
+ dodir /etc/terminfo/${basedir}
+ mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
+ dosym ../../../../etc/terminfo/${basedir}/${x} \
+ /usr/share/terminfo/${basedir}/${x}
+ fi
+ done
+# fi
+
+ echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+ doenvd "${T}"/50ncurses
+
+ use minimal && rm -r "${ED}"/usr/share/terminfo*
+ # Because ncurses5-config --terminfo returns the directory we keep it
+ keepdir /usr/share/terminfo #245374
+
+ cd "${S}"
+ dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+ use doc && dohtml -r doc/html/
+}
|
mark-kubacki/ossdl-overlay | 576dbf36ff6a1d80a2fa4a025ee1c4ecf2c2e8cd | www-servers/nginx: add support for SSL dynamic record size(s) | diff --git a/www-servers/nginx/files/nginx-1.9.1-SSL-dynamic-record-size-redux.patch b/www-servers/nginx/files/nginx-1.9.1-SSL-dynamic-record-size-redux.patch
new file mode 100644
index 0000000..c57787b
--- /dev/null
+++ b/www-servers/nginx/files/nginx-1.9.1-SSL-dynamic-record-size-redux.patch
@@ -0,0 +1,230 @@
+From 71237e50cfeb3aaccce32bfec31af0c522ef624d Mon Sep 17 00:00:00 2001
+From: W-Mark Kubacki <[email protected]>
+Date: Wed 2015-05-27 18:18:29 +0200
+Subject: [PATCH] SSL dynamic record size
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+implements packet-size aware sending of small TLS records in adavance of a
+larger stream, in the hope of making them available sooner to a browser for
+parsing a page's required files (CSS, JSâ¦).
+
+This implementation computes PDU sizes on a per-connection basis.
+
+It operates under the assumption that only TLSv1.0, 1.1, or 1.2 is used and
+the only available ciphers are AEAD ones as well as DES and AES. For example,
+the sizes for RC4 will be off (costing a rather neglible amount of bytes) for
+the first 3 packets.
+---
+ src/core/ngx_connection.h | 1 +
+ src/event/ngx_event_openssl.c | 115 ++++++++++++++++++++++++++++++++++++++++--
+ src/event/ngx_event_openssl.h | 2 +
+ 3 files changed, 113 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
+index 27bb8a9..29d0ba7 100644
+--- a/src/core/ngx_connection.h
++++ b/src/core/ngx_connection.h
+@@ -143,6 +143,7 @@ struct ngx_connection_s {
+
+ #if (NGX_SSL)
+ ngx_ssl_connection_t *ssl;
++ int mss;
+ #endif
+
+ struct sockaddr *local_sockaddr;
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+index 1b789e6..bd1c4bc 100644
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -8,7 +8,14 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ #include <ngx_event.h>
++#include <sys/socket.h>
+
++#ifndef SSL_SHA1
++#define SSL_SHA1 0x00000002L
++#endif
++#ifndef SSL_AEAD
++#define SSL_AEAD 0x00000010L
++#endif
+
+ #define NGX_SSL_PASSWORD_BUFFER_SIZE 4096
+
+@@ -1508,6 +1515,68 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+ ngx_uint_t flush;
+ ssize_t send, size;
+ ngx_buf_t *buf;
++ ngx_msec_t last_sent_timer_diff;
++ ngx_uint_t loop_count;
++
++ last_sent_timer_diff = ngx_current_msec - c->ssl->last_write_msec;
++ loop_count = 0;
++
++ if (!c->mss) {
++#ifdef TCP_MAXSEG
++ int mss;
++ socklen_t mss_size = sizeof(mss);
++
++ if (getsockopt(c->fd, SOL_TCP, TCP_MAXSEG, &mss, &mss_size) == 0) {
++ c->mss = mss;
++ } else {
++ c->mss = 1428; /* as of 2015 the most common MSS for IPv4 */
++ }
++#else
++ c->mss = 1428;
++#endif
++ }
++
++ /* map[maxPackets]ceilSize; 0 is: ceiled by ssl_buffer_size */
++ int pdu2, pdu4, pdu6;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ const
++#endif
++ SSL_CIPHER *cipher;
++ cipher = SSL_get_current_cipher(c->ssl->connection);
++
++ if (!cipher || (cipher->algorithm_mac & SSL_AEAD) == SSL_AEAD) {
++ //pdu0 = (((int)c->ssl->buffer_size / c->mss) * c->mss - 29);
++ //pdu1 = (1 * c->mss - 29);
++ pdu2 = (2 * c->mss - 29);
++ //pdu3 = (3 * c->mss - 29);
++ pdu4 = (4 * c->mss - 29);
++ //pdu5 = (5 * c->mss - 29);
++ pdu6 = (6 * c->mss - 29);
++ } else { /* !AEAD */
++ /* RC4, RCx... are not used, skip checks for them.
++ The remaining ciphers are: AES, 3DES. */
++ int padding = SSL_CIPHER_is_AES(cipher) ? 16 : 8;
++ int overhead = 5 + 1; /* TLS header + padding_0 */
++ /* MD5 is not used, so it's SHA or SHA2. */
++ if ((cipher->algorithm_mac & SSL_SHA1) == SSL_SHA1) {
++ overhead += 20;
++ } else {
++ overhead += 32;
++ }
++ if (c->ssl->connection->version >= TLS1_1_VERSION) {
++ overhead += padding; /* IV */
++ }
++
++ //pdu0 = ((int)(
++ // ((int)c->ssl->buffer_size / c->mss)
++ // * c->mss - overhead) / padding) * padding;
++ //pdu1 = ((int)(1 * c->mss - overhead) / padding) * padding;
++ pdu2 = ((int)(2 * c->mss - overhead) / padding) * padding;
++ //pdu3 = ((int)(3 * c->mss - overhead) / padding) * padding;
++ pdu4 = ((int)(4 * c->mss - overhead) / padding) * padding;
++ //pdu5 = ((int)(5 * c->mss - overhead) / padding) * padding;
++ pdu6 = ((int)(6 * c->mss - overhead) / padding) * padding;
++ }
+
+ if (!c->ssl->buffer) {
+
+@@ -1517,7 +1586,23 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+ continue;
+ }
+
+- n = ngx_ssl_write(c, in->buf->pos, in->buf->last - in->buf->pos);
++ size = in->buf->last - in->buf->pos;
++
++ if (last_sent_timer_diff > 1000*20 && loop_count <= 2) {
++ /* likely playbook:
++ [(2, 2, 4, <=4), (2, 2, <=6), (2, <=4), (<=4)] */
++ switch(loop_count) {
++ case 0:
++ case 1:
++ if (size >= pdu2 && !(size <= pdu4)) { size = pdu2; }
++ break;
++ case 2:
++ if (size >= pdu4 && !(size <= pdu6)) { size = pdu4; }
++ break;
++ }
++ }
++
++ n = ngx_ssl_write(c, in->buf->pos, size);
+
+ if (n == NGX_ERROR) {
+ return NGX_CHAIN_ERROR;
+@@ -1532,8 +1617,11 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+ if (in->buf->pos == in->buf->last) {
+ in = in->next;
+ }
++
++ ++loop_count;
+ }
+
++ c->ssl->last_write_msec = ngx_current_msec;
+ return in;
+ }
+
+@@ -1614,9 +1702,22 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+ if (size == 0) {
+ buf->flush = 0;
+ c->buffered &= ~NGX_SSL_BUFFERED;
++ c->ssl->last_write_msec = ngx_current_msec;
+ return in;
+ }
+
++ if (last_sent_timer_diff > 1000*20 && loop_count <= 2) {
++ switch(loop_count) {
++ case 0:
++ case 1:
++ if (size >= pdu2 && !(size <= pdu4)) { size = pdu2; }
++ break;
++ case 2:
++ if (size >= pdu4 && !(size <= pdu6)) { size = pdu4; }
++ break;
++ }
++ }
++
+ n = ngx_ssl_write(c, buf->pos, size);
+
+ if (n == NGX_ERROR) {
+@@ -1633,14 +1734,17 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+ break;
+ }
+
+- flush = 0;
+-
+- buf->pos = buf->start;
+- buf->last = buf->start;
++ if(buf->last == buf->pos) {
++ flush = 0;
++ buf->pos = buf->start;
++ buf->last = buf->start;
++ }
+
+ if (in == NULL || send == limit) {
+ break;
+ }
++
++ ++loop_count;
+ }
+
+ buf->flush = flush;
+@@ -1652,6 +1756,7 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
+ c->buffered &= ~NGX_SSL_BUFFERED;
+ }
+
++ c->ssl->last_write_msec = ngx_current_msec;
+ return in;
+ }
+
+diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
+index 08eff64..74f027e 100644
+--- a/src/event/ngx_event_openssl.h
++++ b/src/event/ngx_event_openssl.h
+@@ -51,6 +51,8 @@ typedef struct {
+ ngx_buf_t *buf;
+ size_t buffer_size;
+
++ ngx_msec_t last_write_msec;
++
+ ngx_connection_handler_pt handler;
+
+ ngx_event_handler_pt saved_read_handler;
+--
+2.0.4
+
|
mark-kubacki/ossdl-overlay | ef35ad988876135e6522fbfa97f552c219e3834c | dev-php/hhvm-3.6.1 | diff --git a/dev-php/hhvm/Manifest b/dev-php/hhvm/Manifest
index d8c30bc..eb78352 100644
--- a/dev-php/hhvm/Manifest
+++ b/dev-php/hhvm/Manifest
@@ -1,7 +1,8 @@
AUX hhvm.confd-r4 1024 SHA256 53bfbbcbd90719d58e5c1ff483213d4f218816d0d9e3a29612eee95194209c06 SHA512 459d749db56fe03630bc5e8996c8b3b10dc083e092b86e0912d7172de09b2ea673fd67f57c1c2362270e965cc48539e256b8191fbeb9f1771197b4a9bbb55188 WHIRLPOOL e1fcb4914f2573bb1e78f8069ba4691cc7a2f4cac8bc6e8ce2c125004ae70dda609ea5a57d129e7094a810faf3387a45cc1769ab86ad98176da68191f2ab919c
AUX hhvm.initd-r4 3044 SHA256 399a9c8f67321dcd9381cf683f65116ed9d6bb4470ca19671e42315d466cb9b2 SHA512 3dcbd35e5b872e5d2d4357d32f41e48e8f3af9077372867290eb59c8c7cf57431b46b9f306ff187268c4d0c8470901c1c655c42b68983cb4bd667eab5926574f WHIRLPOOL 6fd8fbae0bbd87c7758c9503728945b2f75f2ad195a68aaf237576ac9582f36b938edb6876566f3e99aa53a5763f438eb74354c4caa3d68d091e6cc75e4365da
AUX hhvm.logrotate 147 SHA256 3b521ae4ec20b2a9c5acca1b974e3e116008a68cd2a67407fa14818a013eb3fd SHA512 ff4139f3a43436b37f191cc8e4873af646ab40cf4b9fd590c0a3d880b785183fa3efe9ae049362ceaf3c471c0fabedfd212c45aa12aa553c6acbfb33d7e1be96 WHIRLPOOL 57070dc9c3f0aae66824d37683a23163727f497f9c42e0b2ef9ac50973559e67ccda1d4035052d76d33caf41a11be5d1046364580b755ae76caff5a5d90efce0
AUX php.ini 1701 SHA256 f758dae7cd5374bd415d573a9e3ce859fd4f0e8d5910cb105138a591147fd5c2 SHA512 a91dc3073da4ea1c54af9bcd23c8356b32c2660943ab9a04ef3a3296767a0e33f1f586978ed139009fc14ed84771d544f39ef968f0ffac366898bb181999074f WHIRLPOOL 194feb161cc808b519a9981b5b098b3f8f6605855ef0d13e01c9316b0414c96c80c945edd8e60ec36e306167e940286e2cd8cc7936765b6e896ad935e2f7e083
AUX server.ini 296 SHA256 1deba06d5533178f026993d7f41703b19df2ba88ce623d675802a9cb7e8f8d77 SHA512 88682f8e903256db0bdea362e86e56d9d34f0a27ac5a269adaaf2efff0f2ca1c0275c039ad40de0a8489a6e3ca7e6e78cab27d3e87ab0ed1bb0029884129678c WHIRLPOOL 350f6d67f8847e31e2289d4ee5deec20cb88c23f56659de8cbe4573a66f809f3be4206d1d19694276f43b99ac43a8c09f2bbc5ed5598dfa6cebfb26f4b036182
EBUILD hhvm-3.4.2.ebuild 4252 SHA256 fe3d6e7cba8ce9a4b26319d8fdd25bb0a2b7af8a06c7f2f77ef23c5dffc1d18f SHA512 d16d866be8734758c5baa928fe1de61262eed95388e8b5311273a987fa3d11d051457605ca1204c33c46219346d418317f55cec6e6e922686ca38405bd836880 WHIRLPOOL db0dadca04c110a81007a147f1343a71a5630227d0f102ed625627c90cf99ffd870905a8a9b4abf2c94212bee508c2a4052da6c4bec8d97934e37a5d6c34586e
EBUILD hhvm-3.5.0.ebuild 4235 SHA256 ae4914efa1bba236e831ffd7528d2238fddf57e93451c99198465cff7391e7d5 SHA512 a0ca1020afaa3a63a48997bf6a6dda79c3693579412243646c4ef2207a29224b8ba86f80b0572d87c269e94d1380cee0c7d9d2e39dce87b0a46b8713795efcbb WHIRLPOOL e0c47334661e9cfad09d7d274b4ef61113388a3d1a1afa6e8230068c8806c85c03599de7b4a69fcb917f51ce9dd503c5c747e810e3ce38715c95ea14a64d06c2
+EBUILD hhvm-3.6.1.ebuild 4236 SHA256 ac87cb9c1a946c914678c5a99caf17b63694ee8b486b8975148d56eaa1838590 SHA512 eaa3e48ee87d95628ccedbde92eb63db9f2a41112a5b3dd42dd96609db24b74910cf60602228c0f1fcb0f7daf15921358eb4f20345c6992b59bdf864d6a3b882 WHIRLPOOL c6539cc9fe3b59c82648043d67bfa9d42af2b4b2e693e59dfc66d5a8fec23dd6c36be269af019686d46a34ac28175b94ecd392f4bc47b83334e03c90b1cce440
diff --git a/dev-php/hhvm/hhvm-3.6.1.ebuild b/dev-php/hhvm/hhvm-3.6.1.ebuild
new file mode 100644
index 0000000..1f199a8
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.6.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 2014â2015 W. Mark Kubacki
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI="5"
+
+inherit eutils flag-o-matic git-2 user versionator
+
+DESCRIPTION="Virtual machine designed for executing programs written in Hack and PHP."
+HOMEPAGE="http://hhvm.com/"
+SRC_URI=""
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~amd64 -x86 -arm"
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_BRANCH="HHVM-$(get_version_component_range 1-2 )"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="cotire debug devel +freetype gmp hack iconv imagemagick +jemalloc +jpeg jsonc +png sqlite3 +webp xen yaml +zend-compat"
+
+DEPEND="
+ >=dev-libs/libevent-2.0.9
+ >=dev-libs/libzip-0.11.0
+ >=dev-libs/oniguruma-5.9.5
+ || ( >=dev-db/mariadb-10.0 virtual/mysql )
+ freetype? ( media-libs/freetype )
+ gmp? ( dev-libs/gmp )
+ hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+ iconv? ( virtual/libiconv )
+ imagemagick? ( media-gfx/imagemagick )
+ jemalloc? ( >=dev-libs/jemalloc-3.5.1[stats,no-prefix] )
+ jsonc? ( dev-libs/json-c )
+ jpeg? ( virtual/jpeg )
+ png? ( media-libs/libpng )
+ sqlite3? ( =dev-db/sqlite-3.7* )
+ webp? ( media-libs/libvpx )
+ yaml? ( dev-libs/libyaml )
+ dev-cpp/glog
+ dev-cpp/tbb
+ dev-libs/elfutils
+ dev-libs/expat
+ dev-libs/icu
+ dev-libs/libdwarf
+ dev-libs/libmcrypt
+ dev-libs/libmemcached
+ >=dev-libs/libpcre-8.35[jit]
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/openssl
+ net-libs/c-client[kerberos]
+ >=net-misc/curl-7.28.0
+ net-nds/openldap
+ sys-libs/libcap
+ sys-libs/ncurses
+ sys-libs/zlib
+ "
+RDEPEND="${DEPEND}
+ sys-process/lsof
+ "
+DEPEND="${DEPEND}
+ >=dev-libs/boost-1.49[static-libs]
+ dev-libs/cloog[static-libs]
+ >=dev-util/cmake-3.0.2
+ media-libs/gd[jpeg,png,static-libs]
+ >=sys-devel/gcc-4.8[cxx(+),-hardened]
+ sys-devel/binutils[static-libs]
+ sys-devel/bison
+ sys-devel/flex
+ sys-libs/readline[static-libs]
+ sys-libs/zlib[static-libs]
+ "
+
+# for DEPEND run:
+# for LIB in $(ldd $(which hhvm) | cut -d ' ' -f 3 | grep -F / | sort -u); do q belongs "${LIB}" | cut -d ' ' -f 1; done | sort -u
+
+pkg_setup() {
+ ebegin "Creating hhvm user and group"
+ enewgroup hhvm
+ enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+ eend $?
+}
+
+src_prepare() {
+ git submodule update --init --recursive
+
+ filter-flags -ffast-math
+ replace-flags -Ofast -O2 # or compilation will fail
+
+ # output is not humanly readable without this:
+ if [[ $(gcc-major-version) -gt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 9 ]] ); then
+ append-flags -fdiagnostics-color=always
+ fi
+ # GCC 5.0 with CXX will complain about too few registers without this
+ if [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 0 ]]; then
+ replace-flags -O[3-6] -O2
+ fi
+
+ # HHVM's dependencies need this when statically compiled, which is desirable
+ append-flags -pthread
+
+ # PR#4342, dependencies already guarantee that PCRE works
+ sed -i \
+ -e 's:find_package(PCRE REQUIRED):find_package(PCRE):' \
+ CMake/HPHPFindLibs.cmake
+ # use the already installed PCRE
+ sed -i \
+ -e '/^ pcre/d' \
+ third-party/CMakeLists.txt
+ rm -rf third-party/pcre
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_DO_STRIP=OFF \
+ -DCMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+ -DSTATIC_CXX_LIB=ON \
+ -DBoost_USE_STATIC_LIBS=ON \
+ -DCMAKE_EXE_LINKER_FLAGS=-static \
+ -DENABLE_ZEND_COMPAT=$(usex zend-compat ON OFF) \
+ $(use cotire && printf -- "-DENABLE_COTIRE=ON") \
+ $(use jsonc && printf -- "-DUSE_JSONC=ON") \
+ $(use xen && printf -- "-DDISABLE_HARDWARE_COUNTERS=ON") \
+ ${EXTRA_ECONF} || die "configure failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ if use hack; then
+ dobin hphp/hack/bin/hh_client
+ dobin hphp/hack/bin/hh_server
+ dobin hphp/hack/bin/hh_single_type_check
+ dodir "/usr/share/hhvm/hack"
+ cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+ fi
+
+ if use devel; then
+ cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+ fi
+
+ newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+ newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+
+ dodir "/etc/hhvm"
+ insinto /etc/hhvm
+ newins "${FILESDIR}"/php.ini php.ini
+ newins "${FILESDIR}"/php.ini php.ini.dist
+ newins "${FILESDIR}"/server.ini server.ini
+ newins "${FILESDIR}"/server.ini server.ini.dist
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/hhvm.logrotate hhvm
+}
|
mark-kubacki/ossdl-overlay | 5aa466012f6fd4a6e2a618237245acf8f1a8ab19 | app-crypt/signify: change description | diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index c36b6e1..4add831 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,3 +1,3 @@
AUX signify.1 4483 SHA256 42528dc3194cb7aba3ad6b122b7d7aa69513a618f403469d24ce95877890bb3e SHA512 9cdbaa87822897716bf24335ec0af151ab030bbd0360bf0fbf8ca9cbae7e520cec9efc170e8797dc9c266a9ca6341c37bee83bc834f06222434a602b55ed3b3a WHIRLPOOL 048e54162a7bcd442c01258088e36275b0e3a9e89b372ae74fc1e5d9e00a7cfcc7529a9b7a706809080a6969a26b577be2af17c250794aaef6cdd69e99890356
DIST signify-1.100.tar.bz2 67387 SHA256 ca0c88c01bc67f8fdc3f0cf76bf05de47298a3399f29e7c93cdee1d1f6b5ec38 SHA512 b929be7a87aaa4bb7c30003f3184cc9a260da6fb782c3de0dc09f142fd396a9188194e13589499bf06c160f71ec4b907bf99471be28102f481ebc89867d41ffa WHIRLPOOL 88e8d758cb19ee940c43dad7ed57996a9a447e21263555d2a4c72c438321111bc081788d894a3a8046d1613a626492048abfb51b8eb6740acfe221adf3d777bb
-EBUILD signify-1.100.ebuild 636 SHA256 a558ecb295b2b713cef1c8d639865180fbdb9a7dfc97caf2149229d10e227730 SHA512 08525a5b9c08b7156f377335fe67a7a6fff2caf5a5339d2fbae7cdb989f49cedf904264e2739ce67e0f455630cedecc5562cbc278e0bb71b1eba80a8d12f29ef WHIRLPOOL d6247024149a6b1c879177ef9829df19c01f06c7fb43c33aea25b3d906d582e10bc16b9bd27d775f650a6bb2e08b120f2f70ca3489ef74e65dfb8a6737dca4d7
+EBUILD signify-1.100.ebuild 621 SHA256 0fb505433bce25060df23793b6c821749de181223e440d6cec565e8800873622 SHA512 46eacc456217d17a009a7056bff543eec34716faa5f71c630272e4fd8aa08e2839370f645a5b138b7f539cacb89ff5a200732bc33ae2edc1ada72344ec7d0a6a WHIRLPOOL 14b84c1b9ae9139d5857305176f2eb4862ba48ffbc5c8e9606c9bb255387db01d6f87d69d1527a0472b8d944594ac3ed2d1405a59d27ed999c8b71783436d273
diff --git a/app-crypt/signify/signify-1.100.ebuild b/app-crypt/signify/signify-1.100.ebuild
index 280b2d6..a358a2c 100644
--- a/app-crypt/signify/signify-1.100.ebuild
+++ b/app-crypt/signify/signify-1.100.ebuild
@@ -1,31 +1,31 @@
# Copyright 2015 W.âMark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="5"
inherit flag-o-matic
-DESCRIPTION="parallel lossless data compressor based on the lzlib compression library"
+DESCRIPTION="sign and verify binaries using the ED25519 curve and SHA2"
HOMEPAGE="https://github.com/Blitznote/signify"
SRC_URI="https://github.com/Blitznote/${PN}/releases/download/${PV}/${P}.tar.bz2"
RESTRICT="primaryuri nostrip"
LICENSE="RPL-1.5"
SLOT="0"
KEYWORDS="amd64"
src_prepare() {
chmod a+x signify
}
src_compile() {
"${S}"/signify -Vqp mark.pub -m signify || die
}
src_install() {
dobin signify
doman "${FILESDIR}"/signify.1
insinto /etc/signify
doins mark.pub
}
|
mark-kubacki/ossdl-overlay | 34677d48ecd77f2d14bfeefa2bb56d0d6ce69abe | net-misc/youtube-dl-2015.04.17 | diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 375b113..901ec50 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 765 SHA256 74359a5967116a63443d35fc8b8014b70829a7e1d40695f22cb7666464c7edd9 SHA512 e0934cf72bb53a5e62aef12c245f6d1199b42256114890e2cb0e23b1778047d6ffc453943a4a34c774c2e0a8cc29b51ce1477e7433d8f071291fabef3d2e9551 WHIRLPOOL cce5d5048062fb9581ac63fe47d1c20db8b6a640c244bf7461ecdcaec2ffcd69a9f72b712a9fc3463acba7aa33b797674d09d171b3223424a688e777ca00ab5c
-DIST youtube-dl-2015.02.10.5.tar.gz 1350958 SHA256 cd383f83b972afccf57b97c096d4830067199aedf4e2f0809004a2ead8676f38 SHA512 b46695a232f5cf05e923c799c683481e71230c8047d5de6ba72de52d6a790344496325d72a515e6a99b73d3a2ffa8dff8fd838905757b730db4dfbc52a7eed39 WHIRLPOOL 647598c1bc509b7fd077471ffd5acd8eb855e32dd7c30c25ca607b5dee255ad7898e4b9cea587dccf9b7d00bc1e0f08504f58ef43d4e22b7825fd04d7d80ae7e
-EBUILD youtube-dl-2015.02.10.5.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
+DIST youtube-dl-2015.04.17.tar.gz 1496887 SHA256 7bf51aec0646abed904a91cbff9747c2582247987fffce5f392c58d82c6a9894 SHA512 e42bd2f9eb04d461dad8f4ff4e031ca47e3c9e7f74763610e5e7ff50112509fef6bafcb8a83e6960c61f049debe59a37b28549583267394a22255050bf4edb23 WHIRLPOOL b2a6db7184f999c3293369072823084c41aa0494f7e80fbeccf3c0c6c7e4228075d13e3c157a658aefb4fa05ad0de15270f0fce1437b5c05d7f5cc29f13f9f2e
+EBUILD youtube-dl-2015.04.17.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
diff --git a/net-misc/youtube-dl/youtube-dl-2015.02.10.5.ebuild b/net-misc/youtube-dl/youtube-dl-2015.04.17.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2015.02.10.5.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.04.17.ebuild
|
mark-kubacki/ossdl-overlay | 84aa4edb251d9d9351a51fe0e038c4e467e7dc1d | net-misc/{igb,igbvf,ixgbe,ixgbevf}: version bumps | diff --git a/net-misc/e1000e/Manifest b/net-misc/e1000e/Manifest
index 043ac26..5ad5d00 100644
--- a/net-misc/e1000e/Manifest
+++ b/net-misc/e1000e/Manifest
@@ -1,4 +1,2 @@
-DIST e1000e-3.0.4.1.tar.gz 273879 SHA256 3761194691f76dec416f30d5dd497820afa1a67ca481a09b55d9d36e14db0d6f SHA512 f2dab1b14a940075133005d1e5b29741a4bd20e3b2f3b3427c1971aef5b99f316edfaeefae241d0effa36247ae74390fa815ff957d148651120fb2223e4a2cce WHIRLPOOL e6929d6b973329c2f8fcfa12526e58eb21c03a6192b932400d607e3af41767ff5131ebae7b4b3c2ba7765e301f3a5fc4d9b1b06cafbf4e9cc89f5d6f67d3fcf0
DIST e1000e-3.1.0.2.tar.gz 276695 SHA256 c0e3b44bdfa89eda0fa1c30c404f9014856b6eb5feeafc654fa701cfe4b025fb SHA512 ff81405401ddf9fc9a3727a378f7f71515ed8eb6264eed08c85cd6f2a417d948479a87574e89b0cbfca49e328146f0f7ccecdb637874815bd088cec8f01abbb9 WHIRLPOOL 67b222f1973b5f0d1966ff93e52aab7c26ee257f72604e5dc7c15b47f0f4d889f4a0ef74de4cd583c3366590314b9f134eb8eef5f78cd7315a02fdf675d252b9
-EBUILD e1000e-3.0.4.1.ebuild 625 SHA256 d36a74139c07f0875613ea46bffdb9ce9ced70abdb0c5aabfe8571e65468579d SHA512 687f0b1095f2935cd596391723b534dfebfd6619fb96bfe08fec75dc1f58d43f95a62f3067946f16522810bc539f0deaa9b8740f1941417e989690a2a0c8603c WHIRLPOOL a6b4b08131746bbb3ea8961381436ec8ebb7b91453bb7f5a5e3e59871019ead428d29ca025e0e2a4d2c1ed8c596b4e34b5f2ab5c2e12de97c8bb9c3366a19b7e
EBUILD e1000e-3.1.0.2.ebuild 625 SHA256 d36a74139c07f0875613ea46bffdb9ce9ced70abdb0c5aabfe8571e65468579d SHA512 687f0b1095f2935cd596391723b534dfebfd6619fb96bfe08fec75dc1f58d43f95a62f3067946f16522810bc539f0deaa9b8740f1941417e989690a2a0c8603c WHIRLPOOL a6b4b08131746bbb3ea8961381436ec8ebb7b91453bb7f5a5e3e59871019ead428d29ca025e0e2a4d2c1ed8c596b4e34b5f2ab5c2e12de97c8bb9c3366a19b7e
diff --git a/net-misc/e1000e/e1000e-3.0.4.1.ebuild b/net-misc/e1000e/e1000e-3.0.4.1.ebuild
deleted file mode 100644
index 2ca0261..0000000
--- a/net-misc/e1000e/e1000e-3.0.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Public Domain
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-DESCRIPTION="e1000e Intel NIC kernel module driver"
-HOMEPAGE="https://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=15817&lang=eng&wapkw=e1000e http://sourceforge.net/projects/e1000/files/e1000e%20stable/"
-SRC_URI="mirror://sourceforge/project/e1000/e1000e%20stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-BUILD_TARGETS="clean install"
-
-MODULE_NAMES="e1000e(drivers/net:${S}/src)"
-
-src_compile() {
- CONFIG_CHECK="!CONFIG_E1000E"
- cd "${S}/src"
- emake
-}
-
-src_install() {
- linux-mod_src_install
- nonfatal doman e1000e.7
-}
diff --git a/net-misc/igb/Manifest b/net-misc/igb/Manifest
index 18923ed..ace394e 100644
--- a/net-misc/igb/Manifest
+++ b/net-misc/igb/Manifest
@@ -1,2 +1,2 @@
-DIST igb-5.2.15.tar.gz 314595 SHA256 5971a6669c2c875ece8ca827aaff9774c13112a44e25e66f6d64b0a22942f782 SHA512 b129fa153800125ff45f064b9c9a58e2fbe3b03f815cd7f59e9b8147a303857a01a8ed906b89fa729d940424498db89040e23297adc2e2351159008cc51db359 WHIRLPOOL 9f9f729efdb820affa259ac2b20bba7613d262fec0d4bf4b6ac55ab38b8712970290492039daa585fb1a0f2ef377217cd9b3023c3f2a0adb0a370c3646a6eaeb
-EBUILD igb-5.2.15.ebuild 507 SHA256 fb3626227aaeb97f999b6c866c7ae7ca575fc5f35f0bcd5bcaceea22c57767ea SHA512 f1a999f3a75ced62a5540999735aa4ab59ce75204cb3fdfce10bcc33adb27c24afa6ea235d89fdda89a5ba2d92bfa7c9ca1eab14e955caad630e2d3a9522673a WHIRLPOOL e1dbf2fff72b6a2d4cf0ec69a0e429596f814796615a37afe5e75e7dfa8c56dba4ad6a8ea8f53f0831fc25a2061ac1cb4b82bd74248db875eb527fc6075fad36
+DIST igb-5.2.18.tar.gz 316951 SHA256 910e07a4fc5ba622a081a26dec9fe8ec758cbfff2fbdb08fc2922377684ea9e5 SHA512 2c8a840628031505da9f2a1c59e331f31470650258d2ceb27ccfbc752859b1d4c6c1fbe50c41e87ec673dd386b65afca6e8190f3707f9a34e5335728560588d3 WHIRLPOOL e247f1003bfc5b08cd6348a4c86af7a4c0399eb331d1878ded75a71454cd0df94cd9f7014a4eca001c9c9b4911641b47ec7a887e4f5a3e3e002091959f9709ef
+EBUILD igb-5.2.18.ebuild 507 SHA256 fb3626227aaeb97f999b6c866c7ae7ca575fc5f35f0bcd5bcaceea22c57767ea SHA512 f1a999f3a75ced62a5540999735aa4ab59ce75204cb3fdfce10bcc33adb27c24afa6ea235d89fdda89a5ba2d92bfa7c9ca1eab14e955caad630e2d3a9522673a WHIRLPOOL e1dbf2fff72b6a2d4cf0ec69a0e429596f814796615a37afe5e75e7dfa8c56dba4ad6a8ea8f53f0831fc25a2061ac1cb4b82bd74248db875eb527fc6075fad36
diff --git a/net-misc/igb/igb-5.2.15.ebuild b/net-misc/igb/igb-5.2.18.ebuild
similarity index 100%
rename from net-misc/igb/igb-5.2.15.ebuild
rename to net-misc/igb/igb-5.2.18.ebuild
diff --git a/net-misc/igbvf/Manifest b/net-misc/igbvf/Manifest
index 3eea0eb..02a0653 100644
--- a/net-misc/igbvf/Manifest
+++ b/net-misc/igbvf/Manifest
@@ -1,4 +1,2 @@
-DIST igbvf-2.3.3.tar.gz 118403 SHA256 a9ba9c2d83026f20a56d76e5a648b1a08b56ad1ba1a28afacda24ed75b22feb0 SHA512 715de52471b3a997ebe66459793405cbf8558802f9b124cf7014a2583a7b668cc4e282203a4dc32f7f2453a8df009374bdad853e805becc4a457e96ad3bfe0ac WHIRLPOOL dff0ed8ae4541b46896176d107be50c5893af9c5692aa696e8dddc0c0dd0d1a5256e9c8f4c196d287724b921bfb04603118a80ad10a99ab8d47a00c796b3f948
-DIST igbvf-2.3.5.tar.gz 118944 SHA256 3e1be0485a0eea72d5a811febe99dfb238fed471b4651df9a1833d3fde29a220 SHA512 952873bdd3a9cbeee0c1b423aa174ad48ffee5ce4cbdb68216b9d264d8c5bd91742c24c4af8f194513709943bcbc5b854c10ef7ff77e5cd9bbee4976d1ee7716 WHIRLPOOL cb419cc602475f2d67ac80c72eb5c0fe18e2bce501512b190d38a04abfc44bba3e47c1101c52c5effda981fa2e304de0a743afabf520c8d484046d914d50cbce
-EBUILD igbvf-2.3.3.ebuild 517 SHA256 b0627f3d5c1c48cf945568981a06c9b6d8ccdc37e9a88ba7db504ff2d3a77fd1 SHA512 37dd9785c345e22d6a33c2527fca87aedd883e8a941969744db198c935fdecd6239897bcf98ecf307cfcc3059110c93ea001c40b2a9516685f273779f2877cbc WHIRLPOOL 64c2c95067a464492ccce09bfe231a176e8bc26a15a71588140b9e17603f9df51a04e64deffcd6abff86eaf5f06d9b228e1f20e6aba1f61b849c0e00c2e221f0
-EBUILD igbvf-2.3.5.ebuild 517 SHA256 b0627f3d5c1c48cf945568981a06c9b6d8ccdc37e9a88ba7db504ff2d3a77fd1 SHA512 37dd9785c345e22d6a33c2527fca87aedd883e8a941969744db198c935fdecd6239897bcf98ecf307cfcc3059110c93ea001c40b2a9516685f273779f2877cbc WHIRLPOOL 64c2c95067a464492ccce09bfe231a176e8bc26a15a71588140b9e17603f9df51a04e64deffcd6abff86eaf5f06d9b228e1f20e6aba1f61b849c0e00c2e221f0
+DIST igbvf-2.3.7.1.tar.gz 123636 SHA256 59e596e2e3ca7fc5c5ed70b8622c6251341adebd081e540b1ce9b5589e323843 SHA512 daeaa9a03a77cb15f67e1697dccde60988cec5c830fd44f5d3b7bc481e0846de4b62d5f2b8a0571a547e7dfa48e5e42430fc7daf6515218a08bb7dea0ca74434 WHIRLPOOL c1b822504617f8a33c9fee9495fb746d6cf87d0d40057338ed61780b025353b2f8895baabe2730246c2debe05c7ac7e6bbe540ed32a727c20712a40e1bfa3d21
+EBUILD igbvf-2.3.7.1.ebuild 517 SHA256 b0627f3d5c1c48cf945568981a06c9b6d8ccdc37e9a88ba7db504ff2d3a77fd1 SHA512 37dd9785c345e22d6a33c2527fca87aedd883e8a941969744db198c935fdecd6239897bcf98ecf307cfcc3059110c93ea001c40b2a9516685f273779f2877cbc WHIRLPOOL 64c2c95067a464492ccce09bfe231a176e8bc26a15a71588140b9e17603f9df51a04e64deffcd6abff86eaf5f06d9b228e1f20e6aba1f61b849c0e00c2e221f0
diff --git a/net-misc/igbvf/igbvf-2.3.5.ebuild b/net-misc/igbvf/igbvf-2.3.5.ebuild
deleted file mode 100644
index c3738ac..0000000
--- a/net-misc/igbvf/igbvf-2.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Public Domain
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-DESCRIPTION="IGBVF kernel module driver"
-HOMEPAGE="http://sourceforge.net/projects/e1000/files/igbvf%20stable/"
-SRC_URI="mirror://sourceforge/project/e1000/igbvf%20stable/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-BUILD_TARGETS="clean install"
-
-MODULE_NAMES="igbvf(drivers/net:${S}/src)"
-
-src_compile() {
- CONFIG_CHECK="!CONFIG_IGBVF"
- cd "${S}/src"
- emake
-}
-
-src_install() {
- linux-mod_src_install
- nonfatal doman igbvf.7
-}
\ No newline at end of file
diff --git a/net-misc/igbvf/igbvf-2.3.3.ebuild b/net-misc/igbvf/igbvf-2.3.7.1.ebuild
similarity index 100%
rename from net-misc/igbvf/igbvf-2.3.3.ebuild
rename to net-misc/igbvf/igbvf-2.3.7.1.ebuild
diff --git a/net-misc/ixgbe/Manifest b/net-misc/ixgbe/Manifest
index 639545a..3817b82 100644
--- a/net-misc/ixgbe/Manifest
+++ b/net-misc/ixgbe/Manifest
@@ -1,6 +1,2 @@
-DIST ixgbe-3.19.1.tar.gz 363431 SHA256 73facb10d53e827b53ad90414f76e76109e2b57712efe9824c85a7024e811e21 SHA512 c28432842c92338239039d3aeb8f426d429e7e4fe28ed8fc7cf3fc9e646ba435f4f87939b0123b03c334a8ee4551ff496739509b5e5481b5a45baef0361f7ace WHIRLPOOL 30f0dbfc2fe6d7792c5415d6ef7a06fba828530e6e7ecd068b2825a80a303069228c0e1e4b2e272d8c5750d12385c7e78b8a770afd27e36a85b69ad54ad33fb2
-DIST ixgbe-3.21.2.tar.gz 367297 SHA256 46501a799812af89ee8a35cbeed384571838160650ba419b5b4e89017c2cc118 SHA512 be3070fd4612965d646063bf0ae1d1474ac1019285fb4731c9bd59cd1b13cd2b1fd0734c9c4dbdf30fd5a7920e4e53ce16f517ed49c71cfb719f9704a3881f6b WHIRLPOOL 17294269add1c3b91f7a62ba261dfb690ba81c0610f1e579739aafdeee57d3d6a236b3edccfce7c0f344692c1c4bdf2bf2285cb4f065364fb354ded6f4f3edfd
-DIST ixgbe-3.22.3.tar.gz 373933 SHA256 659f33b93ba4b1a8553c43531105a32094658426fd1f0ad8a03d856b5b79bfc2 SHA512 841d4006be69dfec94e3fe4bebae50145834504410f761dde9f21fef616b6a4ea3129e479eb12e2799e59c59bbbf0e5c787cb6d662fa6f6d9094ceaaa793588a WHIRLPOOL c3c8e4acca69ddcec6e5c94b2cc1560268d2ca0eb48ed8ef524358b2dc50b95a13fb68795d5b90013ace7b02c0e9abdd6d159a6cf0a8a75f8ef74cd441371896
-EBUILD ixgbe-3.19.1.ebuild 538 SHA256 a7e2d538be802074efdee43befa84037934cd189461199c99348d775d6568c4a SHA512 713778c8f7b28dea366f9fb7ed08e04a3cfe57dde49fb708a40c863c1cc9f91c47091f495f754cb5b29685f3d8f32fa998759ccf684e4ac2df06658a038970ce WHIRLPOOL 60335c231fff1a2d36f1046973b5fa6769bd515923f455a1a06a5a0429521f34095860fb93daa8ba43c7f4fb2394ebeab22a3cd619201f8a81dd8c47228c7a18
-EBUILD ixgbe-3.21.2.ebuild 538 SHA256 a7e2d538be802074efdee43befa84037934cd189461199c99348d775d6568c4a SHA512 713778c8f7b28dea366f9fb7ed08e04a3cfe57dde49fb708a40c863c1cc9f91c47091f495f754cb5b29685f3d8f32fa998759ccf684e4ac2df06658a038970ce WHIRLPOOL 60335c231fff1a2d36f1046973b5fa6769bd515923f455a1a06a5a0429521f34095860fb93daa8ba43c7f4fb2394ebeab22a3cd619201f8a81dd8c47228c7a18
-EBUILD ixgbe-3.22.3.ebuild 538 SHA256 a7e2d538be802074efdee43befa84037934cd189461199c99348d775d6568c4a SHA512 713778c8f7b28dea366f9fb7ed08e04a3cfe57dde49fb708a40c863c1cc9f91c47091f495f754cb5b29685f3d8f32fa998759ccf684e4ac2df06658a038970ce WHIRLPOOL 60335c231fff1a2d36f1046973b5fa6769bd515923f455a1a06a5a0429521f34095860fb93daa8ba43c7f4fb2394ebeab22a3cd619201f8a81dd8c47228c7a18
+DIST ixgbe-4.0.3.tar.gz 419196 SHA256 dc43b1b1025a5eeea117894dcf3e1d5049a1a38cc6db9e19bb7fa4af5b599751 SHA512 5038c02dbee8069d5bf7440e9a1d7464a500410ce1816bf88e7aeca93ea45ad1710f780fe11fde1ef91eed7c575748d21ce33f7c367d25b4059cfcc6b07ba1d9 WHIRLPOOL 2e2a7642d438f8a395feddd936c5a4ca04c41195ccc51bfd6345954cda5f075e0380a00bac1a1422a59fd324b2dd68c9ff3b8816f506703d4527343b6979605c
+EBUILD ixgbe-4.0.3.ebuild 538 SHA256 a7e2d538be802074efdee43befa84037934cd189461199c99348d775d6568c4a SHA512 713778c8f7b28dea366f9fb7ed08e04a3cfe57dde49fb708a40c863c1cc9f91c47091f495f754cb5b29685f3d8f32fa998759ccf684e4ac2df06658a038970ce WHIRLPOOL 60335c231fff1a2d36f1046973b5fa6769bd515923f455a1a06a5a0429521f34095860fb93daa8ba43c7f4fb2394ebeab22a3cd619201f8a81dd8c47228c7a18
diff --git a/net-misc/ixgbe/ixgbe-3.21.2.ebuild b/net-misc/ixgbe/ixgbe-3.21.2.ebuild
deleted file mode 100644
index a4e2c30..0000000
--- a/net-misc/ixgbe/ixgbe-3.21.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Public Domain
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-DESCRIPTION="IXGBE kernel module driver"
-HOMEPAGE="http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=14687&lang=eng&wapkw=ixgbe"
-SRC_URI="mirror://sourceforge/project/e1000/ixgbe%20stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-BUILD_TARGETS="clean install"
-
-MODULE_NAMES="ixgbe(drivers/net:${S}/src)"
-
-src_compile() {
- CONFIG_CHECK="!CONFIG_IXGBE"
- cd "${S}/src"
- emake
-}
-
-src_install() {
- linux-mod_src_install
- doman ixgbe.7
-}
\ No newline at end of file
diff --git a/net-misc/ixgbe/ixgbe-3.22.3.ebuild b/net-misc/ixgbe/ixgbe-3.22.3.ebuild
deleted file mode 100644
index a4e2c30..0000000
--- a/net-misc/ixgbe/ixgbe-3.22.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Public Domain
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-DESCRIPTION="IXGBE kernel module driver"
-HOMEPAGE="http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=14687&lang=eng&wapkw=ixgbe"
-SRC_URI="mirror://sourceforge/project/e1000/ixgbe%20stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-BUILD_TARGETS="clean install"
-
-MODULE_NAMES="ixgbe(drivers/net:${S}/src)"
-
-src_compile() {
- CONFIG_CHECK="!CONFIG_IXGBE"
- cd "${S}/src"
- emake
-}
-
-src_install() {
- linux-mod_src_install
- doman ixgbe.7
-}
\ No newline at end of file
diff --git a/net-misc/ixgbe/ixgbe-3.19.1.ebuild b/net-misc/ixgbe/ixgbe-4.0.3.ebuild
similarity index 100%
rename from net-misc/ixgbe/ixgbe-3.19.1.ebuild
rename to net-misc/ixgbe/ixgbe-4.0.3.ebuild
diff --git a/net-misc/ixgbevf/Manifest b/net-misc/ixgbevf/Manifest
index 484c200..ba32f0d 100644
--- a/net-misc/ixgbevf/Manifest
+++ b/net-misc/ixgbevf/Manifest
@@ -1,6 +1,4 @@
-DIST ixgbevf-2.12.1.tar.gz 149137 SHA256 6c30d7311b2504fe4fa142c1418ed714e3c6f1f49ba96880644c4ec842d13624 SHA512 be469bd0aafc54b5b92098e6cd191d271876604bef50d35b6d91be78a9a501abe46a5676d6e4ab0f2d2f04986940c61f332e9851c03f15f2f70fea36aebb1d7a WHIRLPOOL bfe686cfe65a168121dd1548207272aa041f594a2bf6afaef75b2efe341f446c5c2dbc4ba121090a4c2ac3187822dfe6bef350ed9e9cde9eaa6536ff516e7143
DIST ixgbevf-2.14.2.tar.gz 151361 SHA256 54d38e23d4d7dd3e8a058ea36250f10fe6865f399d28e6213fa2f74c3e2f19d5 SHA512 d8227f205973f9b4f88594b2bff8ef209c5accac293f7475e9cdda545c4bc8729d8f90d3816391f1c025fe89cc7e63e6e753ad85fe63b5cfdec1b0457c4272ee WHIRLPOOL 9905b5b7f07af5a659a347b6eac813508f12f0f34c777038d65150acff373797feccc40b2ee1fd145047fa2ca25c8739ab8efffef78f7adea15eeb360f9336c3
-DIST ixgbevf-2.15.3.tar.gz 155701 SHA256 e0a9d774f1632ec72efb66da3c38d1eafeb220edc75b2c494af7c8b108dc4b12 SHA512 624a5ecf9cb1da3e519792fab958749dbe736070e979e1072466441d2af7eceb958b9b887faf4c31be1cea746c57b4c4b537415befa6b1d0b0539e43945f82c3 WHIRLPOOL 05c74df218de9b2290da1dbcab52325e173d9a3b6a01e327423b7abd2cdf55a33111a00f7958e14d1d65f3208198ed625a6147eebee367f6b385e822b7a5b697
-EBUILD ixgbevf-2.12.1.ebuild 529 SHA256 193563ab8537cafee8990ae59a8d48c75193b96d2baa9f8c82a5c473e776f415 SHA512 c422636d22891dfa9ed50740b8dea3682159dd52a9abe71cfb9ac06122b689300e17339161c9a2701f9328f176b5ca6e1bcac1cfd2e238c5475864fba93d7944 WHIRLPOOL 084910e7ba1ffd0487d856f9cf2fb1e84b96a17ce5264f5181f12cd604f5ff48fccbbdfba4b807379a4e8b374712cba4965331644bebbecea0fd23d8f83329ef
+DIST ixgbevf-2.16.1.tar.gz 157813 SHA256 c9763bdc930b831343ead41cc05bf7989a9fbe1abaaaa02f4e5a2c22d31aec5e SHA512 b4a353862fc939e9ad0abe5b024bb593502e385840e35d760c3a4c6ccf4815affb0517d0bbb5af78d90723dc88e61a5f97cf05fa35ce03a0ac2b783db3a7d27b WHIRLPOOL 84584ba823f18073ff5239c4de35f0b09f1d2fa445d26b1f17a0e5b44e83be138c1e6f74803dfabb58d5cd5f3e55d6cd293115b43dd53ab13badecdd8110d0ab
EBUILD ixgbevf-2.14.2.ebuild 529 SHA256 193563ab8537cafee8990ae59a8d48c75193b96d2baa9f8c82a5c473e776f415 SHA512 c422636d22891dfa9ed50740b8dea3682159dd52a9abe71cfb9ac06122b689300e17339161c9a2701f9328f176b5ca6e1bcac1cfd2e238c5475864fba93d7944 WHIRLPOOL 084910e7ba1ffd0487d856f9cf2fb1e84b96a17ce5264f5181f12cd604f5ff48fccbbdfba4b807379a4e8b374712cba4965331644bebbecea0fd23d8f83329ef
-EBUILD ixgbevf-2.15.3.ebuild 529 SHA256 193563ab8537cafee8990ae59a8d48c75193b96d2baa9f8c82a5c473e776f415 SHA512 c422636d22891dfa9ed50740b8dea3682159dd52a9abe71cfb9ac06122b689300e17339161c9a2701f9328f176b5ca6e1bcac1cfd2e238c5475864fba93d7944 WHIRLPOOL 084910e7ba1ffd0487d856f9cf2fb1e84b96a17ce5264f5181f12cd604f5ff48fccbbdfba4b807379a4e8b374712cba4965331644bebbecea0fd23d8f83329ef
+EBUILD ixgbevf-2.16.1.ebuild 529 SHA256 193563ab8537cafee8990ae59a8d48c75193b96d2baa9f8c82a5c473e776f415 SHA512 c422636d22891dfa9ed50740b8dea3682159dd52a9abe71cfb9ac06122b689300e17339161c9a2701f9328f176b5ca6e1bcac1cfd2e238c5475864fba93d7944 WHIRLPOOL 084910e7ba1ffd0487d856f9cf2fb1e84b96a17ce5264f5181f12cd604f5ff48fccbbdfba4b807379a4e8b374712cba4965331644bebbecea0fd23d8f83329ef
diff --git a/net-misc/ixgbevf/ixgbevf-2.15.3.ebuild b/net-misc/ixgbevf/ixgbevf-2.15.3.ebuild
deleted file mode 100644
index d3386c9..0000000
--- a/net-misc/ixgbevf/ixgbevf-2.15.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Public Domain
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-DESCRIPTION="IXGBEVF kernel module driver"
-HOMEPAGE="http://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"
-SRC_URI="mirror://sourceforge/project/e1000/ixgbevf%20stable/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-BUILD_TARGETS="clean install"
-
-MODULE_NAMES="ixgbevf(drivers/net:${S}/src)"
-
-src_compile() {
- CONFIG_CHECK="!CONFIG_IXGBEVF"
- cd "${S}/src"
- emake
-}
-
-src_install() {
- linux-mod_src_install
- nonfatal doman ixgbevf.7
-}
\ No newline at end of file
diff --git a/net-misc/ixgbevf/ixgbevf-2.12.1.ebuild b/net-misc/ixgbevf/ixgbevf-2.16.1.ebuild
similarity index 100%
rename from net-misc/ixgbevf/ixgbevf-2.12.1.ebuild
rename to net-misc/ixgbevf/ixgbevf-2.16.1.ebuild
|
mark-kubacki/ossdl-overlay | 4e009de9481451c826836ac7fa91c3416c35fd1e | net-misc/nghttp2-0.7.5 | diff --git a/net-misc/nghttp2/Manifest b/net-misc/nghttp2/Manifest
index e37c448..758f8e1 100644
--- a/net-misc/nghttp2/Manifest
+++ b/net-misc/nghttp2/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Set-content-type-header-with-charset-for-.html-files.patch 2514 SHA256 39378f8b815ebc4ede87719b67fe8d1dafddc2226cf6194e530b623d94739da8 SHA512 9b05085272b929b71c47d05e0f1c7145676a8c5e247a908b7b60d45fc31c1c4aa22f2bacd9e3527c1e65687cfee6238f0bbce65329f79508cf1030665949171b WHIRLPOOL 1e748d8b5647971dda61428488dd7d0d02fe116cdaee6c2d9117ef530a158bacfdd36e2524a75f51b777a62e3f989322213f745f968159d3015f16fd86006384
DIST nghttp2-0.6.7.tar.xz 813524 SHA256 6cd748982f03c0039072c6a61c8dd88fe270ec34b826fb4591e5ed93f1a8376c SHA512 c22c25f98ec66cacf28b70f5d9d4b78dcf3d6d1f0037642cbd16f03e61c87e4637c53ca6d126a0817eeca31f2e94f0ea452d76328d5d463ea32769b31d982ebc WHIRLPOOL d23529c16113314fcd33393ea10446399c553e98587dec442ecc0a8802174738af46238f1b91061c45d1473f5e9a36449bdae3184c187b55bb96cd60c4b7929c
-DIST nghttp2-0.7.4.tar.xz 853256 SHA256 fb71dddd7b94c8af83cb6a89b76f30ebbe1e8b0085997c370934dd57667be8f6 SHA512 0a2b7caac8163e1b952ed510e6328c9edb55755af4d5f9b496a462eeac33f0f13fec8800e1c2834d184a4e7c388ab94f8272b2fcffa6dd1efab63c7cfa026caf WHIRLPOOL 525eda9e2600fe836151e696474b4382cdfa32238c2fd8ce25b0e2e8b73b9d2e2a898723b957328aea3493137f5d84b0886e5c89bd7981b36ebc33bef9138414
+DIST nghttp2-0.7.5.tar.xz 858444 SHA256 b2a05b4481881228db90314e14cb33511037a9e5940e31b826b688f27a6628d1 SHA512 29ad6f70b3c761b586fc2b0ec258c7c08a4c23f14e6203fb0ccae9b4ddcf473c2d08cc37b31f923bcff9a13b3a042e349e03d42e1f2ba56dbeecb584c054e5b5 WHIRLPOOL 6871dd109eda08b92d8139845547346a21b89a898c62d08fd7d89a04871dfe10e5cf60beedd3faee777bcdd77b8d8c51bc30e4c24c3c91f8dcb98ef31f01b851
EBUILD nghttp2-0.6.7.ebuild 1754 SHA256 a82f849bb8e91d3a23aa9405c0a78e201aab15dbde44beaede6564e4978e7335 SHA512 04868000ad2b577715da08c26a5be63b0c4a7573c96381eaeb60debcd12f4fcc09efa2697d6d838abac391d27e7e0983bcf951040170d9ade0f9cbb9867a87be WHIRLPOOL 9765195467e57004448ccfb574800d160be6f1b538a3b5c10722af077f800ef4cd4129ad242f26b3c9bc213e0a00f2fa17e7924f23a118790f0bd20c384ee151
-EBUILD nghttp2-0.7.4.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
+EBUILD nghttp2-0.7.5.ebuild 1838 SHA256 299c916d320fc718d5756b4ed67051dec302e836f52e51dafca275bd2e265a20 SHA512 5f9d12d13e9a4d1e0a018ebc6277c6a7db45e421f700299ff2bd95775e83ffe0e348198749e6fd38fc2d4a036456a528fe91784d8f87cdd24a8132f6330dc242 WHIRLPOOL f3fe15eaf82c76f2f3d866ed686fd373f8cfe90151a83fcef417d79e7191f32597778c68756d48ae343333d8e55ca61d677f59eed01704638869d88d3788e856
diff --git a/net-misc/nghttp2/nghttp2-0.7.4.ebuild b/net-misc/nghttp2/nghttp2-0.7.5.ebuild
similarity index 92%
rename from net-misc/nghttp2/nghttp2-0.7.4.ebuild
rename to net-misc/nghttp2/nghttp2-0.7.5.ebuild
index 1b3ed46..657488f 100644
--- a/net-misc/nghttp2/nghttp2-0.7.4.ebuild
+++ b/net-misc/nghttp2/nghttp2-0.7.5.ebuild
@@ -1,76 +1,77 @@
# Copyright 2014 W. Mark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="5"
PYTHON_COMPAT=( python2_7 )
inherit eutils flag-o-matic autotools python-r1
DESCRIPTION="Implementation of Hypertext Transfer Protocol version 2 in C"
HOMEPAGE="https://nghttp2.org/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/tatsuhiro-t/${PN}.git
git://github.com/tatsuhiro-t/${PN}.git"
EGIT_MASTER="master"
inherit git-2
else
SRC_URI="https://github.com/tatsuhiro-t/${PN}/releases/download/v${PV}/${P}.tar.xz"
RESTRICT="primaryuri"
fi
LICENSE="MIT"
SLOT="0/16" # as in h2-16
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="+alpn +apps +examples python +spdy test +xml"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="alpn apps examples python spdy test xml"
REQUIRED_USE="xml? ( apps )
alpn? ( apps )"
-RDEPEND=">=dev-libs/jansson-2.5
+RDEPEND="
apps? (
dev-libs/jemalloc
dev-libs/libev
xml? ( >=dev-libs/libxml2-2.7.7 )
>=dev-libs/openssl-1.0.1:=
alpn? ( >=dev-libs/openssl-1.0.2_alpha:= )
>=sys-libs/zlib-1.2.3
+ >=dev-libs/jansson-2.5
)
spdy? ( net-misc/spdylay:= )
python? (
${PYTHON_DEPS}
>=dev-python/cython-0.19
)"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.20
test? (
${PYTHON_DEPS}
>=dev-util/cunit-2.1
)"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
else
default_src_prepare
fi
epatch "${FILESDIR}"/0001-Set-content-type-header-with-charset-for-.html-files.patch
epatch_user
replace-flags -O* -Os
}
src_configure() {
econf \
--disable-dependency-tracking \
$(use_enable apps app) $(use_with apps jemalloc) \
$(use_enable examples) \
$(use_enable python python-bindings) \
$(use_with spdy spdylay) \
$(use_with xml libxml2) $(use !xml && echo --disable-xmltest --without-libxml2)
}
src_test() {
# tests can be parallelised, using emake
emake check || die "test failed"
}
|
mark-kubacki/ossdl-overlay | b766a85a497a97874f5f14b178d24a9366cdb174 | net-misc/curl-7.41.0 | diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 557c647..ba998d0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,12 +1,12 @@
AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5
AUX curl-7.34.0-deselect-weak-ciphers.patch 2242 SHA256 059ed102b05d69b8863a5cefaa1406b1528d55cd0f27351b87dc410f4674a87d SHA512 1637bb248385573f91126badc66750573434f71e457b4366d311ef29c885a2f58b95f69445377e8ce6ce173e9558d4cf85641284dc26ea8c17530afbfdee9ec8 WHIRLPOOL 7ab89485f696155d50c18026fab5176a6422c6917e190af5fada4bd546c8e15ce7a1e017c50f2f35181c228679c1dfc23452ee55a819b22626265bbccc9122e4
AUX curl-7.34.0-fix-ipv6-failover.patch 960 SHA256 8907994a7fbae7e652f33a4c6a04a1dbc73cf992d8495e21b79e7dd224191e99 SHA512 be345aaa8d9cc044957c0aadcb1b5348911055227593f9df53bca3e8a6dad16abe73f4b7a1c161c3bb3b2f1196691e14b6e69115ad78aa8c61d71d77aa6b66ed WHIRLPOOL fc6c2d66933e066ea4e0921fc4dd4d2e8a8bf83324976effc7913d8dfeced75263d4980d90bc2e52ce0111c26462fff2cdb464ff7ea45b71fcf9a955e4ed39cd
AUX curl-7.35.0-deselect-weak-ciphers.patch 954 SHA256 a0961cc94dc2213ef87f5cbfc62471d797404c05eb1830e5e940b2232d64696f SHA512 9f4eafd3e849ebe3937894c760dfcc4d4cba7527eabf40b58eaa7d197a0a88785db634a7511c49fe17226d9ea4052ac424f6d770f3393845ffa3d21ea3a6f172 WHIRLPOOL 902e8efcf4e3a24edcd850af18f0f332464371b3c3683aceba186709d397e4bc654623de46ed073f482f93c26b8666509782eec5a95038315a8647651c3c4e2e
AUX curl-7.36.0-demote-weak-ciphers.patch 917 SHA256 d1958b32b8c932a921ca46a50d30f5d5fd8585bb1afe22d14ee00b3e265a8dac SHA512 cd30f3df6a71fe76dcd22aa400e0592e5760399480f715721eaa7f5adf565663652f32d15c691c85c85f9177212488a2acb4ade5577a8011a250417f872f4f08 WHIRLPOOL 53b5bdf841a6b546af7282e07bdcfc14db1523fa3daf0f0cf57f179fa3681742a3abdcbda465be8ab708b7d37f470ba7ea4013a07ee2eaf92f871a118bb5c128
AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548baec4d392e2d7bb059a7551b5f65d7 SHA512 49810a5bc4554a694d4c684aaa400d791098d50a14b0d5146c762e83ea25f18408d1e3382e3d26d76b19785c1ac0314c346e74d6bb37a408489d22243fbae9dd WHIRLPOOL b98e37de05cfe75c7be84712f641a9968528cb7f060462381031d8187e3d47cf183d87481b29ac63df8f22afd18d7ed49c89079e842acdd7c199350aaf70e8fe
AUX curl-7.38.0-openssl-detect-rsa-dsa-dh.patch 1871 SHA256 3c8ac887bb3e233b5cf00dc7bf16d4fa84374823b7c96d1b68f75f6a1ff7e46b SHA512 ad274e4c9b905112d11686a039cb7d59199ce44f231bc5a0f02bc943976e5da5f11766ee9b580e3c206d617145f3106594ec702b04ed303531636e9120bc93fc WHIRLPOOL 9b4c5ae590aa7d73264cb07c7ab37324b88895609e4e10f17e33560080d50ec4e53b981e06e53ebfc5cb2164b0c6d246bceef872d8eba74a175a09403f4271d7
AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
AUX pre/7.37.1-compile-with-latest-nghttp2.patch 6317 SHA256 c4a9daf32fa2c79cd251da0281ea786271657aea23e81a97e3af1288fac12db5 SHA512 3bbe23b9335b9b8f0a262c75794c4e237e95d4d73e369d25fa4dd1d355a1cc37b83288aeb04ffd76500b14b6ab2f521204fffc77b958a85e5563a97e45549ece WHIRLPOOL 977514736d973002714fc970fcf35ff6e3c9807aea4d53fa243ccc55fb1430170803e64de26edd077fb774979f375b12088ef4daf8e9855a366dcab578929e20
-DIST curl-7.40.0.tar.bz2 3266944 SHA256 899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba SHA512 4d1cd0aa0c4fd9f14559e2824389ed42222a456c268e92107ef4d3257af76d64e5a8f69e9a3fccb9d4c9ae232426ee8f8f58f7d2eaa3db789dfa4d919cf229a3 WHIRLPOOL 5e3f9038696d7476e76b1a848766a2068f20c6aa0392d4018e2d90529914a059b771d66937bbe28697925acaf96a2025eba77e4af9b331ab66ee1323cf079678
-EBUILD curl-7.40.0.ebuild 7245 SHA256 80bde4fbf3132dcd0879f6091b248b1e7d92044838056a6cc73222ae064efa72 SHA512 d59a479957e2579b8fe698c2f3304aa5aae6de89a2279b1c63425475721bb5cb33c62e1d0f0f7ce62960c24db67fa2b23afdb9e9eeb62b4a00008b92cd80aa91 WHIRLPOOL 5004e3aec6226ec0e59ae5cde476546dc5b7fcb376f87cbcdd04e60fa21d971299338de72bd8693a76624f09b0b9b6ff8ccce60aa355255ec09ee54052c570fb
+DIST curl-7.41.0.tar.bz2 3304508 SHA256 9f8b546bdc5c57d959151acae7ce6610fe929d82b8d0fc5b25a3a2296e5f8bea SHA512 fc4d14a51740d1752c653d2e48c6721b1ba1cc9959d7b9d1f77fd534d4db90d93fd4d0ad05adfdac082593b5886f5d662b7e4541f5f226514c59f643348287ff WHIRLPOOL b12eb86c6b82b77430ee2169d6021c2401d5712a1e998d096f833f79237810d1a4ae4dbc3815dcdbb3ea9217004930c3a600c2550516b73f1f3411c2720a1d3d
+EBUILD curl-7.41.0.ebuild 7245 SHA256 80bde4fbf3132dcd0879f6091b248b1e7d92044838056a6cc73222ae064efa72 SHA512 d59a479957e2579b8fe698c2f3304aa5aae6de89a2279b1c63425475721bb5cb33c62e1d0f0f7ce62960c24db67fa2b23afdb9e9eeb62b4a00008b92cd80aa91 WHIRLPOOL 5004e3aec6226ec0e59ae5cde476546dc5b7fcb376f87cbcdd04e60fa21d971299338de72bd8693a76624f09b0b9b6ff8ccce60aa355255ec09ee54052c570fb
diff --git a/net-misc/curl/curl-7.40.0.ebuild b/net-misc/curl/curl-7.41.0.ebuild
similarity index 100%
rename from net-misc/curl/curl-7.40.0.ebuild
rename to net-misc/curl/curl-7.41.0.ebuild
|
mark-kubacki/ossdl-overlay | d4892aaef91727653101b6fa5a4094c4e0b364c6 | dev-lang/python-2.7.9: fix timsort | diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 640b3d5..7d5fb52 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,9 +1,10 @@
AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814
AUX pydoc.init 711 SHA256 bf42ce358c4505bb9c9923758cf7c237113b5465778fe8d0d9781625586003fd SHA512 328597e0f7594dcc1d929dcf15feb39e08a0f85067b226140219c03c2f0a0a5fa9518f26d52723aeb77e36eb5e46d54b5ee4ddbcfc52aa81540a738c49c03b73 WHIRLPOOL 846c7d90fc4b7b74d65c6019ea8e7c9f0d2efb0b6cad5b91d53b5b7bda509f3b625fb30eb27ea59cacf6233378d800c35375108762ba82fb4c2155f2dbf08f13
AUX python-2.7-02-Use-stronger-ciphers-by-default.patch 1668 SHA256 ba4c7ff79141948fd4e4bf34bf728a5d44fe46d757d313cb89e4869d1c87a20e SHA512 a0f9a069748a29a42deb8c1a270c0fec64b793eb5dc032f7a592504191c1deb705b97bc48cc1b20f5d1d0082efd0269a97126dbaeed6ee25deaba885e1419c23 WHIRLPOOL ae00c1ddba49b8d6720407aa1d6880ecabb0fb73c9f072f8d1e59808e23410d64557eb7eb3a3722641b293539d1c885660dd259ca721936733fabaab6ca82704
AUX python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch 2885 SHA256 1f5da8646c678144ecdcf14809ba74d0575fc0321b8838a88c725369e7bf5d95 SHA512 b2672a992388c095556599b84938965a704587c6e3a5be997eacbce7d534cf3558c5be888883a197b0e32283394563d33b02adc7a01be73542fd198af56d246a WHIRLPOOL 644de7191db8c2f83a194f688a040c6b3f90a93e7d4b07a918c0929ab53029e0f07ccd2a0f58a67f1ae7abc0957b0ce4fe21335dc48f6579186d6ca286d6a56d
AUX python-2.7-Enable-static-linking-of-libraries.patch 2133 SHA256 32f42d870590732079f9948ad02ec04ff6c3092d4aba5114231ce5d493bc2369 SHA512 ba1c619b76833a16297bd4be6c26c6e12a3ff7641d9f43e1ac83cc147ca4ff33123dd9aa354d15f3b45c9f3394c0ce2a5b6ef7e34142b0ba35cea4198ddcbbc3 WHIRLPOOL eea4ec8c49c4744c57d69a6eab7328aa61218fd5ff79f8488bf4f4f5cada3b004bc8e5d52817d96e57566ce33af0cbd767387d4aef9163b544a69cb8af33ca8c
AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
+AUX python-2.7.9-Fix-merge_collapse-of-Timsort.patch 869 SHA256 b7446dd4687e3891d87475be4641d65b3971372f58ef48352a2e617949273fd5 SHA512 8ed9d6843efdc552fb8ad866fe9244003876b1b08011d59ed78cf9729e9847a66c41f161b3d507a157c60c99a12dbad6583915e0d0ee232c9b6d06f15749fb8a WHIRLPOOL 147b924746b7780489344e08b678210535a002871f069660fe00f5a743b17010673bd9fb958b5968542023505cdb1b7df6bed90ab15cd4c646b25cce56d0a620
DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b
-EBUILD python-2.7.9.ebuild 10943 SHA256 a743c3d8e6919835e057f983b1466543cecf71af56ac924248621953ba7a6879 SHA512 0838158fe53951e4e1ccf3186ee7e9ba05ee308bf0efb81ddd623e03c43558734dcd54495602c0a199e65519e213c2b8588086b6312e12cbe5ce05e72aa47db1 WHIRLPOOL f61cd5d490acffc113eccb2b4d99aba0a084c87e7d79683d931e238417ac62f159bd3710693c942a5d18d5d79c4a5a53ad774db3c6d75e7ac30445071efdf459
+EBUILD python-2.7.9.ebuild 11013 SHA256 5097534180443ab89f154793be904326cd9c0572f64a9308f623dbe5e89580ba SHA512 4863f8e23b27dd07fc5b852c807b3771f6707561ef5fade3cbae9a584495997897a1d30edd99816fcf81dd8238f07eae7dd486a2c85fa1db51eca7417d3daa38 WHIRLPOOL 4efd79b7ebc7c3308ac9c2cefb805145701bd2cb284808d412834396ed564402ae1be4cc23b63c1c11a1b9252897b2949d71b53938a9c46e4b7452f34f6b381f
diff --git a/dev-lang/python/files/python-2.7.9-Fix-merge_collapse-of-Timsort.patch b/dev-lang/python/files/python-2.7.9-Fix-merge_collapse-of-Timsort.patch
new file mode 100644
index 0000000..60a5c6d
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.9-Fix-merge_collapse-of-Timsort.patch
@@ -0,0 +1,26 @@
+From 2bbb9cc6136ba73da558e7dfd79df3787fbc30fc Mon Sep 17 00:00:00 2001
+From: Stijn de Gouw <[email protected]>
+Date: Tue, 24 Feb 2015 15:53:25 +0100
+Subject: [PATCH] Fix merge_collapse() of Timsort.
+
+---
+ Objects/listobject.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Objects/listobject.c b/Objects/listobject.c
+index f753643..94fc5e7 100644
+--- a/Objects/listobject.c
++++ b/Objects/listobject.c
+@@ -1800,7 +1800,8 @@ merge_collapse(MergeState *ms)
+ assert(ms);
+ while (ms->n > 1) {
+ Py_ssize_t n = ms->n - 2;
+- if (n > 0 && p[n-1].len <= p[n].len + p[n+1].len) {
++ if ( n > 0 && p[n-1].len <= p[n].len + p[n+1].len
++ || (n-1 > 0 && p[n-2].len <= p[n].len + p[n-1].len)) {
+ if (p[n-1].len < p[n+1].len)
+ --n;
+ if (merge_at(ms, n) < 0)
+--
+2.0.4
+
diff --git a/dev-lang/python/python-2.7.9.ebuild b/dev-lang/python/python-2.7.9.ebuild
index 6df4657..fc7edb8 100644
--- a/dev-lang/python/python-2.7.9.ebuild
+++ b/dev-lang/python/python-2.7.9.ebuild
@@ -1,373 +1,374 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
WANT_AUTOMAKE="none"
WANT_LIBTOOL="none"
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
MY_P="Python-${PV}"
PATCHSET_VERSION="2.7.9-0"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="http://www.python.org/"
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
LICENSE="PSF-2"
SLOT="2.7"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline semi-static sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
LIB_DEPEND=">=sys-libs/zlib-1.1.3[static-libs]
dev-libs/libffi[static-libs]
!build? (
sqlite? ( >=dev-db/sqlite-3.3.8:3[static-libs] )
ssl? ( dev-libs/openssl[static-libs] )
xml? ( >=dev-libs/expat-2.1[static-libs] )
)"
RDEPEND="app-arch/bzip2
!semi-static? (
virtual/libffi
!build? ( gdbm? ( sys-libs/gdbm[berkdb] ) )
${LIB_DEPEND//\[static-libs]}
)
virtual/libintl
!build? (
berkdb? ( || (
sys-libs/db:5.3
sys-libs/db:5.2
sys-libs/db:5.1
sys-libs/db:5.0
sys-libs/db:4.8
sys-libs/db:4.7
sys-libs/db:4.6
sys-libs/db:4.5
sys-libs/db:4.4
sys-libs/db:4.3
sys-libs/db:4.2
) )
ncurses? (
>=sys-libs/ncurses-5.2
readline? ( >=sys-libs/readline-4.1 )
)
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
dev-tcltk/tix
)
)
!!<sys-apps/portage-2.1.9"
DEPEND="${RDEPEND}
semi-static? (
dev-libs/libffi[static-libs]
!build? ( gdbm? ( sys-libs/gdbm[berkdb,static-libs] ) )
${LIB_DEPEND}
)
virtual/pkgconfig
>=sys-devel/autoconf-2.65
!sys-devel/gcc[libffi]"
RDEPEND+=" !build? ( app-misc/mime-types )
doc? ( dev-python/python-docs:${SLOT} )"
PDEPEND="app-admin/eselect-python
app-admin/python-updater"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
if use berkdb; then
ewarn "'bsddb' module is out-of-date and no longer maintained inside"
ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
ewarn "is provided by dev-python/bsddb3."
else
if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
ewarn "You might need to migrate your databases."
fi
fi
}
src_prepare() {
epatch "${FILESDIR}/${PN}-2.7-02-Use-stronger-ciphers-by-default.patch"
epatch "${FILESDIR}/${PN}-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch"
+ epatch "${FILESDIR}/${PN}-2.7.9-Fix-merge_collapse-of-Timsort.patch"
if use semi-static; then
epatch "${FILESDIR}/${PN}-2.7-Enable-static-linking-of-libraries.patch"
fi
# Ensure that internal copies of expat, libffi and zlib are not used.
rm -r Modules/expat || die
rm -r Modules/_ctypes/libffi* || die
rm -r Modules/zlib || die
if tc-is-cross-compiler; then
local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
fi
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
# Fix for cross-compiling.
epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \
Lib/distutils/sysconfig.py \
Lib/site.py \
Lib/sysconfig.py \
Lib/test/test_site.py \
Makefile.pre.in \
Modules/Setup.dist \
Modules/getpath.c \
setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
epatch_user
eautoconf
eautoheader
}
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
export PYTHON_DISABLE_SSL="1"
else
# dbm module can be linked against berkdb or gdbm.
# Defaults to gdbm when both are enabled, #204343.
local disable
use berkdb || use gdbm || disable+=" dbm"
use berkdb || disable+=" _bsddb"
use gdbm || disable+=" gdbm"
use ncurses || disable+=" _curses _curses_panel"
use readline || disable+=" readline"
use sqlite || disable+=" _sqlite3"
use ssl || export PYTHON_DISABLE_SSL="1"
use tk || disable+=" _tkinter"
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
export PYTHON_DISABLE_MODULES="${disable}"
if ! use xml; then
ewarn "You have configured Python without XML support."
ewarn "This is NOT a recommended configuration as you"
ewarn "may face problems parsing any XML documents."
fi
fi
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
filter-flags -malign-double
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
# https://bugs.gentoo.org/show_bug.cgi?id=50309
if is-flagq -O3; then
is-flagq -fstack-protector-all && replace-flags -O3 -O2
use hardened && replace-flags -O3 -O2
fi
if tc-is-cross-compiler; then
# Force some tests that try to poke fs paths.
export ac_cv_file__dev_ptc=no
export ac_cv_file__dev_ptmx=yes
fi
# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
tc-export CXX
# The configure script fails to use pkg-config correctly.
# http://bugs.python.org/issue15506
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
# Set LDFLAGS so we link modules with -lpython2.7 correctly.
# Needed on FreeBSD unless Python 2.7 is already installed.
# Please query BSD team before removing this!
append-ldflags "-L."
local dbmliborder
if use gdbm; then
dbmliborder+="${dbmliborder:+:}gdbm"
fi
if use berkdb; then
dbmliborder+="${dbmliborder:+:}bdb"
fi
BUILD_DIR="${WORKDIR}/${CHOST}"
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
ECONF_SOURCE="${S}" OPT="" \
econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
$(use_with threads) \
$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
--with-dbmliborder="${dbmliborder}" \
--with-libc="" \
--with-system-expat \
--with-system-ffi
if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
eerror "configure has detected that the sem_open function is broken."
eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
die "Broken sem_open function (bug 496328)"
fi
}
src_compile() {
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c
cd "${BUILD_DIR}" || die
emake
# Work around bug 329499. See also bug 413751 and 457194.
if has_version dev-libs/libffi[pax_kernel]; then
pax-mark E python
else
pax-mark m python
fi
}
src_test() {
# Tests will not work when cross compiling.
if tc-is-cross-compiler; then
elog "Disabling tests due to crosscompiling."
return
fi
cd "${BUILD_DIR}" || die
# Skip failing tests.
local skipped_tests="distutils gdb"
for test in ${skipped_tests}; do
mv "${S}"/Lib/test/test_${test}.py "${T}"
done
# Rerun failed tests in verbose mode (regrtest -w).
emake test EXTRATESTOPTS="-w" < /dev/tty
local result="$?"
for test in ${skipped_tests}; do
mv "${T}/test_${test}.py" "${S}"/Lib/test
done
elog "The following tests have been skipped:"
for test in ${skipped_tests}; do
elog "test_${test}.py"
done
elog "If you would like to run them, you may:"
elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
elog "and run the tests separately."
if [[ "${result}" -ne 0 ]]; then
die "emake test failed"
fi
}
src_install() {
local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
cd "${BUILD_DIR}" || die
emake DESTDIR="${D}" altinstall
sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
# Backwards compat with Gentoo divergence.
dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
# Fix collisions between different slots of Python.
mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
rm -f "${ED}usr/bin/smtpd.py"
if use build; then
rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
else
use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
fi
use threads || rm -r "${libdir}/multiprocessing" || die
use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r "${S}"/Tools
fi
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
emake --no-print-directory -s -f - 2>/dev/null)
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
sed \
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-e "s:@PYDOC@:pydoc${SLOT}:" \
-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
local PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
fi
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
}
pkg_preinst() {
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
python_updater_warning="1"
fi
}
eselect_python_update() {
if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
eselect python update
fi
if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
eselect python update --python${PV%%.*}
fi
}
pkg_postinst() {
eselect_python_update
if [[ "${python_updater_warning}" == "1" ]]; then
ewarn "You have just upgraded from an older version of Python."
ewarn "You should switch active version of Python ${PV%%.*} and run"
ewarn "'python-updater [options]' to rebuild Python modules."
fi
}
pkg_postrm() {
eselect_python_update
}
|
mark-kubacki/ossdl-overlay | ff9e3eee115bfdd8b2582a4faa24bd6b453f752e | www-servers/nginx-1.7.10: remove obsolete files | diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index f90ecc5..0052773 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,41 +1,34 @@
-AUX 0001-Nginx-1.5.7-from-5450-to-5458.patch 18500 SHA256 6a7a56f8372e1b1fd4560b54d81ad219c9aba3b30b1b0afd9490a649d6cb46be SHA512 1666e66b76cdd0ad5c6c2099723ed63d77a5014d8a9b13ab09d7be78475e35b0ed5f3caa9479fc8f58c8f0a69acc2fee05b103b2bcf2b558acb00f26318d2849 WHIRLPOOL d3ba7d16da8382022995f3f4f768d3284a68b4d49f1fdc3787df0ade4f170780c68a52eaf24130f0a40f4488a0d70ac985f948935ab349247a72be1c5190cf5d
+AUX 0001-Add-ifdef-around-SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.patch 1071 SHA256 8c3c65c36a03362b55015706c160ce4d780508dc45267625d881f1d557e66507 SHA512 962bc1e0429bbd0b8912fc7807def88b3ab6c723746b57e806fe8fbee386ea80b8c473c4cf0f87fc81f648cbfa2c90831dc5c34f05be2ee73c08d370a86834a9 WHIRLPOOL f56d102506dc52f13a802b8057d15a94130c2d2b46124d2ae9b5e46da2997eb35fdec7dfd5b8170b8eaac3377515f6a293defa201469f71b00f82211ebd1cbdc
AUX 0001-SSL-support-automatic-selection-of-ECDH-temporary-ke.patch 1683 SHA256 15507a3322a92a05eda448148f32cd89ea200666f9f7cb9263a5841fabaf7739 SHA512 fc2658569089d2b3ad8eb3b0fb31539432c4fae2d2a8f258a7f315aa966dd9469daa0085c5c8be25c6498ff6bcfe08f7b4de8f7855eab9ec33e165e9db302b08 WHIRLPOOL 120bbcb86d98f39b21a952aa088aac6ec0f96170df2ae8b3f9330daedfd52dce38face9434cf28b14e7d0b3c3627a1d481d86d33f59eab5e9c66edd3317d4629
AUX 0001-fix-TLS-record-size.patch 1146 SHA256 f569f2946b4eec762925721b42fbda3e4ee8f96c334a250937bedae1b600ecda SHA512 5d6b70dc1af21c3d1363cf1597795458e925a9f8d8be7ec261daf6b89dc4976607fbaba840e44856a257d4ced6aadcdaeb850ce7002fa2d7ffa01df593fa0f7c WHIRLPOOL eba1dd6d5279c018963efafb441b7e5bb468ec6fc34348d6e5fb33fc12ac56e58ed25954e4021780ebff8e4bcd11286d01b615dc9b7435813c4bbe28987096bb
AUX 0002-SSL-support-ALPN-IETF-s-successor-to-NPN.patch 6569 SHA256 9a9dc666e83d8f9f53f99b664b0662a3192b95ad88dbcee8e029c170cdb1cbc4 SHA512 bdbd381aae59709485a5aa05c964a0392ccee1654a6df75e99e114947f18291bb21371d06bf53b28dbd9de135897db9fc34fa75e52807b97d50525ecc1c2c76f WHIRLPOOL 2b93eb348e415b096c95d3f2e1e0ea676b2f58b005d177aeae73815d9cb4207f9cad50a9b20f1b649603e38c4c12c080904c34fc45d870bca711c32a5c93d30d
AUX 0003-SSL-ssl_buffer_size-directive.patch 4964 SHA256 20e23a98e2e5073b9e6e08ed3813837bf4cb84b4586e6049c23f5af4df2c35d9 SHA512 6dfb71f50694f2d1ed8f160f42c6d65563ff8a0233133247f69d087e8cab5561a2d5922dfb98fa7541aa40f9a5e0ab48f6660e90b4e7faa3c85e2812b4786250 WHIRLPOOL 0d058ee115e3aea72c89e8f45c7632435859c5bfb099dafc5fd57ced88fca88dccf21d6f3d41023907378d915bc276935c223232143c9fe13a723422877e74e1
AUX 01_gzip.conf 483 SHA256 796edb56a2eefa0c876b0bb27bd409210ed3de1bbec5a1874937503ea86916b2 SHA512 4f02b27a7eb47767e7b8fd32698cecb493dd6a5448c968d5ffaf60f6d4c00de11a37c69672483e98390cee54fd74ebdf556e74a6ce8c366e9e987a75374fc0d3 WHIRLPOOL 2930a62b2eff89b0e7d6ea8f19f674d63d9393129faa520136e15b475c01c28007c883b36732d57afc2f5a86b323e4577ba7c27439bd9b5139ad0a0a6718592b
AUX 05_geoip.conf 452 SHA256 fbbe97ab6a409e542c403a7ab1cddd702100578319332ebe392acb5e34183a1b SHA512 dbfe3ca52a7300d80baf65ec68795b33ce619a7acd859042cdb0a3763b70f22509fbdb6c627135f2c455f66e3e2d434736a6cc7b912da79a6034a0b209239924 WHIRLPOOL 9e8bf9bf3eaba600a3865928ce3719c48ddeacd892cfdaa0d566f4983d3fa0ebff25dfa3b80239782185b36570207ffd96702b0ec014ab84a12977d573300792
AUX 05_proxy.conf 475 SHA256 00f18a4c195aaa40b11fbb40f67fa0b553f058edc5f724943dd6f1fc543231cd SHA512 25f6b991b73ebb923074373ec35a16a1af3e2d2cc1dadf4e0fc2641e431b440978641a688bb2b380e0d073398c6693ed284658c9a31287351e63abfec8ed38e6 WHIRLPOOL e96c473a24c7ab5df617e1669e14469ee8b177d4265850d439eaab7bcc28e74db233f868394609fd9e744b59fa5de4e5c1ba91eb9b75a1e23d8a406568bbfde3
AUX 07_browser.conf 365 SHA256 9bb7b4bb4a95cfc3932d9b432adae831f5063b4f5444adc1c46da494b3f987e7 SHA512 240298f7b5dadff2b746b3a94cc8dafde8d4aa3a1fa7bf3f16604437655bac0bbda92efd014a75ee1a6b34b13c25ab86ad420c2640397a18e1c443683107190f WHIRLPOOL 983e0d0385cfcde9310cb4c1a19e6000a117c11c9d77e3b3c8648cc00eb694f0178acc59a28dc159adb09167f7040388f5623e5bad2bfd6c051774e7e95c5e03
AUX 99_localhost.conf 656 SHA256 e300b6440b81da6d635e42be80f3e35015a1d4f85a6ba322e403fc5d81ee9a52 SHA512 13dc21ab81f537d1b0a936c133acd8235051adcfa8d313894b1e1a5b1ad5e0b2fd62bf20438d99aef442ab56620024cd18a94985e91434b2d78f60f22a0cd81a WHIRLPOOL f0a316cbc50eaf92b4fb9688f1c3b3279bb22dcd29139de1a3cd0d0ce0ee8b99827a3b3273a630ac6f11209d6f17c30e3df3ab6a46cc227887ac7355db370ec2
AUX http_redis-0.3.6-trailer.patch 863 SHA256 c6f3076765cc58d0ef8a6908f3b8a0de4687465cdddddd3af20b8fdc7b81bf18 SHA512 8c9baa0c992cfa8ff01b6398140a9406edad5af9a9889dffa2a100dcce3253ff901305352ee3566159e5af72be8eec3e0f0efa0e140f7b9bf290ca3c81161149 WHIRLPOOL 171eb3fe97671dbdb41978cd2c7ea72a0734d38ad022f6b1557df123cb77455a183efab705138c350ec0949059abb3382db59869eaa14e530c233d3c4f852246
-AUX lua-nginx-module-0.9.12-compat-1.7.15-patch 1362 SHA256 02e8eca7895831ef34690286338509f652d4376ef0d7b93bcf2e794e2e20de48 SHA512 ebe40dbc7ad6983d91243e30bda5b87e2b947ff5c94db2287ee75c281cc95f567f3140abd6099cbfd2f0454e1eb71423e464ff8c4931148379812512aaa168d5 WHIRLPOOL 5e07e50bddaaeb4213104ff89b95a1a07096daeed910edb8e729783daa650b591ca963c79b1a88007f216c51c8b44fc6e52a70877aa3d1beeff36682e327e293
AUX nginx-1.1.5-zero_filesize_check.patch 2680 SHA256 84cd09e431d159ff58eb369abf7fe0a82c3968ad7ba72105e27378d27bd53ced SHA512 46f122c782fde6ede8cfddb043f753bca5174f252c2732d0506f0562554682f9ed2a954192ffada06c5594d083bfc44e1f11c6055503984dd2d60cae5da7bb07 WHIRLPOOL d854930b2db596fd00236a49793f903994a1de232ed1c5cf4a71e517e2ba3ecbdb192a6fdd868906c491153426c3e706165908236fbbf753a618cb7d7150545e
AUX nginx-1.3.4-if_modified_since.patch 712 SHA256 484ef6c5e4968a0eb2e77e06c1ce9fe67d5731610a83a64954cd4b0e9cbdcdb0 SHA512 87e26e1bfdc30e2353a73c49fc89abb9a269250fdb51a2675b96bec9348ea0496b59cc0129a01dbb7b037b17d018ec2efae171d44bc0a3da8f75ddaed7d665c5 WHIRLPOOL 48c3383b14d69db0188c5140285943c2a35f3b201aadd84db690a4d67330920cffe82040c42b43bee75030eb35e27ff961081904b5cc1835b7ff99eade3a6af4
AUX nginx-1.5.6-3072-bit-dhparam.patch 5475 SHA256 2735019b39bf6ca8c76645147876e99e5bd66f1c22ec0a078ec614c21c333c76 SHA512 2a34d79cb268ace74f661da4c66f70407b9eb48ed8db6aa518b1966796ccbad0b5a89f294be88729196ec1292a5e9e39dd0206518193e9afb7e3405ad3615396 WHIRLPOOL 6bf4b7ef9faca6f0cfa5c711c2343e2bb118f150cce16cfde09a5322e8dae0c15c4a028e40f9d69a204dd8a2574e238e81ccb9ab82be852fe4e536ec7af0a6c3
AUX nginx-1.5.6-random_dhparam.patch 3123 SHA256 8485f825c7bdc18e6bbc23f1b388990f5486d9eee363bdf24e1d07416d7dc0ec SHA512 66a8a74547f62251042f04f60b2dfb37e4d2ef983afdb5ce9904fd9088aebb5eb1c19647ba8d988d1feaccaad0e0fbae2892c7e075fdd9333a4a363dc0cfde97 WHIRLPOOL 6f10b046262a7728b94902f26b9d92f8619f9d07f544e81edbaa363df600e82da09993a829454921fe9675df468d0e3dd9eec7974f86786ce7418d2f2b2bc381
-AUX nginx-1.5.8-lua-nginx-module-0.9.3-resolver-fix.patch 8608 SHA256 3ad579328024e341f6b45446871517f6b49f52fbba3e1ae1b30e63d430bcdb21 SHA512 aae40da9368c3290610604b689c313ca5ac1afb2d4407a6616fec88d252e8a525c47950702e96f99936c6b19a08b70553621131ecd36a2b869b8b456d710e140 WHIRLPOOL c3da455e59bb49ef5ae0ea99b79055da219d122ed700ec66afb6c0e068550f85b3b4cbe8f2271784197a9c3dd3daf19558d4709508b220689d9104486fcb87f4
AUX nginx-1.5.8-remove-RC4-from-the-list-of-default-ciphers.patch 1310 SHA256 f61257f186636122fcc694183f5d6afa9cc4e7af9d73020871ed644f68eb6d23 SHA512 4fba017bbca600977e552215c7145854a42dac45f9c70e46f6332a88def6bebd234c7026d65f60bed7080d06833d58c3d6be6a04c4861aa4b8c85121f0bdf19d WHIRLPOOL b24528fbdef2beb482909cb3bc3525d779c8877f7efb75e407377ecfbd26ec8a676be9e4d8e68b1e7ff7384141eb4b4df97a5e2f9c7916697fcaa7cb7320becb
AUX nginx.conf-r5 965 SHA256 b274f63353b6832cbaaa5ec3da7961db018e34e0a587ac444957ff29b5cbce9f SHA512 1063b9df4da2e00a5c7231cf8cff00ae95f68d11ca0ed1f7efc31fc1a22b128edba2c747db258a8f4faba27d252bb0b138e6f78ecad280049f912ab9bf885938 WHIRLPOOL 5328b9fd044d7eb02cff986ed99627259451786fd79a91d00fe8ae6c651791a0522a46cd770aa599d23608a50bb41c75619cba671d69818ef339c9fe4843932d
AUX nginx.init-r3 2057 SHA256 b24365bda7fb77b3bb359550b8598c4633ba32560b096f7ecda5757dc5faf761 SHA512 8e4515885a93e20ca9e7c82473b1f5b28b8554d5e0be9129dbc57b26930224ad1f2724b557314020147fb00b12c2e0a734e28f60f8e0f5d84c7aadf9ee3560c0 WHIRLPOOL 83447ba3cd4bdbdf00a817d971ab9726a6ba847c334e5185b7b17a2fadf758590ca1500dea84371022d0ce8e3aff96b37de3bbe75657b7f9dba9e7475e04f3d6
AUX nginx.logrotate 364 SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925 SHA512 bdb56d90cfa163a9b22262c77d702cfa2319c0c61e3ce2cc2a0c099681bbd6a631a2e2f442ee28802e178799c592e5dd560f3bd33bf2c86d7ecf2b40a204746c WHIRLPOOL be1b76c1d51e6e597f9b441753dda3a943c31ccfb94f02a8da6edcd5c8f22b251df3086b6029101143beef0ca9c624d3ee709aca3e307ab0c910002931c1dc08
AUX nginx.service-r1 327 SHA256 17c404c5130115e3ebadb09e25cff0103b48ae7dbff2284fa690161fda7888ae SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9 WHIRLPOOL 126c56732b8bd9948595727aa8c056c44df05f4c8e708b00c9de715a7260e4e120fd9e076672312b55c889ff4a3ca100ce696165a4eaf93d89e808e1e28653fa
-DIST agentzh-echo-nginx-module-0.56.tar.gz 65110 SHA256 a523b3296f71982db3eeff4929360bbdc1c87af1172545a8a60ff913501f3bee SHA512 7495dc6da181da421ca8a3389b21ac6bb67d7fa59fceaf93e8cef49aa37ea58b333ab1e489b5bdea886190b275b389a6f609e4dcc0c8f951de47d16626cbadfb WHIRLPOOL 5d54667c2349a903c10132cb68ad7b2c2fb7d1d6fd1a46835344fcbc98f9933dfbe6f793cde017decd281b0bb8a57ef5dbd24ad256267af92682c1930f63ba30
DIST agentzh-echo-nginx-module-0.57.tar.gz 65082 SHA256 1c20511adb616917cfa13868a19b8dfefe7f9c7c31730a81ad6f0a8a67d61d04 SHA512 04029882e0d638da9e78d60db5c775797edc5be91e9773e86c43fb8a30e121a2a756f7db5c84156b43560489fe6623d77ec1797d2c6989fa62a57cfc19efbbfd WHIRLPOOL 845e53de66216c172c4a8136daec6354706347c02408c0f01efe0da64fd345057e30be773c52ce0d124b5b0348118a9a06b3cb7d842bd8eef859eb7ef89d6097
DIST agentzh-headers-more-nginx-module-0.25.tar.gz 27961 SHA256 e68077d6a1031aaf933373ece18ff8c21ae030798836d3334cf9925f931cb04b SHA512 fd9866b440194033f8f4868cbfa64d2a45e19f199edd9ab79a499d904700f05c2f753a7a645f8bd465649eb5e9cd86f8b36b518d1fe189f304e0d9c92ed02008 WHIRLPOOL eeb6b7ca303d440d1a4e8845220e75e0b4acbb5725ba46c4d897b16fafa24f1febce83bf17d52a0061c76c973e4583f5471f14f54bcd55a28bdec561187863fe
DIST agentzh-redis2-nginx-module-0.11.tar.gz 28530 SHA256 8a587cc7e90e33123dc0cd01bdba9e1ff7f1db26ba555e88a0070ea8a90afa29 SHA512 ae8618bd11f15f543c3e87916e7a0e1a6a68968e79fd58c987dfaf196655b0cf19aeed2deecb9016fecd2842153dc6cf0e93c9f61f7696a94653a9ea0f97a680 WHIRLPOOL 898fa9f948be185871efd51116f326b13ddb51e7a2c8380f244ea5c0e1a9c1bd6c1d45aaeaffb9c0b2fd82fd8f164f0f55946446cf0a90577b44dd983f7a0c4e
DIST nginx-1.7.10.tar.gz 828607 SHA256 df73c1b468cebaf3530a5de910bed45ff2cfccf2cf4b9215d0aa0f4e39cf4460 SHA512 b35f8761ca458ce7197d1474eee59ef0871e044198b18a426dc0a8e0aa834e4578a7080133126a15432c9e1d437778c4759059a870d0b184ea7bb4a4ab517902 WHIRLPOOL ba889799acfad5b2224a71f0e52637240427146edd2f6a5e125d6cbd75244f8615f91fb871a3099087683d5d45f895c21b89bf4341208a182211c678407650a2
-DIST nginx-1.7.8.tar.gz 823122 SHA256 12f75ec302d3d3b841408e59bbf5116d38527b8c679abfcba7ceb866be60e8e5 SHA512 54833ad6d0ed6bda15d805d171abe980177c0a6d0651dd995d4bbb3d76b6ac77f7fe83d036716cab25c71d61477790967e6e5dcd8bbfdaa98c7e3baa5512323d WHIRLPOOL 2fec99391b394941ae1ffad34acefda3a94047ab509668b4eee99c62be3e1179a382206d90a714c107280e9f600493c1aad8bba73d868d136bee55d569316630
DIST nginx-http-concat-1.2.2.tbz2 6155 SHA256 efbe188d3f705491fe4b1d990d79769ec03398ba8816fb81d784b3efee735a56 SHA512 5f7003b72f8f320a417245cb903b77f81e4ba0e3aa955302afa125a9b2f6028893f882ae0a4ca3ec04eb55566e14b318ed2f8b5eb640b30e86e9d4c2ce236aed WHIRLPOOL 9ff827ab2221a9be267e2abb6a6d8a505263dd6752f510837208f4fa80627e143fc7912ec700330378c853c031e81c221833017331f100633643262a1b50889d
DIST nginx-statsd-20130318.tar.xz 61700 SHA256 61135601dc0575b8bc64a4eceded786f033d052cde64c905e6854be44a363d27 SHA512 40d3cad400f66ea395e604d79ede8028714d76964f9c84a29e4ec41e29ef5799b8c9262a8a1d965e974da4b3b7eee709ce92b2375114178e5e473158d7a64b99 WHIRLPOOL 70afd515673e08443a24ac0e1a3a65b5690c317316a7dd7a340decea8030d86a2eaae6d1a74de011ea08a47472782bc5ff55432e60a83f34cd592cd30cb3dce4
DIST nginx_http_push_module-0.73.tar.gz 50310 SHA256 a2a5b53a847493abef89c27360460997bea2b01d1394a7a612f1e13e4cfbb98a SHA512 ba0038af0e28f03f2201d26c10e356eceef5b188778be83a93c76c5969bc366da9d84edfd4ec93817a9c12029d494456a4c5ee40eaff10554cff9b6a9b7ca4e3 WHIRLPOOL a63205b587199a8c9736efef9c3fa2fc83c36e1debd75977f1a75f4831f25fe23013dc737c2a856d0f43af725b812509b9ceeba490c12aa8694894f9e8258b7c
-DIST ngx_cache_purge-2.1.tar.gz 10535 SHA256 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9 SHA512 1b70b2c35601949edd53d55922e81425aef0b2c486b071c2bcf53db7c5278e55966ffd2c9e32f599ee63e147a395e708d442515fe414f39b323d26722324db8b WHIRLPOOL f020841139988ae516969ffcd5bf7b2c264749fef5c20a5c8f0cca70f5eddcd3efcb3676bbe9a4550535de7b53fcd7326294fcae2a14dc6bf66d1ab77205b83f
DIST ngx_cache_purge-2.3.tar.gz 12248 SHA256 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0 WHIRLPOOL 5451ef3e33044210453995ea916acec679599c0ded5471d464db5003a07e7a06e9690812091148c2af7b50384e52b32e49136eac02e0330724ba2408d893f96c
DIST ngx_devel_kit-0.2.19-r1.tar.gz 65029 SHA256 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 SHA512 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 WHIRLPOOL 0ce6bffc0fe2cef28ee74f5862ca6d914ed18fdee18d900608ff2a9983594c707aab3e335957b79dd7e77ae1beed054d8f71965ca0f57fc5f1d41ac06106c5a4
-DIST ngx_http_lua-0.9.12.tar.gz 512403 SHA256 e85c1924ca4670d5708b58efcd6e77793c43f243317a9850a112964067f63150 SHA512 c08546c074570408f646fc7ee60e60d732763a91f10b652858d95de070bd0dd4f0d4117114fc4b46d0f32cff88b21db5f394c3fbb2d2e5f1494fc01eedb782e4 WHIRLPOOL 2223bacff56b4ef942372e4eac3b1a02f21952804b0df6c626456ac2b6894ea068b704606f8a25c47de7887e97577a771fca6ce31d7288992f6f28eb0be27022
DIST ngx_http_lua-0.9.14.tar.gz 519065 SHA256 dc6d7d3ff7f79ef9a9a80d7adb91ede1cb242eddd2df5f37fca97415646155db SHA512 84d4f3471b0da83f0e192e80385d99a07b4396453050a8ce80d8617418329a5bad9575a9fe90a3e2fa7c33a5d98a10099bafcaa39031bfad3fabe078a8b5a59c WHIRLPOOL de6adf1ecdaf5f9feba8d88fbf7764e06800670b14b445ecd604bf079b8f00a1e601c3228586b366cbd1a38abb1538248a6e7e68b5c825499177e8952b685511
DIST ngx_http_redis-0.3.7.tar.gz 12165 SHA256 9dfc14db81f431fdf3d69f3661a37daf110aef5f9479aa7c88cf362bb5d62604 SHA512 38b7618f35aac4512724df6421d7795b666252b73ea80068b41dd5d9d8d1bdc31293822ae4a57a4cf9e2f39a45abb42c1596c7cf9c8fe1c571f51e3388bbcb3c WHIRLPOOL f9a1f2879092a7d8711513c28d5f012d0e7604a772f480895b6fdba3508eaf3b5e26db1deab1a2414c7aacb1157f415d5632ba89a76b364e92a72a8b5b105cbe
DIST ngx_slowfs_cache-1.10.tar.gz 11809 SHA256 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d WHIRLPOOL a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18
DIST ngx_upload_progress-0.9.1.tar.gz 17198 SHA256 f6e2d867ab545eda2028799ac1af09bf0fd8814530cc387df5218cd8de6bbb18 SHA512 44d5a1065b661d8e17557e97e1b2af173f7005f2b9625ae472cde783d6157f10940e2899073843231d8cbcf0272dd1d9bda14e097249d3d9a7c6e33500e9f4b9 WHIRLPOOL 15d95a2242c5c7290e77138f2e43a2762ad8c05fa6017e8d5b4a3f83ddcd25b6d869d757e165ff16e9acdc44531c01b40009cf4540f1630d56dde21175dd957d
-EBUILD nginx-1.7.10.ebuild 19985 SHA256 35138e2360aa110b095b151ff7d4bd99bf4d37d6b9d0f697f86fa6f83cb48284 SHA512 f0206a504da830cc7f9fd1d15590c94428c01749dbd59f2d3e2728a47e12a6ee845b9ebdc5dce23b0e61e750fd694ec3571d3a4081377b18b536193b7a0de712 WHIRLPOOL f169abad47267b0e8965e0c7c45863acf157ca9dfaa49658f07d5fd820c80ac88d5f7f040fafcba1399d43292fa0cad425cbb906d6f1054a4d70299382c65ac2
-EBUILD nginx-1.7.8.ebuild 20141 SHA256 52b43efc1df68a8d4b0e84529a9b2da043980d4103b1b38cce74c8eaa324dfd4 SHA512 2f4e08a8da9abed23fef3539fead5c24cd6eddff9acc0dca84bbbb29b9800567e35675fa6195ddc38cc304d846f0b7ce05eb7e38959a2935a18a299a422e89e9 WHIRLPOOL 4c07140553c9451f7a098c3ee826a729b617cb0b1f66fd02984a6c7c37fc80a8f1d69431eade3cd9f45b7211863ba1b08cbcb83d4675d336b99d62f7b93dff61
+EBUILD nginx-1.7.10.ebuild 20067 SHA256 a731765b1b4f456aa6e78484c66cfe6d58e420c59dcf60453278e0795715fbd0 SHA512 6f32b8db50eaffa578909c8a98dee8b74318de5bc4a5eee9c80b6077b525b45670c68ad32d466485f559bb95c0e14ad6c0ec75b88a9e8d9d9a6bddb556539b80 WHIRLPOOL e77747c97494603b0419ff96418c438510724ebe5da2ec0ac5f845d336daa86e377a9989a7cc95e8bb8fbbc638dbe934e7c9ae339fbfeaf5b7b228a1b2b17622
diff --git a/www-servers/nginx/files/0001-Add-ifdef-around-SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.patch b/www-servers/nginx/files/0001-Add-ifdef-around-SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.patch
new file mode 100644
index 0000000..870f0ab
--- /dev/null
+++ b/www-servers/nginx/files/0001-Add-ifdef-around-SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.patch
@@ -0,0 +1,26 @@
+From 06a0db96af0ca575f4f30b6282e63c4478b19f25 Mon Sep 17 00:00:00 2001
+From: W-Mark Kubacki <[email protected]>
+Date: Thu, 19 Feb 2015 00:31:57 +0100
+Subject: [PATCH] Add ifdef around SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.
+
+---
+ src/event/ngx_event_openssl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+index d5d4a1a..6d81180 100644
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -1893,7 +1893,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
+
+ /* handshake failures */
+ if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC /* 103 */
++#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
+ || n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG /* 129 */
++#endif
+ || n == SSL_R_DIGEST_CHECK_FAILED /* 149 */
+ || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */
+ || n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */
+--
+2.0.4
+
diff --git a/www-servers/nginx/files/0001-Nginx-1.5.7-from-5450-to-5458.patch b/www-servers/nginx/files/0001-Nginx-1.5.7-from-5450-to-5458.patch
deleted file mode 100644
index 4a0a082..0000000
--- a/www-servers/nginx/files/0001-Nginx-1.5.7-from-5450-to-5458.patch
+++ /dev/null
@@ -1,601 +0,0 @@
-From da161c71710bd9e657015307718aa295c9f9330e Mon Sep 17 00:00:00 2001
-Date: Fri, 6 Dec 2013 14:23:48 +0100
-Subject: [PATCH] Nginx 1.5.7 from 5450 to 5458
-
----
- auto/unix | 12 ++
- src/core/ngx_connection.c | 32 +++++
- src/core/ngx_connection.h | 4 +
- src/event/ngx_event_openssl.c | 5 +
- src/http/modules/ngx_http_fastcgi_module.c | 2 +-
- src/http/modules/ngx_http_scgi_module.c | 2 +-
- src/http/modules/ngx_http_uwsgi_module.c | 206 +++++++++++++++++++++++++++--
- src/http/ngx_http.c | 4 +
- src/http/ngx_http_core_module.c | 25 ++++
- src/http/ngx_http_core_module.h | 3 +
- src/http/ngx_http_upstream.c | 3 +-
- src/http/ngx_http_upstream_round_robin.c | 6 +-
- 12 files changed, 290 insertions(+), 14 deletions(-)
-
-diff --git a/auto/unix b/auto/unix
-index 4dbdbe0..10fd3d2 100755
---- a/auto/unix
-+++ b/auto/unix
-@@ -344,6 +344,18 @@ ngx_feature_test="setsockopt(0, IPPROTO_TCP, TCP_KEEPIDLE, NULL, 0);
- . auto/feature
-
-
-+ngx_feature="TCP_FASTOPEN"
-+ngx_feature_name="NGX_HAVE_TCP_FASTOPEN"
-+ngx_feature_run=no
-+ngx_feature_incs="#include <sys/socket.h>
-+ #include <netinet/in.h>
-+ #include <netinet/tcp.h>"
-+ngx_feature_path=
-+ngx_feature_libs=
-+ngx_feature_test="setsockopt(0, IPPROTO_TCP, TCP_FASTOPEN, NULL, 0)"
-+. auto/feature
-+
-+
- ngx_feature="TCP_INFO"
- ngx_feature_name="NGX_HAVE_TCP_INFO"
- ngx_feature_run=no
-diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
-index fbcd5f7..4544b29 100644
---- a/src/core/ngx_connection.c
-+++ b/src/core/ngx_connection.c
-@@ -82,6 +82,10 @@ ngx_create_listening(ngx_conf_t *cf, void *sockaddr, socklen_t socklen)
- ls->setfib = -1;
- #endif
-
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ ls->fastopen = -1;
-+#endif
-+
- return ls;
- }
-
-@@ -209,6 +213,21 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
- #endif
- #endif
-
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+
-+ if (getsockopt(ls[i].fastopen, IPPROTO_TCP, TCP_FASTOPEN,
-+ (void *) &ls[i].fastopen, &olen)
-+ == -1)
-+ {
-+ ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
-+ "getsockopt(TCP_FASTOPEN) %V failed, ignored",
-+ &ls[i].addr_text);
-+
-+ ls[i].fastopen = -1;
-+ }
-+
-+#endif
-+
- #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
-
- ngx_memzero(&af, sizeof(struct accept_filter_arg));
-@@ -582,6 +601,19 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle)
- }
- #endif
-
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ if (ls[i].fastopen != -1) {
-+ if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_FASTOPEN,
-+ (const void *) &ls[i].fastopen, sizeof(int))
-+ == -1)
-+ {
-+ ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
-+ "setsockopt(TCP_FASTOPEN, %d) %V failed, ignored",
-+ ls[i].fastopen, &ls[i].addr_text);
-+ }
-+ }
-+#endif
-+
- #if 0
- if (1) {
- int tcp_nodelay = 1;
-diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
-index 3daf2ee..5314967 100644
---- a/src/core/ngx_connection.h
-+++ b/src/core/ngx_connection.h
-@@ -80,6 +80,10 @@ struct ngx_listening_s {
- int setfib;
- #endif
-
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ int fastopen;
-+#endif
-+
- };
-
-
-diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
-index e4bc1a2..ee66713 100644
---- a/src/event/ngx_event_openssl.c
-+++ b/src/event/ngx_event_openssl.c
-@@ -1025,6 +1025,7 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
- size -= n;
-
- if (size == 0) {
-+ c->read->ready = 1;
- return bytes;
- }
-
-@@ -1034,6 +1035,10 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
- }
-
- if (bytes) {
-+ if (c->ssl->last != NGX_AGAIN) {
-+ c->read->ready = 1;
-+ }
-+
- return bytes;
- }
-
-diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
-index 51672e2..4cbe51c 100644
---- a/src/http/modules/ngx_http_fastcgi_module.c
-+++ b/src/http/modules/ngx_http_fastcgi_module.c
-@@ -2769,7 +2769,7 @@ ngx_http_fastcgi_merge_params(ngx_conf_t *cf,
-
- s->key = h->key;
- s->value = h->value;
-- s->skip_empty = 0;
-+ s->skip_empty = 1;
-
- next:
-
-diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
-index 9163c6b..d396b27 100644
---- a/src/http/modules/ngx_http_scgi_module.c
-+++ b/src/http/modules/ngx_http_scgi_module.c
-@@ -1506,7 +1506,7 @@ ngx_http_scgi_merge_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf,
-
- s->key = h->key;
- s->value = h->value;
-- s->skip_empty = 0;
-+ s->skip_empty = 1;
-
- next:
-
-diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
-index 9c5d762..a0a7715 100644
---- a/src/http/modules/ngx_http_uwsgi_module.c
-+++ b/src/http/modules/ngx_http_uwsgi_module.c
-@@ -34,6 +34,12 @@ typedef struct {
-
- ngx_uint_t modifier1;
- ngx_uint_t modifier2;
-+
-+#if (NGX_HTTP_SSL)
-+ ngx_uint_t ssl;
-+ ngx_uint_t ssl_protocols;
-+ ngx_str_t ssl_ciphers;
-+#endif
- } ngx_http_uwsgi_loc_conf_t;
-
-
-@@ -66,6 +72,11 @@ static char *ngx_http_uwsgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd,
- void *conf);
- #endif
-
-+#if (NGX_HTTP_SSL)
-+static ngx_int_t ngx_http_uwsgi_set_ssl(ngx_conf_t *cf,
-+ ngx_http_uwsgi_loc_conf_t *uwcf);
-+#endif
-+
-
- static ngx_conf_num_bounds_t ngx_http_uwsgi_modifier_bounds = {
- ngx_conf_check_num_bounds, 0, 255
-@@ -86,6 +97,20 @@ static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = {
- };
-
-
-+#if (NGX_HTTP_SSL)
-+
-+static ngx_conf_bitmask_t ngx_http_uwsgi_ssl_protocols[] = {
-+ { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
-+ { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
-+ { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
-+ { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
-+ { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
-+ { ngx_null_string, 0 }
-+};
-+
-+#endif
-+
-+
- ngx_module_t ngx_http_uwsgi_module;
-
-
-@@ -361,6 +386,31 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
- offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ignore_headers),
- &ngx_http_upstream_ignore_headers_masks },
-
-+#if (NGX_HTTP_SSL)
-+
-+ { ngx_string("uwsgi_ssl_session_reuse"),
-+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-+ ngx_conf_set_flag_slot,
-+ NGX_HTTP_LOC_CONF_OFFSET,
-+ offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ssl_session_reuse),
-+ NULL },
-+
-+ { ngx_string("uwsgi_ssl_protocols"),
-+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
-+ ngx_conf_set_bitmask_slot,
-+ NGX_HTTP_LOC_CONF_OFFSET,
-+ offsetof(ngx_http_uwsgi_loc_conf_t, ssl_protocols),
-+ &ngx_http_uwsgi_ssl_protocols },
-+
-+ { ngx_string("uwsgi_ssl_ciphers"),
-+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-+ ngx_conf_set_str_slot,
-+ NGX_HTTP_LOC_CONF_OFFSET,
-+ offsetof(ngx_http_uwsgi_loc_conf_t, ssl_ciphers),
-+ NULL },
-+
-+#endif
-+
- ngx_null_command
- };
-
-@@ -448,15 +498,29 @@ ngx_http_uwsgi_handler(ngx_http_request_t *r)
-
- uwcf = ngx_http_get_module_loc_conf(r, ngx_http_uwsgi_module);
-
-- if (uwcf->uwsgi_lengths) {
-+ u = r->upstream;
-+
-+ if (uwcf->uwsgi_lengths == NULL) {
-+
-+#if (NGX_HTTP_SSL)
-+ u->ssl = (uwcf->upstream.ssl != NULL);
-+
-+ if (u->ssl) {
-+ ngx_str_set(&u->schema, "suwsgi://");
-+
-+ } else {
-+ ngx_str_set(&u->schema, "uwsgi://");
-+ }
-+#else
-+ ngx_str_set(&u->schema, "uwsgi://");
-+#endif
-+
-+ } else {
- if (ngx_http_uwsgi_eval(r, uwcf) != NGX_OK) {
- return NGX_HTTP_INTERNAL_SERVER_ERROR;
- }
- }
-
-- u = r->upstream;
--
-- ngx_str_set(&u->schema, "uwsgi://");
- u->output.tag = (ngx_buf_tag_t) &ngx_http_uwsgi_module;
-
- u->conf = &uwcf->upstream;
-@@ -494,6 +558,7 @@ ngx_http_uwsgi_handler(ngx_http_request_t *r)
- static ngx_int_t
- ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf)
- {
-+ size_t add;
- ngx_url_t url;
- ngx_http_upstream_t *u;
-
-@@ -506,6 +571,41 @@ ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf)
- return NGX_ERROR;
- }
-
-+ if (url.url.len > 8
-+ && ngx_strncasecmp(url.url.data, (u_char *) "uwsgi://", 8) == 0)
-+ {
-+ add = 8;
-+
-+ } else if (url.url.len > 9
-+ && ngx_strncasecmp(url.url.data, (u_char *) "suwsgi://", 9) == 0)
-+ {
-+
-+#if (NGX_HTTP_SSL)
-+ add = 9;
-+ r->upstream->ssl = 1;
-+#else
-+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-+ "suwsgi protocol requires SSL support");
-+ return NGX_ERROR;
-+#endif
-+
-+ } else {
-+ add = 0;
-+ }
-+
-+ u = r->upstream;
-+
-+ if (add) {
-+ u->schema.len = add;
-+ u->schema.data = url.url.data;
-+
-+ url.url.data += add;
-+ url.url.len -= add;
-+
-+ } else {
-+ ngx_str_set(&u->schema, (u_char *) "uwsgi://");
-+ }
-+
- url.no_resolve = 1;
-
- if (ngx_parse_url(r->pool, &url) != NGX_OK) {
-@@ -517,8 +617,6 @@ ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf)
- return NGX_ERROR;
- }
-
-- u = r->upstream;
--
- u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
- if (u->resolved == NULL) {
- return NGX_ERROR;
-@@ -1145,6 +1243,9 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
- conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
-
- conf->upstream.intercept_errors = NGX_CONF_UNSET;
-+#if (NGX_HTTP_SSL)
-+ conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
-+#endif
-
- /* "uwsgi_cyclic_temp_file" is disabled */
- conf->upstream.cyclic_temp_file = 0;
-@@ -1392,6 +1493,27 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
- ngx_conf_merge_value(conf->upstream.intercept_errors,
- prev->upstream.intercept_errors, 0);
-
-+#if (NGX_HTTP_SSL)
-+ ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
-+ prev->upstream.ssl_session_reuse, 1);
-+
-+ ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
-+ (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3
-+ |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1
-+ |NGX_SSL_TLSv1_2));
-+
-+ ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
-+ "DEFAULT");
-+
-+ if (conf->ssl && ngx_http_uwsgi_set_ssl(cf, conf) != NGX_OK) {
-+ return NGX_CONF_ERROR;
-+ }
-+
-+ if (conf->upstream.ssl == NULL) {
-+ conf->upstream.ssl = prev->upstream.ssl;
-+ }
-+#endif
-+
- ngx_conf_merge_str_value(conf->uwsgi_string, prev->uwsgi_string, "");
-
- hash.max_size = 512;
-@@ -1548,7 +1670,7 @@ ngx_http_uwsgi_merge_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
-
- s->key = h->key;
- s->value = h->value;
-- s->skip_empty = 0;
-+ s->skip_empty = 1;
-
- next:
-
-@@ -1670,6 +1792,7 @@ ngx_http_uwsgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- {
- ngx_http_uwsgi_loc_conf_t *uwcf = conf;
-
-+ size_t add;
- ngx_url_t u;
- ngx_str_t *value, *url;
- ngx_uint_t n;
-@@ -1705,12 +1828,35 @@ ngx_http_uwsgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- return NGX_CONF_ERROR;
- }
-
-+#if (NGX_HTTP_SSL)
-+ uwcf->ssl = 1;
-+#endif
-+
- return NGX_CONF_OK;
- }
-
-+ if (ngx_strncasecmp(url->data, (u_char *) "uwsgi://", 8) == 0) {
-+ add = 8;
-+
-+ } else if (ngx_strncasecmp(url->data, (u_char *) "suwsgi://", 9) == 0) {
-+
-+#if (NGX_HTTP_SSL)
-+ add = 9;
-+ uwcf->ssl = 1;
-+#else
-+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+ "suwsgi protocol requires SSL support");
-+ return NGX_CONF_ERROR;
-+#endif
-+
-+ } else {
-+ add = 0;
-+ }
-+
- ngx_memzero(&u, sizeof(ngx_url_t));
-
-- u.url = value[1];
-+ u.url.len = url->len - add;
-+ u.url.data = url->data + add;
- u.no_resolve = 1;
-
- uwcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
-@@ -1844,3 +1990,47 @@ ngx_http_uwsgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- }
-
- #endif
-+
-+
-+#if (NGX_HTTP_SSL)
-+
-+static ngx_int_t
-+ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
-+{
-+ ngx_pool_cleanup_t *cln;
-+
-+ uwcf->upstream.ssl = ngx_pcalloc(cf->pool, sizeof(ngx_ssl_t));
-+ if (uwcf->upstream.ssl == NULL) {
-+ return NGX_ERROR;
-+ }
-+
-+ uwcf->upstream.ssl->log = cf->log;
-+
-+ if (ngx_ssl_create(uwcf->upstream.ssl, uwcf->ssl_protocols, NULL)
-+ != NGX_OK)
-+ {
-+ return NGX_ERROR;
-+ }
-+
-+ if (SSL_CTX_set_cipher_list(uwcf->upstream.ssl->ctx,
-+ (const char *) uwcf->ssl_ciphers.data)
-+ == 0)
-+ {
-+ ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
-+ "SSL_CTX_set_cipher_list(\"%V\") failed",
-+ &uwcf->ssl_ciphers);
-+ return NGX_ERROR;
-+ }
-+
-+ cln = ngx_pool_cleanup_add(cf->pool, 0);
-+ if (cln == NULL) {
-+ return NGX_ERROR;
-+ }
-+
-+ cln->handler = ngx_ssl_cleanup_ctx;
-+ cln->data = uwcf->upstream.ssl;
-+
-+ return NGX_OK;
-+}
-+
-+#endif
-diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
-index 91bb04f..f030baa 100644
---- a/src/http/ngx_http.c
-+++ b/src/http/ngx_http.c
-@@ -1811,6 +1811,10 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
- ls->setfib = addr->opt.setfib;
- #endif
-
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ ls->fastopen = addr->opt.fastopen;
-+#endif
-+
- return ls;
- }
-
-diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
-index d2e2913..8abf864 100644
---- a/src/http/ngx_http_core_module.c
-+++ b/src/http/ngx_http_core_module.c
-@@ -3041,6 +3041,9 @@ ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
- #if (NGX_HAVE_SETFIB)
- lsopt.setfib = -1;
- #endif
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ lsopt.fastopen = -1;
-+#endif
- lsopt.wildcard = 1;
-
- (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.socklen, lsopt.addr,
-@@ -3989,6 +3992,9 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- #if (NGX_HAVE_SETFIB)
- lsopt.setfib = -1;
- #endif
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ lsopt.fastopen = -1;
-+#endif
- lsopt.wildcard = u.wildcard;
- #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
- lsopt.ipv6only = 1;
-@@ -4015,6 +4021,8 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- #if (NGX_HAVE_SETFIB)
- if (ngx_strncmp(value[n].data, "setfib=", 7) == 0) {
- lsopt.setfib = ngx_atoi(value[n].data + 7, value[n].len - 7);
-+ lsopt.set = 1;
-+ lsopt.bind = 1;
-
- if (lsopt.setfib == NGX_ERROR) {
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-@@ -4025,6 +4033,23 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
- continue;
- }
- #endif
-+
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ if (ngx_strncmp(value[n].data, "fastopen=", 9) == 0) {
-+ lsopt.fastopen = ngx_atoi(value[n].data + 9, value[n].len - 9);
-+ lsopt.set = 1;
-+ lsopt.bind = 1;
-+
-+ if (lsopt.fastopen == NGX_ERROR) {
-+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-+ "invalid fastopen \"%V\"", &value[n]);
-+ return NGX_CONF_ERROR;
-+ }
-+
-+ continue;
-+ }
-+#endif
-+
- if (ngx_strncmp(value[n].data, "backlog=", 8) == 0) {
- lsopt.backlog = ngx_atoi(value[n].data + 8, value[n].len - 8);
- lsopt.set = 1;
-diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
-index 5b38000..220c94e 100644
---- a/src/http/ngx_http_core_module.h
-+++ b/src/http/ngx_http_core_module.h
-@@ -89,6 +89,9 @@ typedef struct {
- #if (NGX_HAVE_SETFIB)
- int setfib;
- #endif
-+#if (NGX_HAVE_TCP_FASTOPEN)
-+ int fastopen;
-+#endif
- #if (NGX_HAVE_KEEPALIVE_TUNABLE)
- int tcp_keepidle;
- int tcp_keepintvl;
-diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
-index 9570ccc..c148f38 100644
---- a/src/http/ngx_http_upstream.c
-+++ b/src/http/ngx_http_upstream.c
-@@ -4555,7 +4555,8 @@ ngx_http_upstream_cache_last_modified(ngx_http_request_t *r,
- {
- u_char *p;
-
-- if (!r->upstream->conf->cache_revalidate
-+ if (r->upstream == NULL
-+ || !r->upstream->conf->cache_revalidate
- || r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED
- || r->cache->last_modified == -1)
- {
-diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
-index 02dbf0a..2b4ce7a 100644
---- a/src/http/ngx_http_upstream_round_robin.c
-+++ b/src/http/ngx_http_upstream_round_robin.c
-@@ -79,12 +79,12 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
- peers->peer[n].socklen = server[i].addrs[j].socklen;
- peers->peer[n].name = server[i].addrs[j].name;
-- peers->peer[n].max_fails = server[i].max_fails;
-- peers->peer[n].fail_timeout = server[i].fail_timeout;
-- peers->peer[n].down = server[i].down;
- peers->peer[n].weight = server[i].weight;
- peers->peer[n].effective_weight = server[i].weight;
- peers->peer[n].current_weight = 0;
-+ peers->peer[n].max_fails = server[i].max_fails;
-+ peers->peer[n].fail_timeout = server[i].fail_timeout;
-+ peers->peer[n].down = server[i].down;
- n++;
- }
- }
---
-1.8.4.4
-
diff --git a/www-servers/nginx/files/lua-nginx-module-0.9.12-compat-1.7.15-patch b/www-servers/nginx/files/lua-nginx-module-0.9.12-compat-1.7.15-patch
deleted file mode 100644
index 3cce343..0000000
--- a/www-servers/nginx/files/lua-nginx-module-0.9.12-compat-1.7.15-patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0c4528e50dc45de322a6ae86b1fff544d777e722 Mon Sep 17 00:00:00 2001
-From: "Yichun Zhang (agentzh)" <[email protected]>
-Date: Wed, 17 Sep 2014 13:18:42 -0700
-Subject: [PATCH] bugfix: fixed compilation error with nginx 1.7.5+ because
- nginx 1.7.5+ changes the API in the events subsystem. thanks Charles R.
- Portwood II and Mathieu Le Marec for the report in #422.
-
----
- src/ngx_http_lua_socket_tcp.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
-index 52cc89d..3743548 100644
---- a/src/ngx_http_lua_socket_tcp.c
-+++ b/src/ngx_http_lua_socket_tcp.c
-@@ -3212,7 +3212,11 @@ ngx_http_lua_socket_tcp_finalize_read_part(ngx_http_request_t *r,
- ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
- }
-
-+#if defined(nginx_version) && nginx_version >= 1007005
-+ if (c->read->posted) {
-+#else
- if (c->read->prev) {
-+#endif
- ngx_delete_posted_event(c->read);
- }
-
-@@ -3261,7 +3265,11 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
- ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
- }
-
-+#if defined(nginx_version) && nginx_version >= 1007005
-+ if (c->write->posted) {
-+#else
- if (c->write->prev) {
-+#endif
- ngx_delete_posted_event(c->write);
- }
-
diff --git a/www-servers/nginx/files/nginx-1.5.8-lua-nginx-module-0.9.3-resolver-fix.patch b/www-servers/nginx/files/nginx-1.5.8-lua-nginx-module-0.9.3-resolver-fix.patch
deleted file mode 100644
index 83819eb..0000000
--- a/www-servers/nginx/files/nginx-1.5.8-lua-nginx-module-0.9.3-resolver-fix.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
-index 20082f4..0dcd9e8 100644
---- a/src/ngx_http_lua_socket_tcp.c
-+++ b/src/ngx_http_lua_socket_tcp.c
-@@ -555,7 +555,9 @@ ngx_http_lua_socket_tcp_connect(lua_State *L)
- }
-
- rctx->name = host;
-+#if !defined(nginx_version) || nginx_version < 1005008
- rctx->type = NGX_RESOLVE_A;
-+#endif
- rctx->handler = ngx_http_lua_socket_resolve_handler;
- rctx->data = u;
- rctx->timeout = clcf->resolver_timeout;
-@@ -623,7 +625,12 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
- ngx_http_lua_socket_tcp_upstream_t *u;
- u_char *p;
- size_t len;
-+#if defined(nginx_version) && nginx_version >= 1005008
-+ socklen_t socklen;
-+ struct sockaddr *sockaddr;
-+#else
- struct sockaddr_in *sin;
-+#endif
- ngx_uint_t i;
- unsigned waiting;
-
-@@ -676,9 +683,25 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-
- #if (NGX_DEBUG)
- {
-+# if defined(nginx_version) && nginx_version >= 1005008
-+ u_char text[NGX_SOCKADDR_STRLEN];
-+ ngx_str_t addr;
-+# else
- in_addr_t addr;
-+# endif
- ngx_uint_t i;
-
-+# if defined(nginx_version) && nginx_version >= 1005008
-+ addr.data = text;
-+
-+ for (i = 0; i < ctx->naddrs; i++) {
-+ addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
-+ text, NGX_SOCKADDR_STRLEN, 0);
-+
-+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+ "name was resolved to %V", &addr);
-+ }
-+# else
- for (i = 0; i < ctx->naddrs; i++) {
- dd("addr i: %d %p", (int) i, &ctx->addrs[i]);
-
-@@ -689,6 +712,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
- (addr >> 24) & 0xff, (addr >> 16) & 0xff,
- (addr >> 8) & 0xff, addr & 0xff);
- }
-+# endif
- }
- #endif
-
-@@ -715,21 +739,43 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-
- dd("selected addr index: %d", (int) i);
-
-- len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
-+#if defined(nginx_version) && nginx_version >= 1005008
-+ socklen = ur->addrs[i].socklen;
-
-- p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
-+ sockaddr = ngx_palloc(r->pool, socklen);
-+ if (sockaddr == NULL) {
-+ goto nomem;
-+ }
-+
-+ ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen);
-+
-+ switch (sockaddr->sa_family) {
-+#if (NGX_HAVE_INET6)
-+ case AF_INET6:
-+ ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port);
-+ break;
-+#endif
-+ default: /* AF_INET */
-+ ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port);
-+ }
-+
-+ p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN);
- if (p == NULL) {
-- ngx_resolve_name_done(ctx);
-- u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-+ goto nomem;
-+ }
-
-- lua_pushnil(L);
-- lua_pushliteral(L, "out of memory");
-+ len = ngx_sock_ntop(sockaddr, socklen, p, NGX_SOCKADDR_STRLEN, 1);
-+ ur->sockaddr = sockaddr;
-+ ur->socklen = socklen;
-
-- if (waiting) {
-- ngx_http_run_posted_requests(c);
-- }
-+#else
-+ /* for nginx older than 1.5.8 */
-
-- return;
-+ len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
-+
-+ p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
-+ if (p == NULL) {
-+ goto nomem;
- }
-
- sin = (struct sockaddr_in *) &p[len];
-@@ -744,6 +790,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-
- ur->sockaddr = (struct sockaddr *) sin;
- ur->socklen = sizeof(struct sockaddr_in);
-+#endif
-
- ur->host.data = p;
- ur->host.len = len;
-@@ -763,6 +810,20 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
- } else {
- (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
- }
-+
-+ return;
-+
-+nomem:
-+
-+ ngx_resolve_name_done(ctx);
-+ u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_NOMEM;
-+
-+ lua_pushnil(L);
-+ lua_pushliteral(L, "no memory");
-+
-+ if (waiting) {
-+ ngx_http_run_posted_requests(c);
-+ }
- }
-
-
-diff --git a/src/ngx_http_lua_socket_udp.c b/src/ngx_http_lua_socket_udp.c
-index fe7b1a7..d6c2979 100644
---- a/src/ngx_http_lua_socket_udp.c
-+++ b/src/ngx_http_lua_socket_udp.c
-@@ -349,7 +349,9 @@ ngx_http_lua_socket_udp_setpeername(lua_State *L)
- }
-
- rctx->name = host;
-+#if !defined(nginx_version) || nginx_version < 1005008
- rctx->type = NGX_RESOLVE_A;
-+#endif
- rctx->handler = ngx_http_lua_socket_resolve_handler;
- rctx->data = u;
- rctx->timeout = clcf->resolver_timeout;
-@@ -416,7 +418,12 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
- ngx_http_lua_socket_udp_upstream_t *u;
- u_char *p;
- size_t len;
-+#if defined(nginx_version) && nginx_version >= 1005008
-+ socklen_t socklen;
-+ struct sockaddr *sockaddr;
-+#else
- struct sockaddr_in *sin;
-+#endif
- ngx_uint_t i;
- unsigned waiting;
-
-@@ -476,9 +483,25 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-
- #if (NGX_DEBUG)
- {
-+# if defined(nginx_version) && nginx_version >= 1005008
-+ u_char text[NGX_SOCKADDR_STRLEN];
-+ ngx_str_t addr;
-+# else
- in_addr_t addr;
-+# endif
- ngx_uint_t i;
-
-+# if defined(nginx_version) && nginx_version >= 1005008
-+ addr.data = text;
-+
-+ for (i = 0; i < ctx->naddrs; i++) {
-+ addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen,
-+ text, NGX_SOCKADDR_STRLEN, 0);
-+
-+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+ "name was resolved to %V", &addr);
-+ }
-+# else
- for (i = 0; i < ctx->naddrs; i++) {
- dd("addr i: %d %p", (int) i, &ctx->addrs[i]);
-
-@@ -489,6 +512,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
- (addr >> 24) & 0xff, (addr >> 16) & 0xff,
- (addr >> 8) & 0xff, addr & 0xff);
- }
-+# endif
- }
- #endif
-
-@@ -515,21 +539,43 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-
- dd("selected addr index: %d", (int) i);
-
-- len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
-+#if defined(nginx_version) && nginx_version >= 1005008
-+ socklen = ur->addrs[i].socklen;
-
-- p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
-+ sockaddr = ngx_palloc(r->pool, socklen);
-+ if (sockaddr == NULL) {
-+ goto nomem;
-+ }
-+
-+ ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen);
-+
-+ switch (sockaddr->sa_family) {
-+#if (NGX_HAVE_INET6)
-+ case AF_INET6:
-+ ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port);
-+ break;
-+#endif
-+ default: /* AF_INET */
-+ ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port);
-+ }
-+
-+ p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN);
- if (p == NULL) {
-- ngx_resolve_name_done(ctx);
-- u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_RESOLVER;
-+ goto nomem;
-+ }
-
-- lua_pushnil(L);
-- lua_pushliteral(L, "out of memory");
-+ len = ngx_sock_ntop(sockaddr, socklen, p, NGX_SOCKADDR_STRLEN, 1);
-+ ur->sockaddr = sockaddr;
-+ ur->socklen = socklen;
-
-- if (waiting) {
-- ngx_http_run_posted_requests(c);
-- }
-+#else
-+ /* for nginx older than 1.5.8 */
-
-- return;
-+ len = NGX_INET_ADDRSTRLEN + sizeof(":65536") - 1;
-+
-+ p = ngx_pnalloc(r->pool, len + sizeof(struct sockaddr_in));
-+ if (p == NULL) {
-+ goto nomem;
- }
-
- sin = (struct sockaddr_in *) &p[len];
-@@ -544,6 +590,7 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
-
- ur->sockaddr = (struct sockaddr *) sin;
- ur->socklen = sizeof(struct sockaddr_in);
-+#endif
-
- ur->host.data = p;
- ur->host.len = len;
-@@ -563,6 +610,20 @@ ngx_http_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
- } else {
- (void) ngx_http_lua_socket_resolve_retval_handler(r, u, L);
- }
-+
-+ return;
-+
-+nomem:
-+
-+ ngx_resolve_name_done(ctx);
-+ u->ft_type |= NGX_HTTP_LUA_SOCKET_FT_NOMEM;
-+
-+ lua_pushnil(L);
-+ lua_pushliteral(L, "no memory");
-+
-+ if (waiting) {
-+ ngx_http_run_posted_requests(c);
-+ }
- }
-
-
diff --git a/www-servers/nginx/nginx-1.7.10.ebuild b/www-servers/nginx/nginx-1.7.10.ebuild
index 5c3a1e4..f2db82c 100644
--- a/www-servers/nginx/nginx-1.7.10.ebuild
+++ b/www-servers/nginx/nginx-1.7.10.ebuild
@@ -1,570 +1,571 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 2011-2015 W-Mark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="5"
# Maintainer notes:
# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
# - any http-module activates the main http-functionality and overrides USE=-http
# - keep the following requirements in mind before adding external modules:
# * alive upstream
# * sane packaging
# * builds cleanly
# * does not need a patch for nginx core
# prevent perl-module from adding automagic perl DEPENDs
GENTOO_DEPEND_ON_PERL="no"
# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
DEVEL_KIT_MODULE_PV="0.2.19"
DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
HTTP_UPLOAD_PROGRESS_MODULE_SHA1="39e4d53"
HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
# http_redis (http://wiki.nginx.org/HttpRedis)
HTTP_REDIS_MODULE_P="ngx_http_redis-0.3.7"
# nginx-statsd (https://github.com/zebrafishlabs/nginx-statsd)
HTTP_STATSD_MODULE_P="nginx-statsd-20130318"
HTTP_STATSD_MODULE_PN="nginx-statsd"
# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
HTTP_HEADERS_MORE_MODULE_PV="0.25"
HTTP_HEADERS_MORE_MODULE_SHA1="0c6e05d"
HTTP_HEADERS_MORE_MODULE_PN="agentzh-headers-more-nginx-module"
HTTP_HEADERS_MORE_MODULE_P="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_PV}"
HTTP_HEADERS_MORE_MODULE_S="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_SHA1}"
HTTP_HEADERS_MORE_MODULE_URI="https://github.com/${HTTP_HEADERS_MORE_MODULE_PN/-//}/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license)
HTTP_LUA_MODULE_PV="0.9.14"
HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
# http_echo (https://github.com/agentzh/echo-nginx-module)
HTTP_ECHO_MODULE_PV="0.57"
HTTP_ECHO_MODULE_SHA1="91ee9a8"
HTTP_ECHO_MODULE_PN="agentzh-echo-nginx-module"
HTTP_ECHO_MODULE_P="${HTTP_ECHO_MODULE_PN}-${HTTP_ECHO_MODULE_PV}"
HTTP_ECHO_MODULE_S="openresty-echo-nginx-module-${HTTP_ECHO_MODULE_SHA1}"
HTTP_ECHO_MODULE_URI="https://github.com/${HTTP_ECHO_MODULE_PN/-//}/tarball/v${HTTP_ECHO_MODULE_PV}"
# http_set_misc (https://github.com/agentzh/set-misc-nginx-module)
HTTP_SET_MISC_MODULE_PV="0.28"
HTTP_SET_MISC_MODULE_SHA1="f72abf1"
HTTP_SET_MISC_MODULE_PN="agentzh-set-misc-nginx-module"
HTTP_SET_MISC_MODULE_P="${HTTP_SET_MISC_MODULE_PN}-${HTTP_SET_MISC_MODULE_PV}"
HTTP_SET_MISC_MODULE_S="${HTTP_SET_MISC_MODULE_PN}-${HTTP_SET_MISC_MODULE_SHA1}"
HTTP_SET_MISC_MODULE_URI="https://github.com/${HTTP_SET_MISC_MODULE_PN/-//}/tarball/v${HTTP_SET_MISC_MODULE_PV}"
# http_redis2 (https://github.com/agentzh/redis2-nginx-module)
HTTP_REDIS2_MODULE_PV="0.11"
HTTP_REDIS2_MODULE_SHA1="828803d"
HTTP_REDIS2_MODULE_PN="agentzh-redis2-nginx-module"
HTTP_REDIS2_MODULE_P="${HTTP_REDIS2_MODULE_PN}-${HTTP_REDIS2_MODULE_PV}"
HTTP_REDIS2_MODULE_S="${HTTP_REDIS2_MODULE_PN}-${HTTP_REDIS2_MODULE_SHA1}"
HTTP_REDIS2_MODULE_URI="https://github.com/${HTTP_REDIS2_MODULE_PN/-//}/tarball/v${HTTP_REDIS2_MODULE_PV}"
# http_push (http://pushmodule.slact.net/, MIT license)
HTTP_PUSH_MODULE_PV="0.73"
HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
HTTP_PUSH_MODULE_URI="https://github.com/slact/nginx_http_push_module/archive/v${HTTP_PUSH_MODULE_PV}.tar.gz"
HTTP_PUSH_MODULE_WD="${WORKDIR}/${HTTP_PUSH_MODULE_P}"
# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
HTTP_CACHE_PURGE_MODULE_PV="2.3"
HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
# http_concat (https://github.com/alibaba/nginx-http-concat)
HTTP_CONCAT_MODULE_PV="1.2.2"
HTTP_CONCAT_MODULE_P="nginx-http-concat-${HTTP_CONCAT_MODULE_PV}"
HTTP_CONCAT_MODULE_URI="http://binhost.ossdl.de/distfiles/${HTTP_CONCAT_MODULE_P}.tbz2"
inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
HOMEPAGE="http://nginx.org/"
SRC_URI="http://nginx.org/download/${P}.tar.gz
${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
nginx_modules_http_redis? ( http://people.freebsd.org/~osa/${HTTP_REDIS_MODULE_P}.tar.gz )
nginx_modules_http_statsd? ( https://binhost.ossdl.de/distfiles/${HTTP_STATSD_MODULE_P}.tar.xz )
nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
nginx_modules_http_redis2? ( ${HTTP_REDIS2_MODULE_URI} -> ${HTTP_REDIS2_MODULE_P}.tar.gz )
nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} -> ${HTTP_PUSH_MODULE_P}.tar.gz )
nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
nginx_modules_http_concat? ( ${HTTP_CONCAT_MODULE_URI} )
"
# nginx_modules_http_set_misc? ( ${HTTP_SET_MISC_MODULE_URI} -> ${HTTP_SET_MISC_MODULE_P}.tar.gz )
RESTRICT="primaryuri"
LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
geo gzip headers index limit_conn limit_req log map memcached proxy referer
rewrite scgi ssi upstream_ip_hash userid uwsgi"
NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
image_filter mp4 perl random_index realip secure_link spdy split_clients status
sub xslt"
NGINX_MODULES_MAIL="imap pop3 smtp"
NGINX_MODULES_3RD="
http_concat
http_upload_progress
http_headers_more
http_lua
http_redis
http_echo
http_redis2
http_push
http_cache_purge
http_slowfs_cache
http_statsd
"
# http_set_misc
IUSE="aio debug +http +http-cache ipv6 libatomic +pcre +pcre-jit selinux ssl
paranoia userland_GNU vim-syntax"
for mod in $NGINX_MODULES_STD; do
IUSE="${IUSE} +nginx_modules_http_${mod}"
done
for mod in $NGINX_MODULES_OPT; do
IUSE="${IUSE} nginx_modules_http_${mod}"
done
for mod in $NGINX_MODULES_MAIL; do
IUSE="${IUSE} nginx_modules_mail_${mod}"
done
for mod in $NGINX_MODULES_3RD; do
IUSE="${IUSE} nginx_modules_${mod}"
done
CDEPEND="
pcre? ( >=dev-libs/libpcre-4.2 )
pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
selinux? ( sec-policy/selinux-nginx )
ssl? ( >=dev-libs/openssl-1.0.2_pre20140805 )
http-cache? ( userland_GNU? ( dev-libs/openssl ) )
nginx_modules_http_geoip? ( dev-libs/geoip )
nginx_modules_http_gzip? ( sys-libs/zlib )
nginx_modules_http_gzip_static? ( sys-libs/zlib )
nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1i )
nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
"
RDEPEND="${CDEPEND}"
DEPEND="${CDEPEND}
arm? ( dev-libs/libatomic_ops )
ppc? ( dev-libs/libatomic_ops )
libatomic? ( dev-libs/libatomic_ops )"
PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
REQUIRED_USE="pcre-jit? ( pcre )
nginx_modules_http_lua? ( nginx_modules_http_rewrite ssl )
nginx_modules_http_spdy? ( ssl http )
"
pkg_setup() {
NGINX_HOME="/var/lib/nginx"
NGINX_HOME_TMP="${NGINX_HOME}/tmp"
ebegin "Creating nginx user and group"
enewgroup ${PN}
enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
eend $?
if use libatomic; then
ewarn "GCC 4.1+ features built-in atomic operations."
ewarn "Using libatomic_ops is only needed if using"
ewarn "a different compiler or a GCC prior to 4.1"
fi
if [[ -n $NGINX_ADD_MODULES ]]; then
ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
ewarn "This nginx installation is not supported!"
ewarn "Make sure you can reproduce the bug without those modules"
ewarn "_before_ reporting bugs."
fi
if use !http; then
ewarn "To actually disable all http-functionality you also have to disable"
ewarn "all nginx http modules."
fi
}
src_prepare() {
epatch "${FILESDIR}/0001-SSL-support-automatic-selection-of-ECDH-temporary-ke.patch"
epatch "${FILESDIR}/nginx-1.3.4-if_modified_since.patch"
epatch "${FILESDIR}/nginx-1.1.5-zero_filesize_check.patch"
if use paranoia; then
epatch "${FILESDIR}/nginx-1.5.6-random_dhparam.patch"
else
epatch "${FILESDIR}/nginx-1.5.6-3072-bit-dhparam.patch"
fi
epatch "${FILESDIR}/nginx-1.5.8-remove-RC4-from-the-list-of-default-ciphers.patch"
+ epatch "${FILESDIR}/0001-Add-ifdef-around-SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.patch"
find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
# We have config protection, don't rename etc files
sed -i 's:.default::' auto/install || die
# remove useless files
sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
# don't install to /etc/nginx/ if not in use
local module
for module in fastcgi scgi uwsgi ; do
if ! use nginx_modules_http_${module}; then
sed -i -e "/${module}/d" auto/install || die
fi
done
epatch_user
}
src_configure() {
local myconf= http_enabled= mail_enabled=
use aio && myconf+=" --with-file-aio --with-aio_module"
use debug && myconf+=" --with-debug"
use ipv6 && myconf+=" --with-ipv6"
use libatomic && myconf+=" --with-libatomic"
use pcre && myconf+=" --with-pcre"
use pcre-jit && myconf+=" --with-pcre-jit"
# HTTP modules
for mod in $NGINX_MODULES_STD; do
if use nginx_modules_http_${mod}; then
http_enabled=1
else
myconf+=" --without-http_${mod}_module"
fi
done
for mod in $NGINX_MODULES_OPT; do
if use nginx_modules_http_${mod}; then
http_enabled=1
myconf+=" --with-http_${mod}_module"
fi
done
if use nginx_modules_http_fastcgi; then
myconf+=" --with-http_realip_module"
fi
# third-party modules
if use nginx_modules_http_upload_progress; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
fi
if use nginx_modules_http_headers_more; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_HEADERS_MORE_MODULE_S}"
fi
if use nginx_modules_http_lua; then
http_enabled=1
myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}"
myconf+=" --add-module=${HTTP_LUA_MODULE_WD}"
fi
if use nginx_modules_http_redis; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_REDIS_MODULE_P}"
fi
if use nginx_modules_http_echo; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_ECHO_MODULE_S}"
fi
# if use nginx_modules_http_set_misc; then
# http_enabled=1
# myconf+=" --add-module=${WORKDIR}/${HTTP_SET_MISC_MODULE_S}"
# fi
if use nginx_modules_http_redis2; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_REDIS2_MODULE_S}"
fi
if use nginx_modules_http_push; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_WD}"
fi
if use nginx_modules_http_cache_purge; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
fi
if use nginx_modules_http_slowfs_cache; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
fi
if use nginx_modules_http_concat; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_CONCAT_MODULE_P}"
fi
if use nginx_modules_http_statsd; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_STATSD_MODULE_PN}"
fi
if use http || use http-cache; then
http_enabled=1
fi
if [ $http_enabled ]; then
use http-cache || myconf+=" --without-http-cache"
use ssl && myconf+=" --with-http_ssl_module"
else
myconf+=" --without-http --without-http-cache"
fi
# MAIL modules
for mod in $NGINX_MODULES_MAIL; do
if use nginx_modules_mail_${mod}; then
mail_enabled=1
else
myconf+=" --without-mail_${mod}_module"
fi
done
if [ $mail_enabled ]; then
myconf+=" --with-mail"
use ssl && myconf+=" --with-mail_ssl_module"
fi
# custom modules
for mod in $NGINX_ADD_MODULES; do
myconf+=" --add-module=${mod}"
done
# https://bugs.gentoo.org/286772
export LANG=C LC_ALL=C
tc-export CC
if ! use prefix; then
myconf+=" --user=${PN} --group=${PN}"
fi
# CPU specific options
use amd64 && myconf+=" --with-cpu-opt=amd64"
./configure \
--prefix="${EPREFIX}"/usr \
--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
--pid-path="${EPREFIX}"/run/${PN}.pid \
--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
--with-cc-opt="-I${EROOT}usr/include" \
--with-ld-opt="-L${EROOT}usr/lib" \
--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
--http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \
--http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \
--http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \
--http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \
--http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \
${myconf} \
${EXTRA_ECONF} || die "configure failed"
}
src_compile() {
# https://bugs.gentoo.org/286772
export LANG=C LC_ALL=C
emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
}
src_install() {
emake DESTDIR="${D}" install
cp "${FILESDIR}"/nginx.conf-r5 conf/nginx.conf
sed -i -e 's:worker_processes 2:worker_processes auto:g' \
conf/nginx.conf
dodir /etc/${PN}
insinto /etc/${PN}
doins conf/*
dodir /etc/${PN}/vhosts.d
insinto /etc/${PN}/vhosts.d
doins "${FILESDIR}"/99_localhost.conf
dodir /etc/${PN}/modules.d
insinto /etc/${PN}/modules.d
use nginx_modules_http_gzip && doins "${FILESDIR}"/01_gzip.conf
use nginx_modules_http_geoip && doins "${FILESDIR}"/05_geoip.conf
use nginx_modules_http_proxy && doins "${FILESDIR}"/05_proxy.conf
use nginx_modules_http_browser && doins "${FILESDIR}"/07_browser.conf
fperms 0750 /etc/nginx
fowners ${PN}:0 /etc/nginx
newinitd "${FILESDIR}"/nginx.init-r3 nginx
systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
doman man/nginx.8
nonfatal dodoc CHANGES* README
# just keepdir. do not copy the default htdocs files (bug #449136)
keepdir /var/www/localhost
rm -rf "${D}"/usr/html || die
# set up a list of directories to keep
local keepdir_list="${NGINX_HOME_TMP}"/client
local module
for module in proxy fastcgi scgi uwsgi; do
use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
done
keepdir /var/log/nginx ${keepdir_list}
# this solves a problem with SELinux where nginx doesn't see the directories
# as root and tries to create them as nginx
fperms 0750 "${NGINX_HOME_TMP}"
fowners ${PN}:0 "${NGINX_HOME_TMP}"
fperms 0700 /var/log/nginx ${keepdir_list}
fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
# logrotate
insinto /etc/logrotate.d
newins "${FILESDIR}"/nginx.logrotate nginx
if use nginx_modules_http_perl; then
cd "${S}"/objs/src/http/modules/perl/
einstall DESTDIR="${D}" INSTALLDIRS=vendor
fixlocalpod
fi
if use nginx_modules_http_lua; then
docinto ${HTTP_LUA_MODULE_P}
nonfatal dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
fi
if use nginx_modules_http_cache_purge; then
docinto ${HTTP_CACHE_PURGE_MODULE_P}
nonfatal dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
fi
if use nginx_modules_http_push; then
docinto ${HTTP_PUSH_MODULE_P}
nonfatal dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
fi
if use nginx_modules_http_slowfs_cache; then
docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
nonfatal dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
fi
}
pkg_postinst() {
if use ssl; then
if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.dhparam ]; then
# implies prefix ${ROOT}
install_cert /etc/ssl/${PN}/${PN}
use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem,dhparam}
fi
einfo "For FIPS 140-2 compliance enable fips_mode in your openssl.cnf:"
einfo ""
einfo " openssl_conf = openssl_options"
einfo " [ openssl_options ]"
einfo " alg_section = algs"
einfo " [ algs ]"
einfo " fips_mode = yes"
einfo ""
einfo "... and set this in your nginx.conf:"
einfo ""
einfo " ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # excludes SSLv3"
einfo " ssl_ciphers FIPS:!3DES:!SHA1;"
einfo " #ssl_ecdh_curve prime256v1;"
einfo " ssl_prefer_server_ciphers on;"
einfo ""
einfo "DSA and ECDSA are prone to leak the key on loss of entropy."
einfo "Don't enable them unless you have a reliable random number generator."
einfo ""
ewarn "Generate ssl_dhparam files for every certificate you use:"
ewarn ""
ewarn " openssl dhparam -rand - 2048 > mydomain.tld.dhparam"
if use paranoia; then
ewarn ""
ewarn "... and set ssl_dhparam accordingly or else every time Nginx"
ewarn "starts a new dhparam will be generated, delaying that start."
ewarn ""
fi
einfo ""
einfo "Please note this new directive, with the recommended value being:"
einfo ""
einfo " ssl_buffer_size 1370;"
fi
if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
ewarn "Lua 3rd party module author warns against using ${P} with"
ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
fi
# if use arm64; then
# # arm64 knows different cache lines
# einfo 'add EXTRA_ECONF=" NGX_CPU_CACHE_LINE=64" if applicable'
# fi
# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
# existing installations
local fix_perms=0
for rv in ${REPLACING_VERSIONS} ; do
version_compare ${rv} 1.4.1-r2
[[ $? -eq 1 ]] && fix_perms=1
done
if [[ $fix_perms -eq 1 ]] ; then
ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
ewarn "directories the world-readable bit removed (if set):"
ewarn " ${EPREFIX}/var/log/nginx"
ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
ewarn "Check if this is correct for your setup before restarting nginx!"
ewarn "This is a one-time change and will not happen on subsequent updates."
ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
fi
# If the nginx user can't change into or read the dir, display a warning.
# If su is not available we display the warning nevertheless since we can't check properly
su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
if [ $? -ne 0 ] ; then
ewarn "Please make sure that the nginx user or group has at least"
ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
ewarn "Otherwise you end up with empty log files after a logrotate."
fi
}
diff --git a/www-servers/nginx/nginx-1.7.8.ebuild b/www-servers/nginx/nginx-1.7.8.ebuild
deleted file mode 100644
index bf76cd2..0000000
--- a/www-servers/nginx/nginx-1.7.8.ebuild
+++ /dev/null
@@ -1,576 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Copyright 2011-2014 W-Mark Kubacki
-# Distributed under the terms of the OSI Reciprocal Public License
-
-EAPI="5"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# * does not need a patch for nginx core
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="39e4d53"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_redis (http://wiki.nginx.org/HttpRedis)
-HTTP_REDIS_MODULE_P="ngx_http_redis-0.3.7"
-
-# nginx-statsd (https://github.com/zebrafishlabs/nginx-statsd)
-HTTP_STATSD_MODULE_P="nginx-statsd-20130318"
-HTTP_STATSD_MODULE_PN="nginx-statsd"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.25"
-HTTP_HEADERS_MORE_MODULE_SHA1="0c6e05d"
-HTTP_HEADERS_MORE_MODULE_PN="agentzh-headers-more-nginx-module"
-HTTP_HEADERS_MORE_MODULE_P="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_S="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/${HTTP_HEADERS_MORE_MODULE_PN/-//}/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.9.12"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_echo (https://github.com/agentzh/echo-nginx-module)
-HTTP_ECHO_MODULE_PV="0.56"
-HTTP_ECHO_MODULE_SHA1="8f28ddf"
-HTTP_ECHO_MODULE_PN="agentzh-echo-nginx-module"
-HTTP_ECHO_MODULE_P="${HTTP_ECHO_MODULE_PN}-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_S="openresty-echo-nginx-module-${HTTP_ECHO_MODULE_SHA1}"
-HTTP_ECHO_MODULE_URI="https://github.com/${HTTP_ECHO_MODULE_PN/-//}/tarball/v${HTTP_ECHO_MODULE_PV}"
-
-# http_set_misc (https://github.com/agentzh/set-misc-nginx-module)
-HTTP_SET_MISC_MODULE_PV="0.26"
-HTTP_SET_MISC_MODULE_SHA1="1680123"
-HTTP_SET_MISC_MODULE_PN="agentzh-set-misc-nginx-module"
-HTTP_SET_MISC_MODULE_P="${HTTP_SET_MISC_MODULE_PN}-${HTTP_SET_MISC_MODULE_PV}"
-HTTP_SET_MISC_MODULE_S="${HTTP_SET_MISC_MODULE_PN}-${HTTP_SET_MISC_MODULE_SHA1}"
-HTTP_SET_MISC_MODULE_URI="https://github.com/${HTTP_SET_MISC_MODULE_PN/-//}/tarball/v${HTTP_SET_MISC_MODULE_PV}"
-
-# http_redis2 (https://github.com/agentzh/redis2-nginx-module)
-HTTP_REDIS2_MODULE_PV="0.11"
-HTTP_REDIS2_MODULE_SHA1="828803d"
-HTTP_REDIS2_MODULE_PN="agentzh-redis2-nginx-module"
-HTTP_REDIS2_MODULE_P="${HTTP_REDIS2_MODULE_PN}-${HTTP_REDIS2_MODULE_PV}"
-HTTP_REDIS2_MODULE_S="${HTTP_REDIS2_MODULE_PN}-${HTTP_REDIS2_MODULE_SHA1}"
-HTTP_REDIS2_MODULE_URI="https://github.com/${HTTP_REDIS2_MODULE_PN/-//}/tarball/v${HTTP_REDIS2_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.73"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="https://github.com/slact/nginx_http_push_module/archive/v${HTTP_PUSH_MODULE_PV}.tar.gz"
-HTTP_PUSH_MODULE_WD="${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.1"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-# http_concat (https://github.com/alibaba/nginx-http-concat)
-HTTP_CONCAT_MODULE_PV="1.2.2"
-HTTP_CONCAT_MODULE_P="nginx-http-concat-${HTTP_CONCAT_MODULE_PV}"
-HTTP_CONCAT_MODULE_URI="http://binhost.ossdl.de/distfiles/${HTTP_CONCAT_MODULE_P}.tbz2"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org/"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
- ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
- nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
- nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
- nginx_modules_http_redis? ( http://people.freebsd.org/~osa/${HTTP_REDIS_MODULE_P}.tar.gz )
- nginx_modules_http_statsd? ( https://binhost.ossdl.de/distfiles/${HTTP_STATSD_MODULE_P}.tar.xz )
- nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
- nginx_modules_http_redis2? ( ${HTTP_REDIS2_MODULE_URI} -> ${HTTP_REDIS2_MODULE_P}.tar.gz )
- nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} -> ${HTTP_PUSH_MODULE_P}.tar.gz )
- nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
- nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
- nginx_modules_http_concat? ( ${HTTP_CONCAT_MODULE_URI} )
- "
-# nginx_modules_http_set_misc? ( ${HTTP_SET_MISC_MODULE_URI} -> ${HTTP_SET_MISC_MODULE_P}.tar.gz )
-RESTRICT="primaryuri"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
- "
-
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip headers index limit_conn limit_req log map memcached proxy referer
-rewrite scgi ssi upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
-image_filter mp4 perl random_index realip secure_link spdy split_clients status
-sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
- http_concat
- http_upload_progress
- http_headers_more
- http_lua
- http_redis
- http_echo
- http_redis2
- http_push
- http_cache_purge
- http_slowfs_cache
- http_statsd
- "
-# http_set_misc
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre +pcre-jit selinux ssl
-paranoia userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
- pcre? ( >=dev-libs/libpcre-4.2 )
- pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
- selinux? ( sec-policy/selinux-nginx )
- ssl? ( >=dev-libs/openssl-1.0.2_pre20140805 )
- http-cache? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_geoip? ( dev-libs/geoip )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
- nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
- nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
- nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1i )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
- nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
- "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
- arm? ( dev-libs/libatomic_ops )
- ppc? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
- nginx_modules_http_lua? ( nginx_modules_http_rewrite ssl )
- nginx_modules_http_spdy? ( ssl http )
- "
-
-pkg_setup() {
- NGINX_HOME="/var/lib/nginx"
- NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
- eend $?
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/0001-SSL-support-automatic-selection-of-ECDH-temporary-ke.patch"
- epatch "${FILESDIR}/nginx-1.3.4-if_modified_since.patch"
- epatch "${FILESDIR}/nginx-1.1.5-zero_filesize_check.patch"
- if use paranoia; then
- epatch "${FILESDIR}/nginx-1.5.6-random_dhparam.patch"
- else
- epatch "${FILESDIR}/nginx-1.5.6-3072-bit-dhparam.patch"
- fi
- epatch "${FILESDIR}/nginx-1.5.8-remove-RC4-from-the-list-of-default-ciphers.patch"
-
- find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
- # We have config protection, don't rename etc files
- sed -i 's:.default::' auto/install || die
- # remove useless files
- sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
- # don't install to /etc/nginx/ if not in use
- local module
- for module in fastcgi scgi uwsgi ; do
- if ! use nginx_modules_http_${module}; then
- sed -i -e "/${module}/d" auto/install || die
- fi
- done
-
- if use nginx_modules_http_lua; then
- cd "${HTTP_LUA_MODULE_WD}"
- epatch "${FILESDIR}/lua-nginx-module-0.9.12-compat-1.7.15-patch"
- cd - >/dev/null
- fi
-
- epatch_user
-}
-
-src_configure() {
- local myconf= http_enabled= mail_enabled=
-
- use aio && myconf+=" --with-file-aio --with-aio_module"
- use debug && myconf+=" --with-debug"
- use ipv6 && myconf+=" --with-ipv6"
- use libatomic && myconf+=" --with-libatomic"
- use pcre && myconf+=" --with-pcre"
- use pcre-jit && myconf+=" --with-pcre-jit"
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf+=" --without-http_${mod}_module"
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf+=" --with-http_${mod}_module"
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf+=" --with-http_realip_module"
- fi
-
- # third-party modules
- if use nginx_modules_http_upload_progress; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
- fi
-
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_HEADERS_MORE_MODULE_S}"
- fi
-
- if use nginx_modules_http_lua; then
- http_enabled=1
- myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}"
- myconf+=" --add-module=${HTTP_LUA_MODULE_WD}"
- fi
-
- if use nginx_modules_http_redis; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_REDIS_MODULE_P}"
- fi
-
- if use nginx_modules_http_echo; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_ECHO_MODULE_S}"
- fi
-
-# if use nginx_modules_http_set_misc; then
-# http_enabled=1
-# myconf+=" --add-module=${WORKDIR}/${HTTP_SET_MISC_MODULE_S}"
-# fi
-
- if use nginx_modules_http_redis2; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_REDIS2_MODULE_S}"
- fi
-
- if use nginx_modules_http_push; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_WD}"
- fi
-
- if use nginx_modules_http_cache_purge; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
- fi
-
- if use nginx_modules_http_concat; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_CONCAT_MODULE_P}"
- fi
-
- if use nginx_modules_http_statsd; then
- http_enabled=1
- myconf+=" --add-module=${WORKDIR}/${HTTP_STATSD_MODULE_PN}"
- fi
-
- if use http || use http-cache; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf+=" --without-http-cache"
- use ssl && myconf+=" --with-http_ssl_module"
- else
- myconf+=" --without-http --without-http-cache"
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf+=" --without-mail_${mod}_module"
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf+=" --with-mail"
- use ssl && myconf+=" --with-mail_ssl_module"
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf+=" --add-module=${mod}"
- done
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- if ! use prefix; then
- myconf+=" --user=${PN} --group=${PN}"
- fi
-
- # CPU specific options
- use amd64 && myconf+=" --with-cpu-opt=amd64"
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
- --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
- --pid-path="${EPREFIX}"/run/${PN}.pid \
- --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
- --with-cc-opt="-I${EROOT}usr/include" \
- --with-ld-opt="-L${EROOT}usr/lib" \
- --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
- --http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \
- --http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \
- --http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \
- --http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \
- --http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \
- ${myconf} \
- ${EXTRA_ECONF} || die "configure failed"
-}
-
-src_compile() {
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- cp "${FILESDIR}"/nginx.conf-r5 conf/nginx.conf
- sed -i -e 's:worker_processes 2:worker_processes auto:g' \
- conf/nginx.conf
-
- dodir /etc/${PN}
- insinto /etc/${PN}
- doins conf/*
-
- dodir /etc/${PN}/vhosts.d
- insinto /etc/${PN}/vhosts.d
- doins "${FILESDIR}"/99_localhost.conf
-
- dodir /etc/${PN}/modules.d
- insinto /etc/${PN}/modules.d
- use nginx_modules_http_gzip && doins "${FILESDIR}"/01_gzip.conf
- use nginx_modules_http_geoip && doins "${FILESDIR}"/05_geoip.conf
- use nginx_modules_http_proxy && doins "${FILESDIR}"/05_proxy.conf
- use nginx_modules_http_browser && doins "${FILESDIR}"/07_browser.conf
-
- fperms 0750 /etc/nginx
- fowners ${PN}:0 /etc/nginx
-
- newinitd "${FILESDIR}"/nginx.init-r3 nginx
-
- systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
- doman man/nginx.8
- nonfatal dodoc CHANGES* README
-
- # just keepdir. do not copy the default htdocs files (bug #449136)
- keepdir /var/www/localhost
- rm -rf "${D}"/usr/html || die
-
- # set up a list of directories to keep
- local keepdir_list="${NGINX_HOME_TMP}"/client
- local module
- for module in proxy fastcgi scgi uwsgi; do
- use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
- done
-
- keepdir /var/log/nginx ${keepdir_list}
-
- # this solves a problem with SELinux where nginx doesn't see the directories
- # as root and tries to create them as nginx
- fperms 0750 "${NGINX_HOME_TMP}"
- fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
- fperms 0700 /var/log/nginx ${keepdir_list}
- fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/
- einstall DESTDIR="${D}" INSTALLDIRS=vendor
- fixlocalpod
- fi
-
- if use nginx_modules_http_lua; then
- docinto ${HTTP_LUA_MODULE_P}
- nonfatal dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
- fi
-
- if use nginx_modules_http_cache_purge; then
- docinto ${HTTP_CACHE_PURGE_MODULE_P}
- nonfatal dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
- fi
-
- if use nginx_modules_http_push; then
- docinto ${HTTP_PUSH_MODULE_P}
- nonfatal dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
- nonfatal dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.dhparam ]; then
- # implies prefix ${ROOT}
- install_cert /etc/ssl/${PN}/${PN}
- use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem,dhparam}
- fi
-
- einfo "For FIPS 140-2 compliance enable fips_mode in your openssl.cnf:"
- einfo ""
- einfo " openssl_conf = openssl_options"
- einfo " [ openssl_options ]"
- einfo " alg_section = algs"
- einfo " [ algs ]"
- einfo " fips_mode = yes"
- einfo ""
- einfo "... and set this in your nginx.conf:"
- einfo ""
- einfo " ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # excludes SSLv3"
- einfo " ssl_ciphers FIPS:!3DES:!SHA1;"
- einfo " #ssl_ecdh_curve prime256v1;"
- einfo " ssl_prefer_server_ciphers on;"
- einfo ""
- einfo "DSA and ECDSA are prone to leak the key on loss of entropy."
- einfo "Don't enable them unless you have a reliable random number generator."
- einfo ""
- ewarn "Generate ssl_dhparam files for every certificate you use:"
- ewarn ""
- ewarn " openssl dhparam -rand - 2048 > mydomain.tld.dhparam"
- if use paranoia; then
- ewarn ""
- ewarn "... and set ssl_dhparam accordingly or else every time Nginx"
- ewarn "starts a new dhparam will be generated, delaying that start."
- ewarn ""
- fi
- einfo ""
- einfo "Please note this new directive, with the recommended value being:"
- einfo ""
- einfo " ssl_buffer_size 1370;"
- fi
-
- if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
- ewarn "Lua 3rd party module author warns against using ${P} with"
- ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
- fi
-
-# if use arm64; then
-# # arm64 knows different cache lines
-# einfo 'add EXTRA_ECONF=" NGX_CPU_CACHE_LINE=64" if applicable'
-# fi
-
- # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
- # existing installations
- local fix_perms=0
-
- for rv in ${REPLACING_VERSIONS} ; do
- version_compare ${rv} 1.4.1-r2
- [[ $? -eq 1 ]] && fix_perms=1
- done
-
- if [[ $fix_perms -eq 1 ]] ; then
- ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
- ewarn "directories the world-readable bit removed (if set):"
- ewarn " ${EPREFIX}/var/log/nginx"
- ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
- ewarn "Check if this is correct for your setup before restarting nginx!"
- ewarn "This is a one-time change and will not happen on subsequent updates."
- ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
- chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
- fi
-
- # If the nginx user can't change into or read the dir, display a warning.
- # If su is not available we display the warning nevertheless since we can't check properly
- su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
- if [ $? -ne 0 ] ; then
- ewarn "Please make sure that the nginx user or group has at least"
- ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
- ewarn "Otherwise you end up with empty log files after a logrotate."
- fi
-}
|
mark-kubacki/ossdl-overlay | 65e274d8100a44a9020cd4760a74c64dfe87f8a7 | net-misc/nghttp2-0.7.4 | diff --git a/net-misc/nghttp2/Manifest b/net-misc/nghttp2/Manifest
index 71c66a3..e37c448 100644
--- a/net-misc/nghttp2/Manifest
+++ b/net-misc/nghttp2/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Set-content-type-header-with-charset-for-.html-files.patch 2514 SHA256 39378f8b815ebc4ede87719b67fe8d1dafddc2226cf6194e530b623d94739da8 SHA512 9b05085272b929b71c47d05e0f1c7145676a8c5e247a908b7b60d45fc31c1c4aa22f2bacd9e3527c1e65687cfee6238f0bbce65329f79508cf1030665949171b WHIRLPOOL 1e748d8b5647971dda61428488dd7d0d02fe116cdaee6c2d9117ef530a158bacfdd36e2524a75f51b777a62e3f989322213f745f968159d3015f16fd86006384
DIST nghttp2-0.6.7.tar.xz 813524 SHA256 6cd748982f03c0039072c6a61c8dd88fe270ec34b826fb4591e5ed93f1a8376c SHA512 c22c25f98ec66cacf28b70f5d9d4b78dcf3d6d1f0037642cbd16f03e61c87e4637c53ca6d126a0817eeca31f2e94f0ea452d76328d5d463ea32769b31d982ebc WHIRLPOOL d23529c16113314fcd33393ea10446399c553e98587dec442ecc0a8802174738af46238f1b91061c45d1473f5e9a36449bdae3184c187b55bb96cd60c4b7929c
-DIST nghttp2-0.7.3.tar.xz 834244 SHA256 73b7ec1fa2ca11b537fe6b40e48e30a1db30b93d810d5e3905ce620c67df634f SHA512 14361589494e42265786d1d9468d1b54e7cc59d0cc80b562bc54f2d7077e261cb4b94e70347ac0bdd59644819e5c646d8b0dc9b4edf3b8565ca4a4e6fab08d0f WHIRLPOOL c70bd77466a99de1160a1edf8091022ee9cf7e9cf8c97ab9748469017eda1ae78a0067d29ff1df8920b6810693869f6fb395f033dc413d8aa58162438a5e7a06
+DIST nghttp2-0.7.4.tar.xz 853256 SHA256 fb71dddd7b94c8af83cb6a89b76f30ebbe1e8b0085997c370934dd57667be8f6 SHA512 0a2b7caac8163e1b952ed510e6328c9edb55755af4d5f9b496a462eeac33f0f13fec8800e1c2834d184a4e7c388ab94f8272b2fcffa6dd1efab63c7cfa026caf WHIRLPOOL 525eda9e2600fe836151e696474b4382cdfa32238c2fd8ce25b0e2e8b73b9d2e2a898723b957328aea3493137f5d84b0886e5c89bd7981b36ebc33bef9138414
EBUILD nghttp2-0.6.7.ebuild 1754 SHA256 a82f849bb8e91d3a23aa9405c0a78e201aab15dbde44beaede6564e4978e7335 SHA512 04868000ad2b577715da08c26a5be63b0c4a7573c96381eaeb60debcd12f4fcc09efa2697d6d838abac391d27e7e0983bcf951040170d9ade0f9cbb9867a87be WHIRLPOOL 9765195467e57004448ccfb574800d160be6f1b538a3b5c10722af077f800ef4cd4129ad242f26b3c9bc213e0a00f2fa17e7924f23a118790f0bd20c384ee151
-EBUILD nghttp2-0.7.3.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
+EBUILD nghttp2-0.7.4.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
diff --git a/net-misc/nghttp2/nghttp2-0.7.3.ebuild b/net-misc/nghttp2/nghttp2-0.7.4.ebuild
similarity index 100%
rename from net-misc/nghttp2/nghttp2-0.7.3.ebuild
rename to net-misc/nghttp2/nghttp2-0.7.4.ebuild
|
mark-kubacki/ossdl-overlay | ae06b435e0849fbf81946bdf221ec870441054d7 | app-crypt/signify-1.100 | diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
new file mode 100644
index 0000000..c36b6e1
--- /dev/null
+++ b/app-crypt/signify/Manifest
@@ -0,0 +1,3 @@
+AUX signify.1 4483 SHA256 42528dc3194cb7aba3ad6b122b7d7aa69513a618f403469d24ce95877890bb3e SHA512 9cdbaa87822897716bf24335ec0af151ab030bbd0360bf0fbf8ca9cbae7e520cec9efc170e8797dc9c266a9ca6341c37bee83bc834f06222434a602b55ed3b3a WHIRLPOOL 048e54162a7bcd442c01258088e36275b0e3a9e89b372ae74fc1e5d9e00a7cfcc7529a9b7a706809080a6969a26b577be2af17c250794aaef6cdd69e99890356
+DIST signify-1.100.tar.bz2 67387 SHA256 ca0c88c01bc67f8fdc3f0cf76bf05de47298a3399f29e7c93cdee1d1f6b5ec38 SHA512 b929be7a87aaa4bb7c30003f3184cc9a260da6fb782c3de0dc09f142fd396a9188194e13589499bf06c160f71ec4b907bf99471be28102f481ebc89867d41ffa WHIRLPOOL 88e8d758cb19ee940c43dad7ed57996a9a447e21263555d2a4c72c438321111bc081788d894a3a8046d1613a626492048abfb51b8eb6740acfe221adf3d777bb
+EBUILD signify-1.100.ebuild 636 SHA256 a558ecb295b2b713cef1c8d639865180fbdb9a7dfc97caf2149229d10e227730 SHA512 08525a5b9c08b7156f377335fe67a7a6fff2caf5a5339d2fbae7cdb989f49cedf904264e2739ce67e0f455630cedecc5562cbc278e0bb71b1eba80a8d12f29ef WHIRLPOOL d6247024149a6b1c879177ef9829df19c01f06c7fb43c33aea25b3d906d582e10bc16b9bd27d775f650a6bb2e08b120f2f70ca3489ef74e65dfb8a6737dca4d7
diff --git a/app-crypt/signify/files/signify.1 b/app-crypt/signify/files/signify.1
new file mode 100644
index 0000000..b2ac679
--- /dev/null
+++ b/app-crypt/signify/files/signify.1
@@ -0,0 +1,168 @@
+.\" $OpenBSD: signify.1,v 1.30 2015/01/20 20:50:36 tedu Exp $
+.\"
+.\"Copyright (c) 2013 Marc Espie <[email protected]>
+.\"Copyright (c) 2013 Ted Unangst <[email protected]>
+.\"
+.\"Permission to use, copy, modify, and distribute this software for any
+.\"purpose with or without fee is hereby granted, provided that the above
+.\"copyright notice and this permission notice appear in all copies.
+.\"
+.\"THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\"WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\"MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\"ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.Dd $Mdocdate: January 20 2015 $
+.Dt SIGNIFY 1
+.Os
+.Sh NAME
+.Nm signify
+.Nd cryptographically sign and verify files
+.Sh SYNOPSIS
+.Nm signify
+.Fl C
+.Op Fl q
+.Fl p Ar pubkey
+.Fl x Ar sigfile
+.Op Ar
+.Nm signify
+.Fl G
+.Op Fl n
+.Op Fl c Ar comment
+.Fl p Ar pubkey
+.Fl s Ar seckey
+.Nm signify
+.Fl S
+.Op Fl e
+.Op Fl x Ar sigfile
+.Fl s Ar seckey
+.Fl m Ar message
+.Nm signify
+.Fl V
+.Op Fl eq
+.Op Fl x Ar sigfile
+.Fl p Ar pubkey
+.Fl m Ar message
+.Sh DESCRIPTION
+The
+.Nm
+utility creates and verifies cryptographic signatures.
+A signature verifies the integrity of a
+.Ar message .
+The mode of operation is selected with the following options:
+.Bl -tag -width Dsssigfile
+.It Fl C
+Verify a signed checksum list, and then verify the checksum for
+each file.
+If no files are specified, all of them are checked.
+.Ar sigfile
+should be the signed output of
+.Xr sha256 1 .
+.It Fl G
+Generate a new key pair.
+.It Fl S
+Sign the specified message file and create a signature.
+.It Fl V
+Verify the message and signature match.
+.El
+.Pp
+The other options are as follows:
+.Bl -tag -width Dsssignature
+.It Fl c Ar comment
+Specify the comment to be added during key generation.
+.It Fl e
+When signing, embed the message after the signature.
+When verifying, extract the message from the signature.
+(This requires that the signature was created using
+.Fl e
+and creates a new message file as output.)
+.It Fl m Ar message
+When signing, the file containing the message to sign.
+When verifying, the file containing the message to verify.
+When verifying with
+.Fl e ,
+the file to create.
+.It Fl n
+Do not ask for a passphrase during key generation.
+Otherwise,
+.Nm
+will prompt the user for a passphrase to protect the secret key.
+.It Fl p Ar pubkey
+Public key produced by
+.Fl G ,
+and used by
+.Fl V
+to check a signature.
+.It Fl q
+Quiet mode.
+Suppress informational output.
+.It Fl s Ar seckey
+Secret (private) key produced by
+.Fl G ,
+and used by
+.Fl S
+to sign a message.
+.It Fl x Ar sigfile
+The signature file to create or verify.
+The default is
+.Ar message Ns .sig .
+.El
+.Pp
+The key and signature files created by
+.Nm
+have the same format.
+The first line of the file is a free form text comment that may be edited,
+so long as it does not exceed a single line.
+.\" Signature comments will be generated based on the name of the secret
+.\" key used for signing.
+.\" This comment can then be used as a hint for the name of the public key
+.\" when verifying.
+The second line of the file is the actual key or signature base64 encoded.
+.Sh EXIT STATUS
+.Ex -std signify
+It may fail because of one of the following reasons:
+.Pp
+.Bl -bullet -compact
+.It
+Some necessary files do not exist.
+.It
+Entered passphrase is incorrect.
+.It
+The message file was corrupted and its signature does not match.
+.It
+The message file is too large.
+.El
+.Sh EXAMPLES
+Create a new key pair:
+.Dl $ signify -G -p newkey.pub -s newkey.sec
+.Pp
+Sign a file, specifying a signature name:
+.Dl $ signify -S -s key.sec -m message.txt -x msg.sig
+.Pp
+Verify a signature, using the default signature name:
+.Dl $ signify -V -p key.pub -m generalsorders.txt
+.Pp
+Verify a release directory containing
+.Pa SHA256.sig
+and a full set of release files:
+.Bd -literal -offset indent -compact
+$ signify -C -p /etc/signify/openbsd-57-base.pub -x SHA256.sig
+.Ed
+.Pp
+Verify a bsd.rd before an upgrade:
+.Bd -literal -offset indent -compact
+$ signify -C -p /etc/signify/openbsd-57-base.pub -x SHA256.sig bsd.rd
+.Ed
+.Sh SEE ALSO
+.Xr fw_update 1 ,
+.Xr pkg_add 1 ,
+.Xr sha256 1
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Ox 5.5 .
+.Sh AUTHORS
+.An Ted Unangst Aq Mt [email protected]
diff --git a/app-crypt/signify/signify-1.100.ebuild b/app-crypt/signify/signify-1.100.ebuild
new file mode 100644
index 0000000..280b2d6
--- /dev/null
+++ b/app-crypt/signify/signify-1.100.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2015 W.âMark Kubacki
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI="5"
+
+inherit flag-o-matic
+
+DESCRIPTION="parallel lossless data compressor based on the lzlib compression library"
+HOMEPAGE="https://github.com/Blitznote/signify"
+SRC_URI="https://github.com/Blitznote/${PN}/releases/download/${PV}/${P}.tar.bz2"
+RESTRICT="primaryuri nostrip"
+
+LICENSE="RPL-1.5"
+SLOT="0"
+KEYWORDS="amd64"
+
+src_prepare() {
+ chmod a+x signify
+}
+
+src_compile() {
+ "${S}"/signify -Vqp mark.pub -m signify || die
+}
+
+src_install() {
+ dobin signify
+ doman "${FILESDIR}"/signify.1
+
+ insinto /etc/signify
+ doins mark.pub
+}
|
mark-kubacki/ossdl-overlay | 126cac5671629d6e04593985026928b2f53c7b4e | Add RPL-1.5 license. | diff --git a/license/RPL-1.5 b/license/RPL-1.5
new file mode 100644
index 0000000..7631935
--- /dev/null
+++ b/license/RPL-1.5
@@ -0,0 +1,548 @@
+Reciprocal Public License (RPL-1.5)
+
+Version 1.5, July 15, 2007
+
+Copyright (C) 2001-2007
+Technical Pursuit Inc.,
+All Rights Reserved.
+
+
+PREAMBLE
+
+The Reciprocal Public License (RPL) is based on the concept of reciprocity or,
+if you prefer, fairness.
+
+In short, this license grew out of a desire to close loopholes in previous open
+source licenses, loopholes that allowed parties to acquire open source software
+and derive financial benefit from it without having to release their
+improvements or derivatives to the community which enabled them. This occurred
+any time an entity did not release their application to a "third party".
+
+While there is a certain freedom in this model of licensing, it struck the
+authors of the RPL as being unfair to the open source community at large and to
+the original authors of the works in particular. After all, bug fixes,
+extensions, and meaningful and valuable derivatives were not consistently
+finding their way back into the community where they could fuel further, and
+faster, growth and expansion of the overall open source software base.
+
+While you should clearly read and understand the entire license, the essence of
+the RPL is found in two definitions: "Deploy" and "Required Components".
+
+Regarding deployment, under the RPL your changes, bug fixes, extensions, etc.
+must be made available to the open source community at large when you Deploy in
+any form -- either internally or to an outside party. Once you start running
+the software you have to start sharing the software.
+
+Further, under the RPL all components you author including schemas, scripts,
+source code, etc. -- regardless of whether they're compiled into a single
+binary or used as two halves of client/server application -- must be shared.
+You have to share the whole pie, not an isolated slice of it.
+
+In addition to these goals, the RPL was authored to meet the requirements of
+the Open Source Definition as maintained by the Open Source Initiative (OSI).
+
+The specific terms and conditions of the license are defined in the remainder
+of this document.
+
+
+LICENSE TERMS
+
+1.0 General; Applicability & Definitions. This Reciprocal Public License
+Version 1.5 ("License") applies to any programs or other works as well as any
+and all updates or maintenance releases of said programs or works ("Software")
+not already covered by this License which the Software copyright holder
+("Licensor") makes available containing a License Notice (hereinafter defined)
+from the Licensor specifying or allowing use or distribution under the terms of
+this License. As used in this License:
+
+1.1 "Contributor" means any person or entity who created or contributed to the
+creation of an Extension.
+
+1.2 "Deploy" means to use, Serve, sublicense or distribute Licensed Software
+other than for Your internal Research and/or Personal Use, and includes
+without limitation, any and all internal use or distribution of Licensed
+Software within Your business or organization other than for Research and/or
+Personal Use, as well as direct or indirect sublicensing or distribution of
+Licensed Software by You to any third party in any form or manner.
+
+1.3 "Derivative Works" as used in this License is defined under U.S. copyright
+law.
+
+1.4 "Electronic Distribution Mechanism" means a mechanism generally accepted
+in the software development community for the electronic transfer of data such
+as download from an FTP server or web site, where such mechanism is publicly
+accessible.
+
+1.5 "Extensions" means any Modifications, Derivative Works, or Required
+Components as those terms are defined in this License.
+
+1.6 "License" means this Reciprocal Public License.
+
+1.7 "License Notice" means any notice contained in EXHIBIT A.
+
+1.8 "Licensed Software" means any Software licensed pursuant to this License.
+Licensed Software also includes all previous Extensions from any Contributor
+that You receive.
+
+1.9 "Licensor" means the copyright holder of any Software previously not
+covered by this License who releases the Software under the terms of this
+License.
+
+1.10 "Modifications" means any additions to or deletions from the substance or
+structure of (i) a file or other storage containing Licensed Software, or (ii)
+any new file or storage that contains any part of Licensed Software, or (iii)
+any file or storage which replaces or otherwise alters the original
+functionality of Licensed Software at runtime.
+
+1.11 "Personal Use" means use of Licensed Software by an individual solely for
+his or her personal, private and non-commercial purposes. An individual's use
+of Licensed Software in his or her capacity as an officer, employee, member,
+independent contractor or agent of a corporation, business or organization
+(commercial or non-commercial) does not qualify as Personal Use.
+
+1.12 "Required Components" means any text, programs, scripts, schema,
+interface definitions, control files, or other works created by You which are
+required by a third party of average skill to successfully install and run
+Licensed Software containing Your Modifications, or to install and run Your
+Derivative Works.
+
+1.13 "Research" means investigation or experimentation for the purpose of
+understanding the nature and limits of the Licensed Software and its potential
+uses.
+
+1.14 "Serve" means to deliver Licensed Software and/or Your Extensions by
+means of a computer network to one or more computers for purposes of execution
+of Licensed Software and/or Your Extensions.
+
+1.15 "Software" means any computer programs or other works as well as any
+updates or maintenance releases of those programs or works which are
+distributed publicly by Licensor.
+
+1.16 "Source Code" means the preferred form for making modifications to the
+Licensed Software and/or Your Extensions, including all modules contained
+therein, plus any associated text, interface definition files, scripts used to
+control compilation and installation of an executable program or other
+components required by a third party of average skill to build a running
+version of the Licensed Software or Your Extensions.
+
+1.17 "User-Visible Attribution Notice" means any notice contained in EXHIBIT B.
+
+1.18 "You" or "Your" means an individual or a legal entity exercising rights
+under this License. For legal entities, "You" or "Your" includes any entity
+which controls, is controlled by, or is under common control with, You, where
+"control" means (a) the power, direct or indirect, to cause the direction or
+management of such entity, whether by contract or otherwise, or (b) ownership
+of fifty percent (50%) or more of the outstanding shares or beneficial
+ownership of such entity.
+
+2.0 Acceptance Of License. You are not required to accept this License since
+you have not signed it, however nothing else grants you permission to use,
+copy, distribute, modify, or create derivatives of either the Software or any
+Extensions created by a Contributor. These actions are prohibited by law if
+you do not accept this License. Therefore, by performing any of these actions
+You indicate Your acceptance of this License and Your agreement to be bound by
+all its terms and conditions. IF YOU DO NOT AGREE WITH ALL THE TERMS AND
+CONDITIONS OF THIS LICENSE DO NOT USE, MODIFY, CREATE DERIVATIVES, OR
+DISTRIBUTE THE SOFTWARE. IF IT IS IMPOSSIBLE FOR YOU TO COMPLY WITH ALL THE
+TERMS AND CONDITIONS OF THIS LICENSE THEN YOU CAN NOT USE, MODIFY, CREATE
+DERIVATIVES, OR DISTRIBUTE THE SOFTWARE.
+
+3.0 Grant of License From Licensor. Subject to the terms and conditions of
+this License, Licensor hereby grants You a world-wide, royalty-free, non-
+exclusive license, subject to Licensor's intellectual property rights, and any
+third party intellectual property claims derived from the Licensed Software
+under this License, to do the following:
+
+3.1 Use, reproduce, modify, display, perform, sublicense and distribute
+Licensed Software and Your Extensions in both Source Code form or as an
+executable program.
+
+3.2 Create Derivative Works (as that term is defined under U.S. copyright law)
+of Licensed Software by adding to or deleting from the substance or structure
+of said Licensed Software.
+
+3.3 Under claims of patents now or hereafter owned or controlled by Licensor,
+to make, use, have made, and/or otherwise dispose of Licensed Software or
+portions thereof, but solely to the extent that any such claim is necessary to
+enable You to make, use, have made, and/or otherwise dispose of Licensed
+Software or portions thereof.
+
+3.4 Licensor reserves the right to release new versions of the Software with
+different features, specifications, capabilities, functions, licensing terms,
+general availability or other characteristics. Title, ownership rights, and
+intellectual property rights in and to the Licensed Software shall remain in
+Licensor and/or its Contributors.
+
+4.0 Grant of License From Contributor. By application of the provisions in
+Section 6 below, each Contributor hereby grants You a world-wide, royalty-
+free, non-exclusive license, subject to said Contributor's intellectual
+property rights, and any third party intellectual property claims derived from
+the Licensed Software under this License, to do the following:
+
+4.1 Use, reproduce, modify, display, perform, sublicense and distribute any
+Extensions Deployed by such Contributor or portions thereof, in both Source
+Code form or as an executable program, either on an unmodified basis or as
+part of Derivative Works.
+
+4.2 Under claims of patents now or hereafter owned or controlled by
+Contributor, to make, use, have made, and/or otherwise dispose of Extensions
+or portions thereof, but solely to the extent that any such claim is necessary
+to enable You to make, use, have made, and/or otherwise dispose of
+Licensed Software or portions thereof.
+
+5.0 Exclusions From License Grant. Nothing in this License shall be deemed to
+grant any rights to trademarks, copyrights, patents, trade secrets or any
+other intellectual property of Licensor or any Contributor except as expressly
+stated herein. Except as expressly stated in Sections 3 and 4, no other patent
+rights, express or implied, are granted herein. Your Extensions may require
+additional patent licenses from Licensor or Contributors which each may grant
+in its sole discretion. No right is granted to the trademarks of Licensor or
+any Contributor even if such marks are included in the Licensed Software.
+Nothing in this License shall be interpreted to prohibit Licensor from
+licensing under different terms from this License any code that Licensor
+otherwise would have a right to license.
+
+5.1 You expressly acknowledge and agree that although Licensor and each
+Contributor grants the licenses to their respective portions of the Licensed
+Software set forth herein, no assurances are provided by Licensor or any
+Contributor that the Licensed Software does not infringe the patent or other
+intellectual property rights of any other entity. Licensor and each
+Contributor disclaim any liability to You for claims brought by any other
+entity based on infringement of intellectual property rights or otherwise. As
+a condition to exercising the rights and licenses granted hereunder, You
+hereby assume sole responsibility to secure any other intellectual property
+rights needed, if any. For example, if a third party patent license is
+required to allow You to distribute the Licensed Software, it is Your
+responsibility to acquire that license before distributing the Licensed
+Software.
+
+6.0 Your Obligations And Grants. In consideration of, and as an express
+condition to, the licenses granted to You under this License You hereby agree
+that any Modifications, Derivative Works, or Required Components (collectively
+Extensions) that You create or to which You contribute are governed by the
+terms of this License including, without limitation, Section 4. Any Extensions
+that You create or to which You contribute must be Deployed under the terms of
+this License or a future version of this License released under Section 7. You
+hereby grant to Licensor and all third parties a world-wide, non-exclusive,
+royalty-free license under those intellectual property rights You own or
+control to use, reproduce, display, perform, modify, create derivatives,
+sublicense, and distribute Licensed Software, in any form. Any Extensions You
+make and Deploy must have a distinct title so as to readily tell any
+subsequent user or Contributor that the Extensions are by You. You must
+include a copy of this License or directions on how to obtain a copy with
+every copy of the Extensions You distribute. You agree not to offer or impose
+any terms on any Source Code or executable version of the Licensed Software,
+or its Extensions that alter or restrict the applicable version of this
+License or the recipients' rights hereunder.
+
+6.1 Availability of Source Code. You must make available, under the terms of
+this License, the Source Code of any Extensions that You Deploy, via an
+Electronic Distribution Mechanism. The Source Code for any version that You
+Deploy must be made available within one (1) month of when you Deploy and must
+remain available for no less than twelve (12) months after the date You cease
+to Deploy. You are responsible for ensuring that the Source Code to each
+version You Deploy remains available even if the Electronic Distribution
+Mechanism is maintained by a third party. You may not charge a fee for any
+copy of the Source Code distributed under this Section in excess of Your
+actual cost of duplication and distribution of said copy.
+
+6.2 Description of Modifications. You must cause any Modifications that You
+create or to which You contribute to be documented in the Source Code, clearly
+describing the additions, changes or deletions You made. You must include a
+prominent statement that the Modifications are derived, directly or indirectly,
+from the Licensed Software and include the names of the Licensor and any
+Contributor to the Licensed Software in (i) the Source Code and (ii) in any
+notice displayed by the Licensed Software You distribute or in related
+documentation in which You describe the origin or ownership of the Licensed
+Software. You may not modify or delete any pre-existing copyright notices,
+change notices or License text in the Licensed Software without written
+permission of the respective Licensor or Contributor.
+
+6.3 Intellectual Property Matters.
+
+a. Third Party Claims. If You have knowledge that a license to a third party's
+intellectual property right is required to exercise the rights granted by this
+License, You must include a human-readable file with Your distribution that
+describes the claim and the party making the claim in sufficient detail that a
+recipient will know whom to contact.
+
+b. Contributor APIs. If Your Extensions include an application programming
+interface ("API") and You have knowledge of patent licenses that are
+reasonably necessary to implement that API, You must also include this
+information in a human-readable file supplied with Your distribution.
+
+c. Representations. You represent that, except as disclosed pursuant to 6.3(a)
+above, You believe that any Extensions You distribute are Your original
+creations and that You have sufficient rights to grant the rights conveyed by
+this License.
+
+6.4 Required Notices.
+
+a. License Text. You must duplicate this License or instructions on how to
+acquire a copy in any documentation You provide along with the Source Code of
+any Extensions You create or to which You contribute, wherever You describe
+recipients' rights relating to Licensed Software.
+
+b. License Notice. You must duplicate any notice contained in EXHIBIT A (the
+"License Notice") in each file of the Source Code of any copy You distribute
+of the Licensed Software and Your Extensions. If You create an Extension, You
+may add Your name as a Contributor to the Source Code and accompanying
+documentation along with a description of the contribution. If it is not
+possible to put the License Notice in a particular Source Code file due to its
+structure, then You must include such License Notice in a location where a
+user would be likely to look for such a notice.
+
+c. Source Code Availability. You must notify the software community of the
+availability of Source Code to Your Extensions within one (1) month of the date
+You initially Deploy and include in such notification a description of the
+Extensions, and instructions on how to acquire the Source Code. Should such
+instructions change you must notify the software community of revised
+instructions within one (1) month of the date of change. You must provide
+notification by posting to appropriate news groups, mailing lists, weblogs, or
+other sites where a publicly accessible search engine would reasonably be
+expected to index your post in relationship to queries regarding the Licensed
+Software and/or Your Extensions.
+
+d. User-Visible Attribution. You must duplicate any notice contained in
+EXHIBIT B (the "User-Visible Attribution Notice") in each user-visible display
+of the Licensed Software and Your Extensions which delineates copyright,
+ownership, or similar attribution information. If You create an Extension,
+You may add Your name as a Contributor, and add Your attribution notice, as an
+equally visible and functional element of any User-Visible Attribution Notice
+content. To ensure proper attribution, You must also include such User-Visible
+Attribution Notice in at least one location in the Software documentation
+where a user would be likely to look for such notice.
+
+6.5 Additional Terms. You may choose to offer, and charge a fee for, warranty,
+support, indemnity or liability obligations to one or more recipients of
+Licensed Software. However, You may do so only on Your own behalf, and not on
+behalf of the Licensor or any Contributor except as permitted under other
+agreements between you and Licensor or Contributor. You must make it clear that
+any such warranty, support, indemnity or liability obligation is offered by You
+alone, and You hereby agree to indemnify the Licensor and every Contributor for
+any liability plus attorney fees, costs, and related expenses due to any such
+action or claim incurred by the Licensor or such Contributor as a result of
+warranty, support, indemnity or liability terms You offer.
+
+6.6 Conflicts With Other Licenses. Where any portion of Your Extensions, by
+virtue of being Derivative Works of another product or similar circumstance,
+fall under the terms of another license, the terms of that license should be
+honored however You must also make Your Extensions available under this
+License. If the terms of this License continue to conflict with the terms of
+the other license you may write the Licensor for permission to resolve the
+conflict in a fashion that remains consistent with the intent of this License.
+Such permission will be granted at the sole discretion of the Licensor.
+
+7.0 Versions of This License. Licensor may publish from time to time revised
+versions of the License. Once Licensed Software has been published under a
+particular version of the License, You may always continue to use it under the
+terms of that version. You may also choose to use such Licensed Software under
+the terms of any subsequent version of the License published by Licensor. No
+one other than Licensor has the right to modify the terms applicable to
+Licensed Software created under this License.
+
+7.1 If You create or use a modified version of this License, which You may do
+only in order to apply it to software that is not already Licensed Software
+under this License, You must rename Your license so that it is not confusingly
+similar to this License, and must make it clear that Your license contains
+terms that differ from this License. In so naming Your license, You may not
+use any trademark of Licensor or of any Contributor. Should Your modifications
+to this License be limited to alteration of a) Section 13.8 solely to modify
+the legal Jurisdiction or Venue for disputes, b) EXHIBIT A solely to define
+License Notice text, or c) to EXHIBIT B solely to define a User-Visible
+Attribution Notice, You may continue to refer to Your License as the
+Reciprocal Public License or simply the RPL.
+
+8.0 Disclaimer of Warranty. LICENSED SOFTWARE IS PROVIDED UNDER THIS LICENSE
+ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE LICENSED SOFTWARE IS FREE
+OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+FURTHER THERE IS NO WARRANTY MADE AND ALL IMPLIED WARRANTIES ARE DISCLAIMED
+THAT THE LICENSED SOFTWARE MEETS OR COMPLIES WITH ANY DESCRIPTION OF
+PERFORMANCE OR OPERATION, SAID COMPATIBILITY AND SUITABILITY BEING YOUR
+RESPONSIBILITY. LICENSOR DISCLAIMS ANY WARRANTY, IMPLIED OR EXPRESSED, THAT
+ANY CONTRIBUTOR'S EXTENSIONS MEET ANY STANDARD OF COMPATIBILITY OR DESCRIPTION
+OF PERFORMANCE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LICENSED SOFTWARE IS WITH YOU. SHOULD LICENSED SOFTWARE PROVE DEFECTIVE IN ANY
+RESPECT, YOU (AND NOT THE LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST
+OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. UNDER THE TERMS OF THIS
+LICENSOR WILL NOT SUPPORT THIS SOFTWARE AND IS UNDER NO OBLIGATION TO ISSUE
+UPDATES TO THIS SOFTWARE. LICENSOR HAS NO KNOWLEDGE OF ERRANT CODE OR VIRUS IN
+THIS SOFTWARE, BUT DOES NOT WARRANT THAT THE SOFTWARE IS FREE FROM SUCH ERRORS
+OR VIRUSES. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+LICENSE. NO USE OF LICENSED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER.
+
+9.0 Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
+WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE
+LICENSOR, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED SOFTWARE, OR ANY
+SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
+WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
+EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH
+DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH
+OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
+EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10.0 High Risk Activities. THE LICENSED SOFTWARE IS NOT FAULT-TOLERANT AND IS
+NOT DESIGNED, MANUFACTURED, OR INTENDED FOR USE OR DISTRIBUTION AS ON-LINE
+CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE,
+SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR
+COMMUNICATIONS SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE SUPPORT MACHINES, OR
+WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE LICENSED SOFTWARE COULD LEAD
+DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE
+("HIGH RISK ACTIVITIES"). LICENSOR AND CONTRIBUTORS SPECIFICALLY DISCLAIM ANY
+EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
+
+11.0 Responsibility for Claims. As between Licensor and Contributors, each
+party is responsible for claims and damages arising, directly or indirectly,
+out of its utilization of rights under this License which specifically
+disclaims warranties and limits any liability of the Licensor. This paragraph
+is to be used in conjunction with and controlled by the Disclaimer Of
+Warranties of Section 8, the Limitation Of Damages in Section 9, and the
+disclaimer against use for High Risk Activities in Section 10. The Licensor
+has thereby disclaimed all warranties and limited any damages that it is or
+may be liable for. You agree to work with Licensor and Contributors to
+distribute such responsibility on an equitable basis consistent with the terms
+of this License including Sections 8, 9, and 10. Nothing herein is intended or
+shall be deemed to constitute any admission of liability.
+
+12.0 Termination. This License and all rights granted hereunder will terminate
+immediately in the event of the circumstances described in Section 13.6 or if
+applicable law prohibits or restricts You from fully and or specifically
+complying with Sections 3, 4 and/or 6, or prevents the enforceability of any
+of those Sections, and You must immediately discontinue any use of Licensed
+Software.
+
+12.1 Automatic Termination Upon Breach. This License and the rights granted
+hereunder will terminate automatically if You fail to comply with the terms
+herein and fail to cure such breach within thirty (30) days of becoming aware
+of the breach. All sublicenses to the Licensed Software that are properly
+granted shall survive any termination of this License. Provisions that, by
+their nature, must remain in effect beyond the termination of this License,
+shall survive.
+
+12.2 Termination Upon Assertion of Patent Infringement. If You initiate
+litigation by asserting a patent infringement claim (excluding declaratory
+judgment actions) against Licensor or a Contributor (Licensor or Contributor
+against whom You file such an action is referred to herein as "Respondent")
+alleging that Licensed Software directly or indirectly infringes any patent,
+then any and all rights granted by such Respondent to You under Sections 3 or
+4 of this License shall terminate prospectively upon sixty (60) days notice
+from Respondent (the "Notice Period") unless within that Notice Period You
+either agree in writing (i) to pay Respondent a mutually agreeable reasonably
+royalty for Your past or future use of Licensed Software made by such
+Respondent, or (ii) withdraw Your litigation claim with respect to Licensed
+Software against such Respondent. If within said Notice Period a reasonable
+royalty and payment arrangement are not mutually agreed upon in writing by the
+parties or the litigation claim is not withdrawn, the rights granted by
+Licensor to You under Sections 3 and 4 automatically terminate at the
+expiration of said Notice Period.
+
+12.3 Reasonable Value of This License. If You assert a patent infringement
+claim against Respondent alleging that Licensed Software directly or
+indirectly infringes any patent where such claim is resolved (such as by
+license or settlement) prior to the initiation of patent infringement
+litigation, then the reasonable value of the licenses granted by said
+Respondent under Sections 3 and 4 shall be taken into account in determining
+the amount or value of any payment or license.
+
+12.4 No Retroactive Effect of Termination. In the event of termination under
+this Section all end user license agreements (excluding licenses to
+distributors and resellers) that have been validly granted by You or any
+distributor hereunder prior to termination shall survive termination.
+
+13.0 Miscellaneous.
+
+13.1 U.S. Government End Users. The Licensed Software is a "commercial item,"
+as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
+"commercial computer software" and "commercial computer software
+documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
+Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+(June 1995), all U.S. Government End Users acquire Licensed Software with only
+those rights set forth herein.
+
+13.2 Relationship of Parties. This License will not be construed as creating
+an agency, partnership, joint venture, or any other form of legal association
+between or among You, Licensor, or any Contributor, and You will not represent
+to the contrary, whether expressly, by implication, appearance, or otherwise.
+
+13.3 Independent Development. Nothing in this License will impair Licensor's
+right to acquire, license, develop, subcontract, market, or distribute
+technology or products that perform the same or similar functions as, or
+otherwise compete with, Extensions that You may develop, produce, market, or
+distribute.
+
+13.4 Consent To Breach Not Waiver. Failure by Licensor or Contributor to
+enforce any provision of this License will not be deemed a waiver of future enforcement
+of that or any other provision.
+
+13.5 Severability. This License represents the complete agreement concerning
+the subject matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent necessary
+to make it enforceable.
+
+13.6 Inability to Comply Due to Statute or Regulation. If it is impossible for
+You to comply with any of the terms of this License with respect to some or
+all of the Licensed Software due to statute, judicial order, or regulation,
+then You cannot use, modify, or distribute the software.
+
+13.7 Export Restrictions. You may be restricted with respect to downloading or
+otherwise acquiring, exporting, or reexporting the Licensed Software or any
+underlying information or technology by United States and other applicable
+laws and regulations. By downloading or by otherwise obtaining the Licensed
+Software, You are agreeing to be responsible for compliance with all
+applicable laws and regulations.
+
+13.8 Arbitration, Jurisdiction & Venue. This License shall be governed by
+Colorado law provisions (except to the extent applicable law, if any, provides
+otherwise), excluding its conflict-of-law provisions. You expressly agree that
+any dispute relating to this License shall be submitted to binding arbitration
+under the rules then prevailing of the American Arbitration Association. You
+further agree that Adams County, Colorado USA is proper venue and grant such
+arbitration proceeding jurisdiction as may be appropriate for purposes of
+resolving any dispute under this License. Judgement upon any award made in
+arbitration may be entered and enforced in any court of competent
+jurisdiction. The arbitrator shall award attorney's fees and costs of
+arbitration to the prevailing party. Should either party find it necessary to
+enforce its arbitration award or seek specific performance of such award in a
+civil court of competent jurisdiction, the prevailing party shall be entitled
+to reasonable attorney's fees and costs. The application of the United Nations
+Convention on Contracts for the International Sale of Goods is expressly
+excluded. You and Licensor expressly waive any rights to a jury trial in any
+litigation concerning Licensed Software or this License. Any law or regulation
+that provides that the language of a contract shall be construed against the
+drafter shall not apply to this License.
+
+13.9 Entire Agreement. This License constitutes the entire agreement between
+the parties with respect to the subject matter hereof.
+
+EXHIBIT A
+
+The License Notice below must appear in each file of the Source Code of any
+copy You distribute of the Licensed Software or any Extensions thereto:
+
+ Unless explicitly acquired and licensed from Licensor under another
+ license, the contents of this file are subject to the Reciprocal Public
+ License ("RPL") Version 1.5, or subsequent versions as allowed by the RPL,
+ and You may not copy or use this file in either source code or executable
+ form, except in compliance with the terms and conditions of the RPL.
+
+ All software distributed under the RPL is provided strictly on an "AS
+ IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND
+ LICENSOR HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT
+ LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, QUIET ENJOYMENT, OR NON-INFRINGEMENT. See the RPL for specific
+ language governing rights and limitations under the RPL.
+
+
+
+EXHIBIT B
+
+The User-Visible Attribution Notice below, when provided, must appear in each
+user-visible display as defined in Section 6.4 (d):
+
+ Based on the works of by W. Mark Kubacki.
|
mark-kubacki/ossdl-overlay | e6ab3c5efebad074419c753a5c3dca9ba46c7d3f | net-im/prosody-0.9.7 | diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 43ed70c..a5d3fc8 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,5 +1,6 @@
-AUX prosody.initd 1211 SHA256 6fed1ff8b6861cd949e0566e3c6b30094d2a6e680b04745730f5d0c1f0cde289 SHA512 04cfc29f61f1d8ad1ac2a3686ab98af3a7fc3250e1e6145f2067a65c051f95c4ee3663eb3f346d7a9c453e8e88eed724858f7fc248ee6cb479ff7bd697541b0d WHIRLPOOL 99bacdeaf06bff433da449bf3c28d39523edc1b02877f4803f627a8fc5206f23bdfb645fd01f09a36b7363dbac2c974b418f069c6dc8a7ee7e52f0e25754cce4
+AUX prosody-0.9.2-cfg.lua.patch 2173 SHA256 6e0b9039a9066c87ba7bfa4cc8b19b7d5cb83f94294f35071d4ddf7edf5b99ae SHA512 73531ac9c3667fc8c95e572643de760c6da378f73824fb04e4d3d3e4bf0b12b56c6854a61b9340ddbca8ff8fea1bc49927928b7b07016d4aeadad4d52630f1b1 WHIRLPOOL 663ee8b82878714a73c3bb538df538b6b31e62414e49c2bcf7d7ac5b8593c047605c4ac6dd020445399998294a23748c7b79de93531dc2bbd529c0f784aea48a
+AUX prosody.initd-r2 1180 SHA256 36c240facd042457596ad1b6b2093225d63a27924390ffe6d37d89e2e523ff0a SHA512 afb6c7a43ea64cc1d05372c76ae9e3837a6d160d4625b3fe9c34df79461e06ecc5501379fe39824dc6227b31a22e0416494f1e1851c7bbc4f76a8bf5a87f2d2a WHIRLPOOL 601fac8909931f9335eaf624fd79cbb44fedcd98bb58c4be2b8af0e01f09befd566dcbc0b411a32a52bd8288e3d1d1bd67f580b64deda319ec4dfc96ff240283
AUX prosody.service 237 SHA256 ad776a978a6f3b7f1b4075637f7d0ec1eb2e25fbc4245a2a8e13357e2e1bd960 SHA512 2802d8802f5c9bac780752e6fbd54f6b4227b425a9be1f5af1c068f60f5dec180d6d4d926dadaae95df8877fa7db97eca0d8f1786009f5e24e8ae2edf0ddabaf WHIRLPOOL b6dd33c626c65918e590f4a245eed46691ad3468afae8b7508ca5e019d0850678a10b7adbbc093cb84d40121f912d9a195c29fe36a7c4aeb81d5a3c8abce35de
AUX prosody.tmpfilesd 38 SHA256 58af4b6cd2555f26ee6dd7abe9452933d46dc0f8aa1491fd170499c40da017a5 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc WHIRLPOOL c097006046add8f8e29960e70f81e8bbe54521aaa35f885d8bb915467b1ffc95ecfe893562e3a0e37c327cce4d47ca12ff8c8bf3cdea9df65dd640b578edb006
-DIST prosody-0.9.2.tar.gz 264196 SHA256 a2df64d23b7853a9f03126750d33b98193c93b8331b2622d9ebf1fe54f8feb2d SHA512 05d6af08a51d2c347344d6f08e0d582bb7710129c3c7dd5576906bc5a5d7b9631ced390d1b4cca6a6723153d185a8a560f45be2c9af11fe6e974b83f1403953a WHIRLPOOL 05e796ff61449b6942077d5cef35bb7bbd8128b5cc498e85f7ea8e5475058d71fc4c7739482966ded8956873a5fb890ce65eaf367089565a5edbab7760d40f99
-EBUILD prosody-0.9.2.ebuild 2166 SHA256 1485ba00dc83000e96ee71021edb47bc50413df91e61163305188c5260e2933f SHA512 297eca67d087c00ed416dbe99fc7cbe310a58f430751206dc779187ba778a299258b170bc925eb90cac1ef867bab386d0f37883c81611d44911c9920d44b89b1 WHIRLPOOL 3e0429ebafd0b30f98ef6957695cd2fabaa8ab778028489dcf2b3bccc15ebfd48ab806ce140f48f5ab8dc820bc9a2f7da1bd9977f1e6891e94357973a61f5f72
+DIST prosody-0.9.7.tar.gz 266638 SHA256 dd4b99b39976442055898c933c013598e558beed11d7795d76ffc0f1a87e2e00 SHA512 fc1f0855e7af2132058af493bb9af20f9f1aa3051e6d8550ba9942264d85dc6840085b17e2a0226d4015745407f445c691455d998c4a43a3a9aa2d036a01ce9e WHIRLPOOL 5de40437be364856acbcaa2553aa54119bd46ed0afda9127211ff65ad9b4acea8b7a447452c7555ecfb9a58266cca319ecc2eb2a4959cb4e2390dc99dcf20b82
+EBUILD prosody-0.9.7.ebuild 2389 SHA256 51b377aa1cbb0dab35e860200b65c21ce416caf0499f028fe554fe39a27dcb88 SHA512 0beee861f96f3f9311999889c4a4703a631883f04e7cb3c20aba5112e40d49c7812e03720010a7738bc108443578c1eb6e117c4396328328abdd488369360b34 WHIRLPOOL afcc2777b9dab8fc7d12aa0a108ca311bfefa2ffccecdad0882cbb95537dbc87b8b2929e2009c3c172f0294ad941351284d60078799c8e748b2f3cc85e1d062d
diff --git a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
new file mode 100644
index 0000000..15c09a2
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
@@ -0,0 +1,52 @@
+diff -ru prosody-0.9.2/prosody.cfg.lua.dist prosody-0.9.2-gentoo/prosody.cfg.lua.dist
+--- prosody-0.9.2/prosody.cfg.lua.dist 2013-12-08 19:05:39.000000000 +0100
++++ prosody-0.9.2-gentoo/prosody.cfg.lua.dist 2014-01-27 03:00:44.929196948 +0100
+@@ -1,5 +1,3 @@
+--- Prosody Example Configuration File
+---
+ -- Information on configuring Prosody can be found on our
+ -- website at http://prosody.im/doc/configure
+ --
+@@ -7,9 +5,6 @@
+ -- when you have finished by running: luac -p prosody.cfg.lua
+ -- If there are any errors, it will let you know what and where
+ -- they are, otherwise it will keep quiet.
+---
+--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+--- blanks. Good luck, and happy Jabbering!
+
+
+ ---------- Server-wide settings ----------
+@@ -63,7 +58,7 @@
+ --"http_files"; -- Serve static files from a directory over HTTP
+
+ -- Other specific functionality
+- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. (Keep enabled for Gentoo.)
+ --"groups"; -- Shared roster support
+ --"announce"; -- Send announcement to all online users
+ --"welcome"; -- Welcome users who register accounts
+@@ -72,6 +67,12 @@
+ --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+ };
+
++-- Settings for Gentoo init script and net-im/jabber-base permissions system:
++daemonize = true;
++prosody_user = "jabber";
++prosody_group = "jabber";
++pidfile = "/var/run/jabber/prosody.pid";
++
+ -- These modules are auto-loaded, but should you want
+ -- to disable them then uncomment them here:
+ modules_disabled = {
+@@ -139,8 +140,8 @@
+ -- Logging configuration
+ -- For advanced logging see http://prosody.im/doc/logging
+ log = {
+- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+- error = "prosody.err";
++ info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++ error = "/var/log/jabber/prosody.err";
+ -- "*syslog"; -- Uncomment this for logging to syslog
+ -- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
diff --git a/net-im/prosody/files/prosody.initd b/net-im/prosody/files/prosody.initd-r2
similarity index 61%
rename from net-im/prosody/files/prosody.initd
rename to net-im/prosody/files/prosody.initd-r2
index 16bd231..2f487ec 100644
--- a/net-im/prosody/files/prosody.initd
+++ b/net-im/prosody/files/prosody.initd-r2
@@ -1,47 +1,47 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd,v 1.2 2012/11/27 09:20:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd-r2,v 1.1 2014/10/15 08:07:58 klausman Exp $
description="Prosody is a server for Jabber/XMPP written in Lua."
description_reload="Reload configuration and reopen log files."
extra_started_commands="reload"
-
-PIDFILE="/var/run/jabber/prosody.pid"
-USER="jabber"
-COMMAND="/usr/bin/prosody"
+pidfile="/var/run/jabber/prosody.pid"
depend() {
use dns
need net
provide jabber-server
}
checkconfig() {
if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
return 1
fi
+ luac -p /etc/jabber/prosody.cfg.lua
+ return $?
}
start() {
checkconfig || return 1
- checkpath -q -d -m 0770 -o jabber:jabber /var/run/jabber
+ checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
+ checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
+ checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
ebegin "Starting Prosody XMPP Server"
- start-stop-daemon --start -b --pidfile ${PIDFILE} \
- --make-pidfile --user ${USER} --exec ${COMMAND}
+ prosodyctl start
eend $?
}
stop() {
ebegin "Stopping Prosody XMPP Server"
- start-stop-daemon --stop --pidfile ${PIDFILE} \
- --user ${USER} --exec ${COMMAND}
+ prosodyctl stop
eend $?
}
reload() {
+ checkconfig || return 1
ebegin "Reloading configuration of Prosody XMPP Server"
- start-stop-daemon --pidfile ${PIDFILE} --signal HUP
+ prosodyctl reload
eend $?
}
diff --git a/net-im/prosody/prosody-0.9.2.ebuild b/net-im/prosody/prosody-0.9.7.ebuild
similarity index 74%
rename from net-im/prosody/prosody-0.9.2.ebuild
rename to net-im/prosody/prosody-0.9.7.ebuild
index c29b0a9..6aeb0df 100644
--- a/net-im/prosody/prosody-0.9.2.ebuild
+++ b/net-im/prosody/prosody-0.9.7.ebuild
@@ -1,76 +1,82 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-inherit flag-o-matic multilib versionator toolchain-funcs
+inherit flag-o-matic multilib systemd versionator
MY_PV=$(replace_version_separator 3 '')
MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
HOMEPAGE="http://prosody.im/"
SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib"
+KEYWORDS="amd64 ~arm x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
DEPEND="net-im/jabber-base
- >=dev-lang/lua-5.1
+ !jit? ( >=dev-lang/lua-5.1 )
+ jit? ( dev-lang/luajit )
>=net-dns/libidn-1.1
- >=dev-libs/openssl-1.0.1"
+ >=dev-libs/openssl-0.9.8"
RDEPEND="${DEPEND}
- dev-lua/luaexpat
+ >=dev-lua/luaexpat-1.3.0
dev-lua/luafilesystem
ipv6? ( >=dev-lua/luasocket-3 )
!ipv6? ( dev-lua/luasocket )
libevent? ( >=dev-lua/luaevent-0.4.3 )
mysql? ( dev-lua/luadbi[mysql] )
postgres? ( dev-lua/luadbi[postgres] )
sqlite? ( dev-lua/luadbi[sqlite] )
ssl? ( >=dev-lua/luasec-0.5.1 )
zlib? ( dev-lua/lua-zlib )"
S=${WORKDIR}/${MY_P}
JABBER_ETC="/etc/jabber"
JABBER_SPOOL="/var/spool/jabber"
src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
Makefile || die
}
src_configure() {
# the configure script is handcrafted (and yells at unknown options)
# hence do not use 'econf'
append-cflags -D_GNU_SOURCE
+ luajit=""
+ if use jit; then
+ luajit="--runwith=luajit"
+ fi
./configure \
- --ostype=linux \
+ --ostype=linux $luajit \
--prefix="/usr" \
--sysconfdir="${JABBER_ETC}" \
--datadir="${JABBER_SPOOL}" \
--with-lua-include=/usr/include \
--with-lua-lib=/usr/$(get_libdir)/lua \
--cflags="${CFLAGS} -Wall -fPIC" \
--ldflags="${LDFLAGS} -shared" \
--c-compiler="$(tc-getCC)" \
--linker="$(tc-getCC)" \
- --no-example-certs \
--require-config || die "configure failed"
}
src_install() {
emake DESTDIR="${D}" install
- newinitd "${FILESDIR}/${PN}".initd ${PN}
+ systemd_dounit "${FILESDIR}/${PN}".service
+ systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+ newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
}
src_test() {
cd tests || die
./run_tests.sh || die
}
|
mark-kubacki/ossdl-overlay | fa3cdcd7dac4942f0ac0a1773d945ec2892927a7 | dev-db/monetdb-11.19.9 | diff --git a/dev-db/monetdb/Manifest b/dev-db/monetdb/Manifest
index 5224b1d..9e9eccf 100644
--- a/dev-db/monetdb/Manifest
+++ b/dev-db/monetdb/Manifest
@@ -1,6 +1,4 @@
AUX monetdb.conf-11.5.9 307 SHA256 d07fd9429c72029d314e0972d601d1a132a408ac52134e7e13a1e254ac6d1baa SHA512 72f928f00cf86c126ab73ab86324cc074feed8aee58448d5f94affcd8e1409d40c84ea31d75732553726cbc6d7e68d20e0091546f6611f5e2bbe3fdd74d73f60 WHIRLPOOL 85cfa0e93cabd187af5d71824d99dcdd651e6518401a4183cb566e8495350e036e20f286380f31ae0af07def47a53a5b2db81d03a493ce67293307f30f552424
AUX monetdb.init-11.5.9 568 SHA256 497ac1b840cc54d26ad01707abc88049741ec18cfee6f544f1d590b107937331 SHA512 1fca8b9440dbc5fb338403d0f61a98ecacd8b5a1df9ee22c047cdf0856f21aee4ad3a24edf99b85c2e4c6fe53e29c859b0c3f1128676eda7f15457967793b089 WHIRLPOOL b587c27a9837e1eecc922159612e2c9772a15da73df9dbb8b744c0e4151109477e565281c71bd72d5c1c7a4344f839cd0256fa9ec582278e1066c5740a03b92d
-DIST MonetDB-11.15.19.tar.xz 47599664 SHA256 ae00578411f638c1fbe042a22f2fd28bba4425cde27180da76be68af98378213 SHA512 0a3261bc6af8748be31cfe37459ef03282fb4593a21ecc80b0955bf813bfec332c00943f9c4b7c9a3f9cbae06d9cbe0480d6d4a1da6883447415beda50cb8a80 WHIRLPOOL 257c54fe3db4584e19de5b0a5871d68720fab29f224f4c8796d2834f1d6ee8ce42cf3530effda0413e7f427482cab818d373a1e9f33d21102663eb8fa72d3b0d
-DIST MonetDB-11.17.13.tar.xz 47535720 SHA256 17227d24ccaf5aee7582cfa5a2a0d563e3d78b7d5001f6c36ff2ca8322ea0731 SHA512 b9c70de1883dfbab1c7b4898f2a6a2f25063758bee860e0f210a655e65b3f27421a392ac48836132e09510ed3feae6874241f53ec7c049a76446bf4f1b3f15bb WHIRLPOOL 7d5d530f2daee0bc0c0410edf9bbbeab06c9e9df5112f4a5f608db75e9a0b222a894c9f5c0b363c6cd47ea59be8655dcea8033c998b1cfb768db9ac4296aa3e9
-EBUILD monetdb-11.15.19.ebuild 4760 SHA256 df25c54c4b5aee85e0f7099a84e804dee5759cb82ba5d1b6dfc92f1c6f6fa3c5 SHA512 01d7a0619cab3e21cfd5d5347b2e65f7df5a67ba04802bb97d091397ca6ef274f6dc301d628db69552eb697e3ca2d75c221f854a594c6acb8c8eb8deb5224193 WHIRLPOOL 4c69008b6a44d489ad965ce7e4c1792cd0be69a83e1a1106ecf1603d0a99edd1b6f26d3e78fe3032a5489d349a9f8b054b7912a5c7fa2b44d8145be2896badf4
-EBUILD monetdb-11.17.13.ebuild 4760 SHA256 8ea3be5046bb06a5f1aa1bff313e0b92eb9e1b377e356b4b3216822c89899b24 SHA512 382dae2dbcc7493b5572d3a29467ab0a8512a2becf858e36166be89b6fc06f24b4ba80ddf32b8c58a1654bcbce6185440a959162583c2b7fbc2ceabcee4acf07 WHIRLPOOL 3ea6a8f1f646e01fef2562ede8d23d95ad2dca0cfdfb4d258b567bfb4588e633ec4f34d658fe2d332d0cb7e273c69fbfba2864ead66b1d14fdb903e4a9ec621d
+DIST MonetDB-11.19.9.tar.xz 47268884 SHA256 86b8a836ab934786b514290109756b729c88ac7c2fa3e4f7c29498f9ba419ae9 SHA512 d6dd203f23c2ea32f5ee5be2a3ff36fadf94b7cd4ec707d378275406bc4da091f3bbcbcc92d3ae60f0eb3d8a9a0f104b4ce991a30a37a28767dd0c9569ac0f32 WHIRLPOOL 2f83e363cf7c1b37afd1ba0d7d289a686cab0f86c800ab6b815be4fc536a08b95be6d17476e837a2037bbc0e26af4f2dec2c4368d8dee2629aa1ff84a7cc82e1
+EBUILD monetdb-11.19.9.ebuild 4763 SHA256 09ac00ad28cfe02858e59ee283c10e7fd47db59b21b76ce41a4c3beb992e5737 SHA512 e5c8d198b2b8c4121d1dff2c3f7d9e44358acd301c88816b164f16e869e74a352261e79e937f4f5005649e9b23e2c309532aa9624085f95264015e88aa861671 WHIRLPOOL 05dea0b975f98fa54ae26db27727aa8750622ee0de05cc3972e158fe5519078b36bb93cbde264927283ba545f348e449762f23352336cf03d5ea9c1fdfb4eec1
diff --git a/dev-db/monetdb/monetdb-11.17.13.ebuild b/dev-db/monetdb/monetdb-11.17.13.ebuild
deleted file mode 100644
index 40d07f0..0000000
--- a/dev-db/monetdb/monetdb-11.17.13.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2009-2014 W-Mark Kubacki
-# Distributed under the terms of the OSI Reciprocal Public License
-
-EAPI="4"
-
-inherit eutils flag-o-matic user
-
-MY_PN="MonetDB"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A column-store based (R)DBMS."
-HOMEPAGE="https://www.monetdb.org/"
-SRC_URI="https://dev.monetdb.org/downloads/sources/Jan2014-SP1/${MY_P}.tar.xz"
-RESTRICT="primaryuri"
-
-LICENSE="MonetDBPL-1.1"
-SLOT="5"
-KEYWORDS="amd64 x86 ~arm"
-IUSE="debug -rdf datacell fits +sql -console -odbc -static curl iconv -java bzip2 zlib perl -ruby sphinx geom hwcounter"
-
-RDEPEND=">=dev-libs/libpcre-4.5
- >=dev-libs/openssl-0.9.8
- rdf? ( =media-libs/raptor-1* )
- console? ( sys-libs/readline )
- odbc? ( dev-db/unixODBC )
- curl? ( net-misc/curl )
- iconv? ( virtual/libiconv )
- bzip2? ( || ( app-arch/bzip2 app-arch/pbzip2 ) )
- zlib? ( sys-libs/zlib )
- java? ( >=virtual/jdk-1.4 dev-java/ant )
- perl? ( >=dev-lang/perl-5.8.0 )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
- sphinx? ( app-misc/sphinx )
- geom? ( >=sci-libs/geos-2.2.0 )
- fits? ( sci-libs/cfitsio )
- !dev-db/monetdb-common"
-DEPEND="app-arch/xz-utils
- mail-filter/procmail
- ${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup monetdb 61 || die "problem adding 'monetdb' group"
- enewuser monetdb 61 -1 /dev/null monetdb || die "problem adding 'monetdb' user"
-}
-
-src_configure() {
- local myconf=
- if use debug; then
- myconf+=" --enable-strict --enable-assert --disable-optimize --enable-debug --enable-assert"
- else
- myconf+=" --disable-strict --disable-debug --disable-testing --disable-assert"
- if ! has "-O6" ${CFLAGS}; then
- myconf+=" --enable-optimize"
- filter-flags "-Os" "-O" "-O[012345]"
- fi
- fi
-
- if use console; then
- einfo "The console is a direct client hooked onto the kernel with full"
- einfo "administrative privileges, bypassing any security checks. It is"
- einfo "handy only during development."
- fi
-
- if ! use java; then
- einfo "RIPEMD160 has been selected for the password-backend."
- einfo "It is not compatible to JDBC."
- myconf+=" --with-password-backend=RIPEMD160"
- fi
-
- # MonetDB doesn't recognize all of these options, yet.
- # They are enabled on a 'library exists' basis - which is ugly.
- # Nevertheless I include the options here so that users
- # can send complaints to the MonetDB makers. ;-)
- econf $(use_enable sql monetdb5) \
- $(use_enable rdf) \
- $(use_enable datacell) \
- $(use_enable sql) \
- $(use_enable geom) \
- $(use_enable odbc) \
- $(use_enable console) \
- $(use_enable java jdbc) \
- $(use_enable static) \
- $(use_enable fits) \
- $(use_with curl) \
- $(use_with iconv) \
- $(use_with bzip2 bz2) \
- $(use_with zlib z) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with java ant) \
- $(use_with java) \
- $(use_with sphinx sphinxclient) \
- $(use_with geom geos) \
- $(use_with hwcounter) \
- --without-python \
- --with-logdir=/var/log/monetdb --with-rundir=/var/run/monetdb \
- ${myconf} || die "econf"
- einfo "Some options might've not been recognized. That's okay."
- einfo "Notify <[email protected]> about them."
-}
-
-src_compile() {
- emake || die "emake"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install"
-
- newinitd "${FILESDIR}"/monetdb.init-11.5.9 monetdb || die "init.d script"
- newconfd "${FILESDIR}"/monetdb.conf-11.5.9 monetdb || die "conf.d file"
-
- # set proper ACL
- chown -R monetdb:monetdb "${D}"/var/lib/monetdb5
- chmod -R 0750 "${D}"/var/lib/monetdb5
- keepdir /var/lib/monetdb5/dbfarm
-
- # directory-moves to match FHS-2.3
- chown -R monetdb:root "${D}"/var/run/monetdb
- chmod -R 0755 "${D}"/var/run/monetdb
- keepdir /var/run/monetdb
- chown -R monetdb:monetdb "${D}"/var/log/monetdb
- chmod -R 0750 "${D}"/var/log/monetdb
- keepdir /var/log/monetdb
-
- # remove parts which we didn't ask for
- if ! use ruby; then
- test -d "${D}"/usr/lib/ruby && rm -r "${D}"/usr/lib/ruby
- test -d "${D}"/usr/lib64/ruby && rm -r "${D}"/usr/lib64/ruby
- fi
- rm -r "${D}"/usr/lib*/python*
-}
-
-pkg_postinst() {
- einfo "The init script refers to a database-farm stored under"
- einfo " /var/lib/monetdb5/dbfarm"
- einfo "A /etc/monetdb*.conf file no longer exists. Configuration"
- einfo "happens by .merovingian_properties files inside the dbfarm(s)"
- einfo "using the commands:"
- einfo " # monetdbd set property=... [dbfarm]"
- einfo ""
- einfo "The init script starts the aforementioned db-farm as user 'monetdb'."
- einfo "Your first steps could be:"
- einfo " # sudo -u monetdb monetdb create test"
- einfo " # sudo -u monetdb monetdb release test"
- einfo " # mclient -u monetdb -d test"
- einfo " sql> ALTER USER SET PASSWORD 'other_password' USING OLD PASSWORD 'monetdb';"
- einfo " sql> \q"
- einfo ""
- einfo "Feb 2013 and newer: --dbname and --dbfarm options have been replaced"
- einfo " by the single --dbpath option"
-}
diff --git a/dev-db/monetdb/monetdb-11.15.19.ebuild b/dev-db/monetdb/monetdb-11.19.9.ebuild
similarity index 97%
rename from dev-db/monetdb/monetdb-11.15.19.ebuild
rename to dev-db/monetdb/monetdb-11.19.9.ebuild
index 914bd45..09c2235 100644
--- a/dev-db/monetdb/monetdb-11.15.19.ebuild
+++ b/dev-db/monetdb/monetdb-11.19.9.ebuild
@@ -1,153 +1,153 @@
-# Copyright 2009-2014 W-Mark Kubacki
+# Copyright 2009-2015 W.âMark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="4"
inherit eutils flag-o-matic user
MY_PN="MonetDB"
MY_P=${MY_PN}-${PV}
DESCRIPTION="A column-store based (R)DBMS."
HOMEPAGE="https://www.monetdb.org/"
-SRC_URI="https://dev.monetdb.org/downloads/sources/Feb2013-SP6/${MY_P}.tar.xz"
+SRC_URI="https://www.monetdb.org/downloads/sources/Oct2014-SP2/${MY_P}.tar.xz"
RESTRICT="primaryuri"
LICENSE="MonetDBPL-1.1"
SLOT="5"
KEYWORDS="amd64 x86 ~arm"
IUSE="debug -rdf datacell fits +sql -console -odbc -static curl iconv -java bzip2 zlib perl -ruby sphinx geom hwcounter"
RDEPEND=">=dev-libs/libpcre-4.5
- >=dev-libs/openssl-0.9.8
+ >=dev-libs/openssl-1.0.1
rdf? ( =media-libs/raptor-1* )
console? ( sys-libs/readline )
odbc? ( dev-db/unixODBC )
curl? ( net-misc/curl )
iconv? ( virtual/libiconv )
bzip2? ( || ( app-arch/bzip2 app-arch/pbzip2 ) )
zlib? ( sys-libs/zlib )
java? ( >=virtual/jdk-1.4 dev-java/ant )
perl? ( >=dev-lang/perl-5.8.0 )
ruby? ( dev-lang/ruby dev-ruby/rubygems )
sphinx? ( app-misc/sphinx )
geom? ( >=sci-libs/geos-2.2.0 )
fits? ( sci-libs/cfitsio )
!dev-db/monetdb-common"
DEPEND="app-arch/xz-utils
mail-filter/procmail
${RDEPEND}"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup monetdb 61 || die "problem adding 'monetdb' group"
enewuser monetdb 61 -1 /dev/null monetdb || die "problem adding 'monetdb' user"
}
src_configure() {
local myconf=
if use debug; then
myconf+=" --enable-strict --enable-assert --disable-optimize --enable-debug --enable-assert"
else
myconf+=" --disable-strict --disable-debug --disable-testing --disable-assert"
if ! has "-O6" ${CFLAGS}; then
myconf+=" --enable-optimize"
filter-flags "-Os" "-O" "-O[012345]"
fi
fi
if use console; then
einfo "The console is a direct client hooked onto the kernel with full"
einfo "administrative privileges, bypassing any security checks. It is"
einfo "handy only during development."
fi
if ! use java; then
einfo "RIPEMD160 has been selected for the password-backend."
einfo "It is not compatible to JDBC."
myconf+=" --with-password-backend=RIPEMD160"
fi
# MonetDB doesn't recognize all of these options, yet.
# They are enabled on a 'library exists' basis - which is ugly.
# Nevertheless I include the options here so that users
# can send complaints to the MonetDB makers. ;-)
econf $(use_enable sql monetdb5) \
$(use_enable rdf) \
$(use_enable datacell) \
$(use_enable sql) \
$(use_enable geom) \
$(use_enable odbc) \
$(use_enable console) \
$(use_enable java jdbc) \
$(use_enable static) \
$(use_enable fits) \
$(use_with curl) \
$(use_with iconv) \
$(use_with bzip2 bz2) \
$(use_with zlib z) \
$(use_with perl) \
$(use_with ruby) \
$(use_with java ant) \
$(use_with java) \
$(use_with sphinx sphinxclient) \
$(use_with geom geos) \
$(use_with hwcounter) \
--without-python \
--with-logdir=/var/log/monetdb --with-rundir=/var/run/monetdb \
${myconf} || die "econf"
einfo "Some options might've not been recognized. That's okay."
einfo "Notify <[email protected]> about them."
}
src_compile() {
emake || die "emake"
}
src_install() {
emake DESTDIR="${D}" install || die "install"
newinitd "${FILESDIR}"/monetdb.init-11.5.9 monetdb || die "init.d script"
newconfd "${FILESDIR}"/monetdb.conf-11.5.9 monetdb || die "conf.d file"
# set proper ACL
chown -R monetdb:monetdb "${D}"/var/lib/monetdb5
chmod -R 0750 "${D}"/var/lib/monetdb5
keepdir /var/lib/monetdb5/dbfarm
# directory-moves to match FHS-2.3
chown -R monetdb:root "${D}"/var/run/monetdb
chmod -R 0755 "${D}"/var/run/monetdb
keepdir /var/run/monetdb
chown -R monetdb:monetdb "${D}"/var/log/monetdb
chmod -R 0750 "${D}"/var/log/monetdb
keepdir /var/log/monetdb
# remove parts which we didn't ask for
if ! use ruby; then
test -d "${D}"/usr/lib/ruby && rm -r "${D}"/usr/lib/ruby
test -d "${D}"/usr/lib64/ruby && rm -r "${D}"/usr/lib64/ruby
fi
rm -r "${D}"/usr/lib*/python*
}
pkg_postinst() {
einfo "The init script refers to a database-farm stored under"
einfo " /var/lib/monetdb5/dbfarm"
einfo "A /etc/monetdb*.conf file no longer exists. Configuration"
einfo "happens by .merovingian_properties files inside the dbfarm(s)"
einfo "using the commands:"
einfo " # monetdbd set property=... [dbfarm]"
einfo ""
einfo "The init script starts the aforementioned db-farm as user 'monetdb'."
einfo "Your first steps could be:"
einfo " # sudo -u monetdb monetdb create test"
einfo " # sudo -u monetdb monetdb release test"
einfo " # mclient -u monetdb -d test"
einfo " sql> ALTER USER SET PASSWORD 'other_password' USING OLD PASSWORD 'monetdb';"
einfo " sql> \q"
einfo ""
einfo "Feb 2013 and newer: --dbname and --dbfarm options have been replaced"
einfo " by the single --dbpath option"
}
|
mark-kubacki/ossdl-overlay | c6dfd48a6c438d62f0e841e88d1d6586b598f899 | app-arch/plzip-1.3: semi-static version suitable for stage1 | diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index f30b19d..ecde2c0 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,2 +1,2 @@
-DIST plzip-1.1.tar.gz 71881 SHA256 77d935fc83ffe6a3e689edd67441291a94dbfc468653eba33524909ef5c71f63 SHA512 8a4c9de51edc085c6142cd507c3f29b35c7604d7663a299dfc2d5d22d8ef5020295823eaa6c19ed11c861b6fa79e7f687f048419f4c5206ccd2b6d9390bd3438 WHIRLPOOL 6a94a873f376cd9433b695127f922931e50fc238022950bdedf93d67bb946839ac36de60766eb658768dd39fb262be6a743d545cc5777f679b67cb2f38456a8b
-EBUILD plzip-1.1.ebuild 654 SHA256 2338b7e25123411d58174a551008e53afb5349b8afe3312f14f825bad2fb2d17 SHA512 cb881ddcacf0a140dedfc7b3292431c7efa729577b013f50b01600e6ca4a6e1fa8fc821a738d8ce5596475e6175a9bccfabe4c2e63e7659c711eb07040078025 WHIRLPOOL 51b5936c41b4f2955c2f9e31ae47c7a3d1d2ddab27dc1b5ba19ee8bb807f3b53e8a2f6690343bf0b8a1e42a584286166c5732267b4636989f65dc6ff952509a5
+DIST plzip-1.3.tar.gz 60027 SHA256 45f631ae849cb1372317432478c815725ba00ae67fd7df9fb97df994720234a7 SHA512 7f32978b1c68d546df8c2a60f0dec3594981f08710216ec79d6cbe6fbc4163c5ab54781165689fd30b512159fc02a00a62d588b13166b53ccf94a544f1586173 WHIRLPOOL e943978d600f4eac00c390cdf2168b1cc97a0e888c4be3f1f76814edbbca81c5d1ff2792249d923dd4c4d2f20f7f79dff3b436e78a6f10827583a572b94e428a
+EBUILD plzip-1.3.ebuild 661 SHA256 1600455b978e792b5b3b8df12b9bd14d825b975bfa90f04f043379636fa2e249 SHA512 ca85ea30d2bd7f9d7056484b9ac654a4d30251244b3383f0e46b3eddf62d529bdcf65c5c92a9882f54eaf6d423e1c83655bd45082c883ae31cf2f134699726dc WHIRLPOOL 4eaaeecf58a29d07d08df05a24e31efe662d24221cfe6d0c30c6004b753f7d27c9da876d47c0969a04e0922ea37d62c630e1bad56748e752bee648ac825bb83e
diff --git a/app-arch/plzip/plzip-1.1.ebuild b/app-arch/plzip/plzip-1.3.ebuild
similarity index 85%
rename from app-arch/plzip/plzip-1.1.ebuild
rename to app-arch/plzip/plzip-1.3.ebuild
index bc54de2..43d3b1e 100644
--- a/app-arch/plzip/plzip-1.1.ebuild
+++ b/app-arch/plzip/plzip-1.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 2013 W-Mark Kubacki
+# Copyright 2013-2015 W.âMark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="4"
inherit toolchain-funcs
DESCRIPTION="parallel lossless data compressor based on the lzlib compression library"
HOMEPAGE="http://lzip.nongnu.org/plzip.html"
SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
DEPEND="dev-libs/lzlib"
src_configure() {
# not autotools-based
./configure \
--prefix="${EPREFIX}"/usr \
CXX="$(tc-getCXX)" \
CPPFLAGS="${CPPFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" || die
}
diff --git a/dev-libs/lzlib/Manifest b/dev-libs/lzlib/Manifest
index 9270594..a1c3355 100644
--- a/dev-libs/lzlib/Manifest
+++ b/dev-libs/lzlib/Manifest
@@ -1,2 +1,2 @@
-DIST lzlib-1.5.tar.gz 105488 SHA256 dde4812c40c210e1fd0c9ba54208a5120cc0030c01d12ff85d32deb4a0ba07c8 SHA512 d350690457ed41c8d850fa8181bc73a9dffc35a70afece70958ef7cfff2a4846b7ca8ecb8a7dfce2ca8bcb5ae04d2c5bb3f17c15114421d6dda197dd53e10dac WHIRLPOOL 122bde8ea15952f828c52095b8d61b1ddf79373e043d2b81aa1cd10770e3a670204c2782dc704b441051c8e5d8ebf0f2eddaed407700ff6c432dc6a57f5f20bf
-EBUILD lzlib-1.5.ebuild 671 SHA256 d9fd8748453e3414c000d4b5b265a588a0d5b8e0a882762c5903c4d7582f6f26 SHA512 5139d3738857396f65aef59dd36d764b46f0f8150d97daa6538c80b49deb33e71865b96a321eb590fc3e8d0971c3f7a15eaf69211809964ec0cb15d3c7800fa9 WHIRLPOOL 6ecae2acf641222295984174b16858114ff611025841cc5e27f17be45a432e7542b8aeb1d979692d296341ac7a1371771430d34b3b08f3210e50a82d128266eb
+DIST lzlib-1.6.tar.gz 91734 SHA256 c187ef5ffa9ffb01abaec667dda4d8c8b378291c68ad094c63bd75ee049e4780 SHA512 b4ebf3ad0c634593b7162479d43497b2daa1c47b979695988ed278e828fc6f6eac721b9eae238f50b7ee543f8c163fc4b51c6dcd575c37aa59aff8ca3cf903a2 WHIRLPOOL da2b6e1755c7697e3f8c7dbd82c4fc51b3503234498bfa9b860a144e8a53345e40fcd0062ad152742b247c3b03ccfb9d66046dc2372503333f30a2692efaa18d
+EBUILD lzlib-1.6.ebuild 671 SHA256 d9fd8748453e3414c000d4b5b265a588a0d5b8e0a882762c5903c4d7582f6f26 SHA512 5139d3738857396f65aef59dd36d764b46f0f8150d97daa6538c80b49deb33e71865b96a321eb590fc3e8d0971c3f7a15eaf69211809964ec0cb15d3c7800fa9 WHIRLPOOL 6ecae2acf641222295984174b16858114ff611025841cc5e27f17be45a432e7542b8aeb1d979692d296341ac7a1371771430d34b3b08f3210e50a82d128266eb
diff --git a/dev-libs/lzlib/lzlib-1.5.ebuild b/dev-libs/lzlib/lzlib-1.6.ebuild
similarity index 100%
rename from dev-libs/lzlib/lzlib-1.5.ebuild
rename to dev-libs/lzlib/lzlib-1.6.ebuild
|
mark-kubacki/ossdl-overlay | d742c1b0a0aaed11dd0c5fe5780999c9359e108a | dev-php/hhvm-3.5.0: version bump | diff --git a/dev-php/hhvm/Manifest b/dev-php/hhvm/Manifest
index 73d115d..d8c30bc 100644
--- a/dev-php/hhvm/Manifest
+++ b/dev-php/hhvm/Manifest
@@ -1,6 +1,7 @@
AUX hhvm.confd-r4 1024 SHA256 53bfbbcbd90719d58e5c1ff483213d4f218816d0d9e3a29612eee95194209c06 SHA512 459d749db56fe03630bc5e8996c8b3b10dc083e092b86e0912d7172de09b2ea673fd67f57c1c2362270e965cc48539e256b8191fbeb9f1771197b4a9bbb55188 WHIRLPOOL e1fcb4914f2573bb1e78f8069ba4691cc7a2f4cac8bc6e8ce2c125004ae70dda609ea5a57d129e7094a810faf3387a45cc1769ab86ad98176da68191f2ab919c
AUX hhvm.initd-r4 3044 SHA256 399a9c8f67321dcd9381cf683f65116ed9d6bb4470ca19671e42315d466cb9b2 SHA512 3dcbd35e5b872e5d2d4357d32f41e48e8f3af9077372867290eb59c8c7cf57431b46b9f306ff187268c4d0c8470901c1c655c42b68983cb4bd667eab5926574f WHIRLPOOL 6fd8fbae0bbd87c7758c9503728945b2f75f2ad195a68aaf237576ac9582f36b938edb6876566f3e99aa53a5763f438eb74354c4caa3d68d091e6cc75e4365da
AUX hhvm.logrotate 147 SHA256 3b521ae4ec20b2a9c5acca1b974e3e116008a68cd2a67407fa14818a013eb3fd SHA512 ff4139f3a43436b37f191cc8e4873af646ab40cf4b9fd590c0a3d880b785183fa3efe9ae049362ceaf3c471c0fabedfd212c45aa12aa553c6acbfb33d7e1be96 WHIRLPOOL 57070dc9c3f0aae66824d37683a23163727f497f9c42e0b2ef9ac50973559e67ccda1d4035052d76d33caf41a11be5d1046364580b755ae76caff5a5d90efce0
AUX php.ini 1701 SHA256 f758dae7cd5374bd415d573a9e3ce859fd4f0e8d5910cb105138a591147fd5c2 SHA512 a91dc3073da4ea1c54af9bcd23c8356b32c2660943ab9a04ef3a3296767a0e33f1f586978ed139009fc14ed84771d544f39ef968f0ffac366898bb181999074f WHIRLPOOL 194feb161cc808b519a9981b5b098b3f8f6605855ef0d13e01c9316b0414c96c80c945edd8e60ec36e306167e940286e2cd8cc7936765b6e896ad935e2f7e083
AUX server.ini 296 SHA256 1deba06d5533178f026993d7f41703b19df2ba88ce623d675802a9cb7e8f8d77 SHA512 88682f8e903256db0bdea362e86e56d9d34f0a27ac5a269adaaf2efff0f2ca1c0275c039ad40de0a8489a6e3ca7e6e78cab27d3e87ab0ed1bb0029884129678c WHIRLPOOL 350f6d67f8847e31e2289d4ee5deec20cb88c23f56659de8cbe4573a66f809f3be4206d1d19694276f43b99ac43a8c09f2bbc5ed5598dfa6cebfb26f4b036182
EBUILD hhvm-3.4.2.ebuild 4252 SHA256 fe3d6e7cba8ce9a4b26319d8fdd25bb0a2b7af8a06c7f2f77ef23c5dffc1d18f SHA512 d16d866be8734758c5baa928fe1de61262eed95388e8b5311273a987fa3d11d051457605ca1204c33c46219346d418317f55cec6e6e922686ca38405bd836880 WHIRLPOOL db0dadca04c110a81007a147f1343a71a5630227d0f102ed625627c90cf99ffd870905a8a9b4abf2c94212bee508c2a4052da6c4bec8d97934e37a5d6c34586e
+EBUILD hhvm-3.5.0.ebuild 4235 SHA256 ae4914efa1bba236e831ffd7528d2238fddf57e93451c99198465cff7391e7d5 SHA512 a0ca1020afaa3a63a48997bf6a6dda79c3693579412243646c4ef2207a29224b8ba86f80b0572d87c269e94d1380cee0c7d9d2e39dce87b0a46b8713795efcbb WHIRLPOOL e0c47334661e9cfad09d7d274b4ef61113388a3d1a1afa6e8230068c8806c85c03599de7b4a69fcb917f51ce9dd503c5c747e810e3ce38715c95ea14a64d06c2
diff --git a/dev-php/hhvm/hhvm-3.5.0.ebuild b/dev-php/hhvm/hhvm-3.5.0.ebuild
new file mode 100644
index 0000000..1dc17ca
--- /dev/null
+++ b/dev-php/hhvm/hhvm-3.5.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 2014â2015 W. Mark Kubacki
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI="5"
+
+inherit eutils flag-o-matic git-2 user versionator
+
+DESCRIPTION="Virtual machine designed for executing programs written in Hack and PHP."
+HOMEPAGE="http://hhvm.com/"
+SRC_URI=""
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="amd64 -x86 -arm"
+
+EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
+EGIT_BRANCH="HHVM-$(get_version_component_range 1-2 )"
+EGIT_COMMIT="HHVM-${PV}"
+
+IUSE="cotire debug devel +freetype gmp hack iconv imagemagick +jemalloc +jpeg jsonc +png sqlite3 +webp xen yaml +zend-compat"
+
+DEPEND="
+ >=dev-libs/libevent-2.0.9
+ >=dev-libs/libzip-0.11.0
+ >=dev-libs/oniguruma-5.9.5
+ || ( >=dev-db/mariadb-10.0 virtual/mysql )
+ freetype? ( media-libs/freetype )
+ gmp? ( dev-libs/gmp )
+ hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
+ iconv? ( virtual/libiconv )
+ imagemagick? ( media-gfx/imagemagick )
+ jemalloc? ( >=dev-libs/jemalloc-3.5.1[stats,no-prefix] )
+ jsonc? ( dev-libs/json-c )
+ jpeg? ( virtual/jpeg )
+ png? ( media-libs/libpng )
+ sqlite3? ( =dev-db/sqlite-3.7* )
+ webp? ( media-libs/libvpx )
+ yaml? ( dev-libs/libyaml )
+ dev-cpp/glog
+ dev-cpp/tbb
+ dev-libs/elfutils
+ dev-libs/expat
+ dev-libs/icu
+ dev-libs/libdwarf
+ dev-libs/libmcrypt
+ dev-libs/libmemcached
+ >=dev-libs/libpcre-8.35[jit]
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/openssl
+ net-libs/c-client[kerberos]
+ >=net-misc/curl-7.28.0
+ net-nds/openldap
+ sys-libs/libcap
+ sys-libs/ncurses
+ sys-libs/zlib
+ "
+RDEPEND="${DEPEND}
+ sys-process/lsof
+ "
+DEPEND="${DEPEND}
+ >=dev-libs/boost-1.49[static-libs]
+ dev-libs/cloog[static-libs]
+ >=dev-util/cmake-3.0.2
+ media-libs/gd[jpeg,png,static-libs]
+ >=sys-devel/gcc-4.8[cxx(+),-hardened]
+ sys-devel/binutils[static-libs]
+ sys-devel/bison
+ sys-devel/flex
+ sys-libs/readline[static-libs]
+ sys-libs/zlib[static-libs]
+ "
+
+# for DEPEND run:
+# for LIB in $(ldd $(which hhvm) | cut -d ' ' -f 3 | grep -F / | sort -u); do q belongs "${LIB}" | cut -d ' ' -f 1; done | sort -u
+
+pkg_setup() {
+ ebegin "Creating hhvm user and group"
+ enewgroup hhvm
+ enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
+ eend $?
+}
+
+src_prepare() {
+ git submodule update --init --recursive
+
+ filter-flags -ffast-math
+ replace-flags -Ofast -O2 # or compilation will fail
+
+ # output is not humanly readable without this:
+ if [[ $(gcc-major-version) -gt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 9 ]] ); then
+ append-flags -fdiagnostics-color=always
+ fi
+ # GCC 5.0 with CXX will complain about too few registers without this
+ if [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 0 ]]; then
+ replace-flags -O[3-6] -O2
+ fi
+
+ # HHVM's dependencies need this when statically compiled, which is desirable
+ append-flags -pthread
+
+ # PR#4342, dependencies already guarantee that PCRE works
+ sed -i \
+ -e 's:find_package(PCRE REQUIRED):find_package(PCRE):' \
+ CMake/HPHPFindLibs.cmake
+ # use the already installed PCRE
+ sed -i \
+ -e '/^ pcre/d' \
+ third-party/CMakeLists.txt
+ rm -rf third-party/pcre
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_INSTALL_DO_STRIP=OFF \
+ -DCMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+ -DSTATIC_CXX_LIB=ON \
+ -DBoost_USE_STATIC_LIBS=ON \
+ -DCMAKE_EXE_LINKER_FLAGS=-static \
+ -DENABLE_ZEND_COMPAT=$(usex zend-compat ON OFF) \
+ $(use cotire && printf -- "-DENABLE_COTIRE=ON") \
+ $(use jsonc && printf -- "-DUSE_JSONC=ON") \
+ $(use xen && printf -- "-DDISABLE_HARDWARE_COUNTERS=ON") \
+ ${EXTRA_ECONF} || die "configure failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ if use hack; then
+ dobin hphp/hack/bin/hh_client
+ dobin hphp/hack/bin/hh_server
+ dobin hphp/hack/bin/hh_single_type_check
+ dodir "/usr/share/hhvm/hack"
+ cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
+ fi
+
+ if use devel; then
+ cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
+ fi
+
+ newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
+ newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
+
+ dodir "/etc/hhvm"
+ insinto /etc/hhvm
+ newins "${FILESDIR}"/php.ini php.ini
+ newins "${FILESDIR}"/php.ini php.ini.dist
+ newins "${FILESDIR}"/server.ini server.ini
+ newins "${FILESDIR}"/server.ini server.ini.dist
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/hhvm.logrotate hhvm
+}
|
mark-kubacki/ossdl-overlay | 0a411721c6af97d994dcc96dc97100a25280b3b5 | sys-devel/gcc-5.0_alpha20150208 | diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4eb5ead..0650b9d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,17 +1,17 @@
AUX awk/fixlafiles.awk 7807 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c073e5c29433c3cdf9c5c SHA512 a39e09db4f34d1358de9e929b4c1e10b677d7e8aeffd6afb36d42543b18f1dfa77e3e26331e3fa1b556bae3d8c75ab4bd5796c7ccf2dda4eb365edb307828bed WHIRLPOOL 0cb6e5e96460514c17f3242d8fe936dc2545c07ca08c03ceb34730935435fde24d197300da54d4a19de86067f9e4bbc14178da2f7c03f4be57c89c81307f5d82
AUX awk/fixlafiles.awk-no_gcc_la 8596 SHA256 91e36c29133b6ff854bc84acd6cd2e9d07be6eaa73ef9b23e4f7bc6371107fab SHA512 a970ade3e0b57b3280dd01036a95338c4a7f0c7ec45e7aeb7255197df43e13a5fad8c565b4b345e3a0c8326f71ae7ab598b804eaeaa9d59eda8683195bccfe45 WHIRLPOOL e3da866b8902fbf639af545b43c3b6ccaca0f5d543647007f02e0b8bfc16a675463b8681e9fad11d6ce29517e099636f43708f880ef7a433e4578ee408c3b099
AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
AUX c99 446 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5 SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 WHIRLPOOL b888038b96615c7a0363555b407a3de2c1f17e34428fa16dfbf56fcf68875d6bcdecbc61b545d7f71842ff1909a3ffeff17165fa7f56b48f95adae22f5f8bff1
AUX fix_libtool_files.sh 1679 SHA256 0037e3f1303560f1ffadc61c7ed6bca13a41d6f2f70f196276938cda9dd158f0 SHA512 834beeb04f1057a0b1f79025fc9bbe0193ea8457055cc10b5b4c528a60e37ead7614a686aa6e7285e040161a91d4b5ff394539a33fc2f4b44be5c2514d0bb283 WHIRLPOOL c7e2f517e0c5c9a8930cd615f68222b44a6f227518ea71b5eb9b6436e1642be748d9cb4c0732f27df6c2ded2eb2c758d67ee9cb58e409f30814f988523dc649b
AUX gcc-configure-LANG.patch 2052 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 WHIRLPOOL 3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 WHIRLPOOL 39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb
DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad
DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
DIST gcc-4.9.2-patches-1.0.tar.bz2 18213 SHA256 e4e9a665381beb4018779a14d5124528a9d5df0e0772f3b7639390d6bda51515 SHA512 27deba0db6a500b160829fdcf5fc9a70be4b4fbd45c89d18dd2d0808d42803657693d0ed0f2b664e020a0d2ac39cdfe550e397eb4c2a6f64220cae1e7a16ff20 WHIRLPOOL 7e04ed92038f19a9b00fe0022c2c7ce3df8621fccca95cb2da37333a5edcc0857efe96aed68f5c4b51db19ecd23ec1194412f1bc24730cea30db7b342c12dfdf
DIST gcc-4.9.2-piepatches-v0.6.1.tar.bz2 14185 SHA256 590d11ea5723812fff3239c5eaed4b040b26a92586de0e42a84438f742eaac0b SHA512 89560e96bc205e848936acc4d3423ff5e1ea5ee478848edfe2b992585cea0df21eb102b1f1bee55c10568d4ca54bb3f4e8ae72aa695e34a908abfda3585fb992 WHIRLPOOL e6db4a2e5fdf762bd4f0fa70d630499bf6789a0c3b7ca193b455bb22f95f5f2983358ba9f28bd85b571a3a44a691ca797762302a1f2ea63ce170752f7e44128b
DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
-DIST gcc-5-20150111.tar.bz2 89084324 SHA256 0b074c73f68cf824042ecdc5a047b2fc237665c677a327b1712488cefa5c4860 SHA512 0dc92dc1527cc0a76e558933ecd9a80331aa85e7862ff94272da68905c97b153e81795614b7c52a08a506f44e025225bd5abfe3d1d4d08980d6916ec82840acf WHIRLPOOL a458acc70b74e6b0235333a7cf13556accb2b2bee645a6b686b50b83a3a1760cff4eade684efd8c8ab89cc0527c6e1d609381c4b326ed8e0e9fe4bc15623b016
+DIST gcc-5-20150208.tar.bz2 89692570 SHA256 a7c07a0be6ae91a398605f14653d72f41b3db1052ec636bb17a62fbbf6eb16e1 SHA512 48a7dd71f1c044a89576609e22712fc6f5624be677e3b38bdb79782bcb7ea81a49ce7e3787515f621855ca868041a52fbad214430db626156bef88edff930ac0 WHIRLPOOL 56ca4fc1ade53aebf68c61522b8ea2d19e65e85c650036dc5bad6c239b70aa668ef8275c15035cef06b2bb53dffd978cd6ab652c7d731e22e0c051489b7e17b2
EBUILD gcc-4.9.2.ebuild 1343 SHA256 801f1cc98b27dfcfd1cfcb112c82131ed12f700595403ad76adeeec76f0a7b1e SHA512 12351ae88d87b7b3602f42c8e236965746708726a1bf4d22f4f95301cb62b564e696287ce1c5cf8914024734ebb54e01e28a210981d27dc3646485a9c499535f WHIRLPOOL 49e59732de3bc456a3ea673d399d277945aafe07a0c7b3385e1a5138ae640ef41fe6c94b0adaeb07ca86efae73eb5f943bd3d2a46077a3ce7d2f051cc971c10f
-EBUILD gcc-5.0_alpha20150111.ebuild 1298 SHA256 2d30c025325aef1e42804dad4769c254dfccfbef425346ed067adeb00b0b855b SHA512 55d552af87ff9c5ede5874e6dafb87dc058ffeeb092ed81c3879f2320035d8041794663fd271ffdf2566b8aed70665299f3c80fecc78e59507076a779e849ff3 WHIRLPOOL 3e4c205327325f9da7fc5b4dc7e81fd33961999f6adc93d288c5d177f40a0bfe9b1fcaa1b47a4c7d9fbb2e4da70601d167ffe6df0c3d11ec1750f89475c8f621
+EBUILD gcc-5.0_alpha20150208.ebuild 1298 SHA256 2d30c025325aef1e42804dad4769c254dfccfbef425346ed067adeb00b0b855b SHA512 55d552af87ff9c5ede5874e6dafb87dc058ffeeb092ed81c3879f2320035d8041794663fd271ffdf2566b8aed70665299f3c80fecc78e59507076a779e849ff3 WHIRLPOOL 3e4c205327325f9da7fc5b4dc7e81fd33961999f6adc93d288c5d177f40a0bfe9b1fcaa1b47a4c7d9fbb2e4da70601d167ffe6df0c3d11ec1750f89475c8f621
diff --git a/sys-devel/gcc/gcc-5.0_alpha20150111.ebuild b/sys-devel/gcc/gcc-5.0_alpha20150208.ebuild
similarity index 100%
rename from sys-devel/gcc/gcc-5.0_alpha20150111.ebuild
rename to sys-devel/gcc/gcc-5.0_alpha20150208.ebuild
|
mark-kubacki/ossdl-overlay | a5a7d6e24bd0e40573493783118ca2307804da10 | www-apache/mod_pagespeed-1.9.32.3 | diff --git a/www-apache/mod_pagespeed/Manifest b/www-apache/mod_pagespeed/Manifest
index f073a57..9cbde5a 100644
--- a/www-apache/mod_pagespeed/Manifest
+++ b/www-apache/mod_pagespeed/Manifest
@@ -1,4 +1,5 @@
AUX 80_mod_pagespeed.conf 6918 SHA256 aa737f2454f93c3e593aac16167b1ddc88113d3bade742f901a0861398b5129d SHA512 b56645a3e8763d4ccfb840a78ad52deef666c4efe8835cd6cea4689e8d1dddb4a4931c12334edff457c1d63e51575365f85bc887bd71e40dc3c33fe8363a195e WHIRLPOOL 636f0d96e710cceeb81c52ea0ca41bf2c7b9380d7bb0457b954bbc26067e5f091cd2be8e48d32664c417841407f88042d3a29f6b91a73e40263453b2e48f38c2
EBUILD mod_pagespeed-1.6.29.7.ebuild 2258 SHA256 fa14e1c2f51c7b201dc3a2c5db40ce066db461ed45c60803abd3ee110dded2f4 SHA512 aff368c2fa835cf3ee3b8e1f1431d29db17607fa730747e1432666fb5487517adc1e2e64c1c9e9d5fc5cb567196de463635a5c20dbd59d872bad3d5aa16f9799 WHIRLPOOL 56b31953b6807775bb81eda3fad4666b5adc11ee59bad928bc9dbbd09402ad0ddd2baee2e97aa7f5cf07a9718c733dfe29a5dd5b374d21c69b037d38adb3da79
EBUILD mod_pagespeed-1.8.31.2.ebuild 2266 SHA256 4608c4fd3f9ae9a6a4c8148401f5f358c3970f12c0c02170c3fffb35ee18edb2 SHA512 3bac719289f99692d9e4ebd4517cb082876d0adab4dbe41acc108e0da72ba1ccc4e887fd5b5f9d3bb35bd868ef90ae67785e849f21199b75b804782d1707eae7 WHIRLPOOL 30a143162ec02d870df1d9f082e589615f42d151c434ac55aee544aedac6931c677bbf679c8009654b75c945094da793c9c30a4e1d70e39b0c0ca85a303feae0
+EBUILD mod_pagespeed-1.9.32.3.ebuild 2266 SHA256 275d4ac51233de6b7f75f7cef3868c1fc0b454c3fd420ba2a10ebd2fe0d79d72 SHA512 04db58d3c297e488ace4f183f4b7d0d09c17ac11da7e5959c140f90d1d960a3e753b45d777a1ddb6c8174b3551827e6720f540277e03bedefeb955ebf6edcca2 WHIRLPOOL 24b42ef207f408464fb2fc95466b37d48ea0ee103ffc550723fb04792d166084d4c21c5cab7ac6a8440c129169240b6d19ca3df755380a84b25dddbc0e443ca1
EBUILD mod_pagespeed-9999.ebuild 2252 SHA256 e29e8e9d565cdb6d56fde62c6bf0fd183173629da6f62ce7a99c1af8923f9c75 SHA512 211579d3e28487c4504358a184e35fc8097061adc80b1645523c33e76f7009469de28e33fc326aa87162b3044f662104769b92bb53cf6f4944d0b9e474e7b34c WHIRLPOOL 88feb5ecbc02ebacee037f19a2f4e6854f07445e50303914813d692c7d2ee56fdf8c4a4d627f9a2085311aec64bca4a10b48d85ab4093bea8f5de185dcf57921
diff --git a/www-apache/mod_pagespeed/mod_pagespeed-1.9.32.3.ebuild b/www-apache/mod_pagespeed/mod_pagespeed-1.9.32.3.ebuild
new file mode 100644
index 0000000..34fa8fb
--- /dev/null
+++ b/www-apache/mod_pagespeed/mod_pagespeed-1.9.32.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Copyright 2012-2015 W-Mark Kubacki
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit apache-module eutils subversion python-r1
+
+DESCRIPTION="Apache module for rewriting web pages to reduce latency and bandwidth"
+HOMEPAGE="http://code.google.com/p/modpagespeed"
+
+ESVN_REPO_URI="http://modpagespeed.googlecode.com/svn/tags/${PV}/src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+IUSE=""
+
+DEPEND="dev-util/depot-tools
+ >=sys-devel/gcc-4.1.0[cxx]
+ dev-util/gperf"
+RDEPEND=">=www-servers/apache-2.2.0
+ ${PYTHON_DEPS}
+ "
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+APACHE2_MOD_FILE="${S}/out/Release/${PN}.so"
+APACHE2_MOD_CONF="80_${PN//-/_}"
+APACHE2_MOD_DEFINE="PAGESPEED"
+
+need_apache2
+
+src_unpack() {
+ # all the dirty job in WORKDIR
+ cd "${WORKDIR}"
+ EGCLIENT=/usr/bin/depot_tools/gclient
+
+ # manually fetch sources in distfiles
+ if [[ ! -f .gclient ]]; then
+ einfo "gclient config -->"
+ ${EGCLIENT} config ${ESVN_REPO_URI} || die "gclient: error creating config"
+ fi
+
+ # run gclient synchronization
+ einfo "gclient sync -->"
+ einfo " repository: ${ESVN_REPO_URI}"
+ ${EGCLIENT} sync --force --jobs=1 || die "gclient: unable to sync"
+
+ # move the sources to the working dir
+ rsync -rlpgo --exclude=".svn" --exclude=".glient*" src/ "${S}"
+ einfo " working copy: ${S}"
+}
+
+src_compile() {
+ GYP_CFLAGS="-Duse_system_apache_dev=1 -Dsystem_include_path_httpd" GYP_CXXFLAGS="-Duse_system_apache_dev=1 -Dsystem_include_path_httpd" emake BUILDTYPE=Release V=1 || die "emake failed"
+}
+
+src_install() {
+ local OUTDIR=out/Release
+ mv -f ${OUTDIR}/libmod_pagespeed.so ${OUTDIR}/${PN}.so
+ apache-module_src_install
+
+ keepdir /var/cache/mod_pagespeed /var/cache/mod_pagespeed/files /var/cache/mod_pagespeed/cache
+ fowners apache:apache /var/cache/mod_pagespeed /var/cache/mod_pagespeed/files /var/cache/mod_pagespeed/cache
+ fperms 0770 /var/cache/mod_pagespeed /var/cache/mod_pagespeed/files /var/cache/mod_pagespeed/cache
+
+ mv -f ${OUTDIR}/html_minifier_main ${OUTDIR}/pagespeed_minify_html
+ dobin ${OUTDIR}/pagespeed_minify_html
+
+ mv -f ${OUTDIR}/js_minify ${OUTDIR}/pagespeed_js_minify
+ dobin ${OUTDIR}/pagespeed_js_minify
+}
|
mark-kubacki/ossdl-overlay | 6d0e443adab926d94f48c27b01f524ade359f837 | net-libs/apache-activemq-5.11.0 | diff --git a/net-libs/apache-activemq/Manifest b/net-libs/apache-activemq/Manifest
index 77ffb1b..dbddffc 100644
--- a/net-libs/apache-activemq/Manifest
+++ b/net-libs/apache-activemq/Manifest
@@ -1,4 +1,4 @@
AUX activemq.confd 691 SHA256 d56dfa8d455b86041c3a6283f0e68ce2deff04d56e72357a5c23672e9f9d2560 SHA512 800a4d3f87337835f46c1324e284eb1b73fe156fdc67254b50c6febacb13a369d8fec6845f78b60f10336ee8f180fa338f6ea621f9f8cce1e8d82c5125e9afb1 WHIRLPOOL 54cc1f7ee770ae3a6be318d9927e79e6c059364dd9490c12be440f7bb6efa61a0fbdc5e4c948d618afeb86e3049a9f2c28dbccb147c2d1076ba4d78a6427e2fa
AUX activemq.rc 523 SHA256 037f8fa0ee77ebe1ea6821f96a8d423c8273446efd86838928d94a2c88f7e7de SHA512 8c54c21937299d9a9105eda8fa6bef43b32a7f1e0c58d29ccca0317e51efd6932dc7ed0ec6507b784c027175b22b7457673f8603461086574dfe038b5b5dd04c WHIRLPOOL f49d8cae0c317ebd400169d1cd4cfebf292e694d7a77b0e0860abab016c65bc9b1fda2b213ef8a12c6b76c6231af21fafddcabd8e80fd7cda44fae2af0e3bc0f
-DIST apache-activemq-5.9.1-bin.tar.gz 48552567 SHA256 595d2008996de67aff2e7610168d32b234e223c7f5d46590a5f9db953ac0cf15 SHA512 0d2b7bab44c9fdcc2deae47df03893cd83852fc21b1b12a2e5293f6e9354c1a54bc6370442e2a145d61f9b8ebf71e19304dc4b8dca38a5f8cbd268f1b66bdc98 WHIRLPOOL 1e217ee77426fe3b7884d5ec6b58e12362c0eb11f9f7e9461440c1e2eee4abf9408af88541088df8daa7b0f4940186655c160ea4f1919fc341d1e3f3a28bdf03
-EBUILD apache-activemq-5.9.1.ebuild 960 SHA256 8060d61c28071ae4ce961b06c6bc709c9ce197b0ec40a278e75825f48e5d58fb SHA512 e8c6f66697d0169c60dda80aa3eb003942d48b86fe8b1f35d92cd90b496fc16653032f13967a8401da3403986b5fd53d9a283037f028e4fbc2766d854c73c02c WHIRLPOOL 20beec0dc1bcb451a284a9d6378cc726fc3f796e1ba0274597c3fac856a8848e0b8cdc9089fe96666df912325b4e83d4247b7feba7aafc6ae295c2354b4caa3e
+DIST apache-activemq-5.11.0-bin.tar.gz 43398159 SHA256 5532b942f4927158882d518a3d87f722fbefacb6cb490b09413b1619df3193f7 SHA512 c3302bdd470f45a8ea0cbf2ae555f293a47be0ab532bac627b56f3f9d2299f423733e9a86bf2160719260608a35799c7b0550fe91f7cb8006011ac0f22b2b153 WHIRLPOOL d77d913b6d975cbf178c31f6ca15f599a6fd85c684a85ebeaab64065bcda2eb2183faeecf0b35a8bf1984906fe601aa573c45114204671d2422faa3047db9365
+EBUILD apache-activemq-5.11.0.ebuild 960 SHA256 8060d61c28071ae4ce961b06c6bc709c9ce197b0ec40a278e75825f48e5d58fb SHA512 e8c6f66697d0169c60dda80aa3eb003942d48b86fe8b1f35d92cd90b496fc16653032f13967a8401da3403986b5fd53d9a283037f028e4fbc2766d854c73c02c WHIRLPOOL 20beec0dc1bcb451a284a9d6378cc726fc3f796e1ba0274597c3fac856a8848e0b8cdc9089fe96666df912325b4e83d4247b7feba7aafc6ae295c2354b4caa3e
diff --git a/net-libs/apache-activemq/apache-activemq-5.9.1.ebuild b/net-libs/apache-activemq/apache-activemq-5.11.0.ebuild
similarity index 100%
rename from net-libs/apache-activemq/apache-activemq-5.9.1.ebuild
rename to net-libs/apache-activemq/apache-activemq-5.11.0.ebuild
|
mark-kubacki/ossdl-overlay | 1a59adf456828603a47535455916843da70a4624 | net-misc/rsync-3.1.1 | diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 855c344..5274264 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,17 +1,16 @@
-AUX rsync-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch 2252 SHA256 6e57c9efc7c22bb9ce006ef3218b04653e5912bb9a86ed10eb58d9035ce3fcca SHA512 5bdc8db0ce898bce7b55630fea47943162c606b0255abd7362f1c2f6200febe55ba37627e33f245d3c0cb0b8f12faaa497108e8d51b81c62ac15cfe5a35add98 WHIRLPOOL da8a800bcda725b74181dba3fb3480e9e9c3b0e810332491963358571a0d2e912c1682b6548b679001e806c86a21e7b839099669c43417576a9b70d914ceb984
AUX rsyncd.conf 405 SHA256 b7dfb2957fa900de915da3667546e3499a952a51c92388abea79244d34a9a815 SHA512 d847bba13ea888128490e00181c98638c1ed1b65ad5b79393e9578a8af5c2c0438a39a0b3fb69472b5f47f61fb2ad3ed52fbc9d8d4b9dfb88140695640045637 WHIRLPOOL 8c32c39ad948650f66b9518b2599f6bad12d9cac86139f7b995dfb0fe839d6865ad772e27fb600f17f1cf86cc858271e0deed8c1cb2e5197736dffd3fb407176
AUX rsyncd.conf-3.0.9-r1 453 SHA256 fff0bc9e6ca76c92d07d4d048e9f93000b0b47301eba71a82af86941b8f30c4b SHA512 9bc723c6d026f42fe53ffc8a1476d9cf85a14f17393686898a5765bd857883bc74056d1efc28265830a9dc35789e69f9680e50b180e31681f725b36388bc4fb1 WHIRLPOOL 6075d5c5a0615e85d2495c8143a4d118f866ec0f725155c2c40203fbfdfc1779bda5a1f397138212d231f215886023d51b153d1715d197ec4b2f4bc75a5563f8
AUX rsyncd.conf.d 149 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 WHIRLPOOL ac5098df8772c66d4d8070fbefe0194d8c44345d14a547f2cd59737f2dcb2023b59285117b07bbc2d711302f7736dd761d5e5498913c1878c3512d9fb5d5e36e
AUX rsyncd.init.d 558 SHA256 08e620bac216e0acdb56d94198caebd7fd14b0a42e8465b2eb98b7420d369ab6 SHA512 db34bb5d326cb60d4c16b95f3107fb77bdd258efae2dbf90fa41ef91252becd03c87a23049a8304374825e4c1725133844c7b2d86b8363f39dadf6122ea98b3a WHIRLPOOL bafe6f0b4f4bf130ccd39040b6474db28046715bb39d5bb1f75ed995f57e2c3b7dc02f75decc87dbeb246ca0e7504677319662040456b1b5d3a4c96ac8484741
AUX rsyncd.init.d-r1 357 SHA256 baff64277f9aa62cf1eeed2284bb08c4f3078a8e6e7604e4fec228ca5fa9dd82 SHA512 ad12edfb860a34cae1ddaf278ceec4c4cb06784e10248b68923696653ea374eaa9ac28de71f674bdd08d8381d147f1a4afd3ba0da15e673558f222d86c644d71 WHIRLPOOL a74e2547f976e9e959d7c74cc09bdbcae3be97e418b4685217e6e715e7a3b77c1d3f75fd117ae631f13ac58e0fd44359ec05b35542094959ce68e9341531fa13
AUX rsyncd.logrotate 105 SHA256 eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 WHIRLPOOL 6c6a712ccb0934b5746640f8a52bc5a341fbf2f1b492fe709a8ea7b330048ffa405e1b785f3ca59a460a688330e6a43cb9fd7fca8838ba52214b5d0603adcc59
AUX rsyncd.service 206 SHA256 e4396236f554cb57eed133370dd74ff79ea495f5d7535734bc736b716931fb00 SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 WHIRLPOOL 7ea8a774c4b22cc631b86f54ca6bf5e1dabe5d837072b491eb2638e44afd67dc57e7372fbbf26a6214417c7da32521a48c0fddfafb4c9a4249fc35d1271c8651
AUX rsyncd.xinetd 170 SHA256 e19e99dc3daa12d5729dd972b637ed064a2b004a1c7fe75c9f2ebb5ab5997aa8 SHA512 3e043a5f98749a68ccd6537e6ce9810987f4c7be027581f1529e9ba35b0db9a630c126b99eb31d3a41846ff6a16a9b06d5dcc0496093652502b0aa6f160a1174 WHIRLPOOL d42fd1caf1533d76f59cede7015b47374098abe6b331c86b48f3355efb4c3d21abc009c1a23ed564440883eeeedcd908c3ee4b13d07733168590096a67d1f889
AUX rsyncd.xinetd-3.0.9-r1 194 SHA256 17162f014242c9d5003578bed44b89cd2dc4f0ce2a200ac1facaa10a9aac8692 SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 WHIRLPOOL 733f734e70d0c74ab6e472e656b8c83ddf816dca7e6c1130b999c2579713740db9362e5d517d0a8cf792b6859fd16d363f43ea8b531388f7abe93dcc1380ae42
DIST rsync-3.0.9.tar.gz 792725 SHA256 30f10f8dd5490d28240d4271bb652b1da7a60b22ed2b9ae28090668de9247c05 SHA512 b08f9525d7af981b6010e99cc1fa2e39fea94db317a5078ad687adf2716160b0f67b9fad6d9e5b7db63749f031c925fe3b47599379a14a5565c71be85987d5ff WHIRLPOOL 0b1c6c6a310f813a0628b7bac36bc8bdbfffff4b641b93f5da0c6fd9f482958da40486c16ae9694af5382c63aa8e2ee733d79d7baef6e8e9b591cfb83617dcea
-DIST rsync-3.1.0.tar.gz 883901 SHA256 81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e SHA512 bc8dfc90cac1a83cbb34e33cea805bfaa9597694a285fb69d55224fc52987c0199415b380f83a6ac55d17548e6888d1ab0d7bb5951ae4c3a3412c4e3ccf932f3 WHIRLPOOL 3b45271e9cd17eb42c7f06c2b516dc1e4a9333c03e6b5c3c80563ad8121870abdb92db401075a54ae7abe60e875938a4b5e4780eea8e3f30ca1ff75f95a6d00e
+DIST rsync-3.1.1.tar.gz 890124 SHA256 7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621 SHA512 ec0e46ff532a09a711282aaa822f5f1c133593ee6c1c474acd67284619236e6a202f0f369d3e67a95ceb3a3b1c39ea7fb609d6d6fb950f3be6e0f6372e903e21 WHIRLPOOL 0622646c10a0b4553fddbc0c3c48e6a87f78eaa56dc0cc0f0db86ed45e2c6572d23e4c379fae50ced012c2c0e75a364cae55f7c49f88918a9d62fb9ae17805b9
DIST rsync-patches-3.0.9.tar.gz 172417 SHA256 0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9 SHA512 712f876a8a9d291623d72bcc7a4df73d11e709ed30205c384f8f26ccab5b406f9863c4867e3b8eb547cbeec01894984dcba3af92e9a85f0f59401796f7a2f7dd WHIRLPOOL aced50e522a31e15574a9a40d1f70b4689593f68ded7c49bedb296f92fef37555d5443922a81951ea6e5c7a4e2c2b187e022d85ebd2028ba56d8e9db7246cc6d
-DIST rsync-patches-3.1.0.tar.gz 174111 SHA256 b79c489f2864c726a767e0f39c4086df83f401d151bd5dc05a9b2e799b52886a SHA512 cb36b0d420197ac59607cc4c5990ecc7888f5fad6949da87d1341b73ae6ef352aa8eadc8d2a61b5c63f44ce05f88cefc5ee7b70b32874595ce2dd0cf40813464 WHIRLPOOL 8007040f33ed6d125b8f2e3ad8bec6f2a76446e5f5de7e3284577bde47022930df5b4c8898bf14a87ec3ae17ab0fc1716437cf4d383fcb1a867e3918ca843555
+DIST rsync-patches-3.1.1.tar.gz 167954 SHA256 547ea4a37eb497050b37bda029dee4927436781e7b0e4eb207c2fad54d4a3246 SHA512 fcc24394f1df74b72f41a8420aa6747237521ce7c8daa2a402a9e7b746cf587a90b55ba4abd5aebd5216736a48d07566273fce073f8d24f445c4735e1b522621 WHIRLPOOL 64247a0f02ce961d30de5c3538cf345d93e6176ee060be216cd2cd177ae3907cb6474b8a0cb9ef749677df05b45dc7d697dfd5037576c645b25656dbacc342d7
EBUILD rsync-3.0.9-r3.ebuild 2634 SHA256 ffaf26121784d1f1d532eec65fae04ce1bde4c9bf0cd6971ae8e5857159c3eb6 SHA512 1e7426b73d562832745ddfee8aa3e02990f7ad1301951a115751bb3de274004ccad846271ed725a13ee9df80de6915389ede0768ed5c7f36bcafab13ab8dd388 WHIRLPOOL 1a3ec1fc6099f96d7625a08de190e9787f48b61e2a4104411a37e188847f15872796e12d54b9c243d297808b01c87856c22a02efe59ec0b6cb8f33376abf0d31
-EBUILD rsync-3.1.0-r2.ebuild 2730 SHA256 39caf38165c7ff6b3a6a074b457f47aee0c25961cae4743f14b6e41f85c570eb SHA512 9336579366661270b864777054293d6aa0640324ab3a75d72d9f65bd2df3a1758dcace77c72d74998c67e84f5326c58066560d37db80f93855595e33fbe2a14c WHIRLPOOL 4605464a432303b1a004c6afd12d4d771d6563333ab39db9c36165d5da4ca25089355b34a69e0708540b6b72a6c98b35b24fd409a61e3ca2d34b20a3310f3c5a
+EBUILD rsync-3.1.1.ebuild 2644 SHA256 6bef0e97113332c799e9dd5e2f58b25752fdd7d826729502486a3f3e30c46e9d SHA512 5145f3f1ad018b06998eb6218fbb1834ccc601328220f73840aca01bfb947b9e0d141ec6f9b56654ec97b7bc772dd661685226f71959a4fe1ba903f66feef160 WHIRLPOOL 3bff2d6f2cf21b13f58112362af77b15b9458c9efe8b1ddfd4479f5d2c34a09592f4bdf439ac5ca67aad187aa0432c8c8f0ab22a51d19be67b51b187ddb35a8f
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
diff --git a/net-misc/rsync/files/rsync-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch b/net-misc/rsync/files/rsync-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch
deleted file mode 100644
index a3469a1..0000000
--- a/net-misc/rsync/files/rsync-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Wayne Davison <[email protected]>
-Date: Sun, 13 Apr 2014 20:44:58 +0000 (-0700)
-Subject: Avoid infinite wait reading secrets file.
-X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a
-
-Avoid infinite wait reading secrets file.
----
-
-diff --git a/authenticate.c b/authenticate.c
-index 3381b8c..c92746c 100644
---- a/authenticate.c
-+++ b/authenticate.c
-@@ -102,15 +102,16 @@ static const char *check_secret(int module, const char *user, const char *group,
- char pass2[MAX_DIGEST_LEN*2];
- const char *fname = lp_secrets_file(module);
- STRUCT_STAT st;
-- int fd, ok = 1;
-+ int ok = 1;
- int user_len = strlen(user);
- int group_len = group ? strlen(group) : 0;
- char *err;
-+ FILE *fh;
-
-- if (!fname || !*fname || (fd = open(fname, O_RDONLY)) < 0)
-+ if (!fname || !*fname || (fh = fopen(fname, "r")) == NULL)
- return "no secrets file";
-
-- if (do_fstat(fd, &st) == -1) {
-+ if (do_fstat(fileno(fh), &st) == -1) {
- rsyserr(FLOG, errno, "fstat(%s)", fname);
- ok = 0;
- } else if (lp_strict_modes(module)) {
-@@ -123,29 +124,30 @@ static const char *check_secret(int module, const char *user, const char *group,
- }
- }
- if (!ok) {
-- close(fd);
-+ fclose(fh);
- return "ignoring secrets file";
- }
-
- if (*user == '#') {
- /* Reject attempt to match a comment. */
-- close(fd);
-+ fclose(fh);
- return "invalid username";
- }
-
- /* Try to find a line that starts with the user (or @group) name and a ':'. */
- err = "secret not found";
-- while ((user || group) && read_line_old(fd, line, sizeof line, 1)) {
-- const char **ptr, *s;
-+ while ((user || group) && fgets(line, sizeof line, fh) != NULL) {
-+ const char **ptr, *s = strtok(line, "\n\r");
- int len;
-- if (*line == '@') {
-+ if (!s)
-+ continue;
-+ if (*s == '@') {
- ptr = &group;
- len = group_len;
-- s = line+1;
-+ s++;
- } else {
- ptr = &user;
- len = user_len;
-- s = line;
- }
- if (!*ptr || strncmp(s, *ptr, len) != 0 || s[len] != ':')
- continue;
-@@ -158,7 +160,7 @@ static const char *check_secret(int module, const char *user, const char *group,
- *ptr = NULL; /* Don't look for name again. */
- }
-
-- close(fd);
-+ fclose(fh);
-
- memset(line, 0, sizeof line);
- memset(pass2, 0, sizeof pass2);
diff --git a/net-misc/rsync/rsync-3.1.0-r2.ebuild b/net-misc/rsync/rsync-3.1.1.ebuild
similarity index 96%
rename from net-misc/rsync/rsync-3.1.0-r2.ebuild
rename to net-misc/rsync/rsync-3.1.1.ebuild
index 4c74568..544aa9e 100644
--- a/net-misc/rsync/rsync-3.1.0-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.1.ebuild
@@ -1,80 +1,79 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 2012â2014 W-Mark Kubacki
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
inherit eutils flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="http://rsync.samba.org/"
SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P/_/}.tar.gz http://rsync.samba.org/ftp/rsync/src/rsync-patches-${PV/_/}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix amd64-linux arm-linux ~ia64-linux x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl iconv ipv6 static xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
>=dev-libs/popt-1.5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
iconv? ( virtual/libiconv )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
S=${WORKDIR}/${P/_/}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch
epatch "${S}"/patches/detect-renamed.diff
epatch "${S}"/patches/detect-renamed-lax.diff
epatch "${S}"/patches/adaptec_acl_mods.diff
epatch "${S}"/patches/time-limit.diff
epatch_user
}
src_configure() {
use static && append-ldflags -static
econf \
--without-included-popt \
$(use_enable acl acl-support) \
$(use_enable xattr xattr-support) \
$(use_enable ipv6) \
$(use_enable iconv) \
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
touch proto.h-tstamp #421625
}
src_install() {
emake DESTDIR="${D}" install
newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
dodoc NEWS OLDNEWS README TODO tech_report.tex
insinto /etc
newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
insinto /etc/xinetd.d
newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
# Install the useful contrib scripts
exeinto /usr/share/rsync
doexe support/*
rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
systemd_dounit "${FILESDIR}/rsyncd.service"
}
pkg_postinst() {
if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
fi
}
|
mark-kubacki/ossdl-overlay | 6fc5dc376c3e7ea10bebaf59cc6dc246edaaccf2 | net-misc/youtube-dl-2015.02.10.5 | diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 9cc2407..375b113 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 765 SHA256 74359a5967116a63443d35fc8b8014b70829a7e1d40695f22cb7666464c7edd9 SHA512 e0934cf72bb53a5e62aef12c245f6d1199b42256114890e2cb0e23b1778047d6ffc453943a4a34c774c2e0a8cc29b51ce1477e7433d8f071291fabef3d2e9551 WHIRLPOOL cce5d5048062fb9581ac63fe47d1c20db8b6a640c244bf7461ecdcaec2ffcd69a9f72b712a9fc3463acba7aa33b797674d09d171b3223424a688e777ca00ab5c
-DIST youtube-dl-2015.01.23.3.tar.gz 1293171 SHA256 0f8bcc7b5ef11e219f0645423f9f1be0f0c3c2b15ed6b36b6f9cca240775f633 SHA512 f1c7508f43bf8cce949043f7293a2cb575f2f60c78eba2439d0b2fa693df1b1706c43e97132b18a3b22f8252a50dad4a4f45ccedb01138a23c204866f8479c8a WHIRLPOOL ca1647ac678a3ee37586c333ebcc0fe476dd18cf1298ac9a3fd43b60f325f92d0f30e97b3fe42f9b0ad0466df5b160caeb7d22e761982f905c4e0bfc95c7d59d
-EBUILD youtube-dl-2015.01.23.3.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
+DIST youtube-dl-2015.02.10.5.tar.gz 1350958 SHA256 cd383f83b972afccf57b97c096d4830067199aedf4e2f0809004a2ead8676f38 SHA512 b46695a232f5cf05e923c799c683481e71230c8047d5de6ba72de52d6a790344496325d72a515e6a99b73d3a2ffa8dff8fd838905757b730db4dfbc52a7eed39 WHIRLPOOL 647598c1bc509b7fd077471ffd5acd8eb855e32dd7c30c25ca607b5dee255ad7898e4b9cea587dccf9b7d00bc1e0f08504f58ef43d4e22b7825fd04d7d80ae7e
+EBUILD youtube-dl-2015.02.10.5.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
diff --git a/net-misc/youtube-dl/youtube-dl-2015.01.23.3.ebuild b/net-misc/youtube-dl/youtube-dl-2015.02.10.5.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2015.01.23.3.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.02.10.5.ebuild
|
mark-kubacki/ossdl-overlay | faef733001fa94298079426dc71542a98257451d | www-servers/nginx-1.7.10 | diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index ec32881..f90ecc5 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,36 +1,41 @@
AUX 0001-Nginx-1.5.7-from-5450-to-5458.patch 18500 SHA256 6a7a56f8372e1b1fd4560b54d81ad219c9aba3b30b1b0afd9490a649d6cb46be SHA512 1666e66b76cdd0ad5c6c2099723ed63d77a5014d8a9b13ab09d7be78475e35b0ed5f3caa9479fc8f58c8f0a69acc2fee05b103b2bcf2b558acb00f26318d2849 WHIRLPOOL d3ba7d16da8382022995f3f4f768d3284a68b4d49f1fdc3787df0ade4f170780c68a52eaf24130f0a40f4488a0d70ac985f948935ab349247a72be1c5190cf5d
AUX 0001-SSL-support-automatic-selection-of-ECDH-temporary-ke.patch 1683 SHA256 15507a3322a92a05eda448148f32cd89ea200666f9f7cb9263a5841fabaf7739 SHA512 fc2658569089d2b3ad8eb3b0fb31539432c4fae2d2a8f258a7f315aa966dd9469daa0085c5c8be25c6498ff6bcfe08f7b4de8f7855eab9ec33e165e9db302b08 WHIRLPOOL 120bbcb86d98f39b21a952aa088aac6ec0f96170df2ae8b3f9330daedfd52dce38face9434cf28b14e7d0b3c3627a1d481d86d33f59eab5e9c66edd3317d4629
AUX 0001-fix-TLS-record-size.patch 1146 SHA256 f569f2946b4eec762925721b42fbda3e4ee8f96c334a250937bedae1b600ecda SHA512 5d6b70dc1af21c3d1363cf1597795458e925a9f8d8be7ec261daf6b89dc4976607fbaba840e44856a257d4ced6aadcdaeb850ce7002fa2d7ffa01df593fa0f7c WHIRLPOOL eba1dd6d5279c018963efafb441b7e5bb468ec6fc34348d6e5fb33fc12ac56e58ed25954e4021780ebff8e4bcd11286d01b615dc9b7435813c4bbe28987096bb
AUX 0002-SSL-support-ALPN-IETF-s-successor-to-NPN.patch 6569 SHA256 9a9dc666e83d8f9f53f99b664b0662a3192b95ad88dbcee8e029c170cdb1cbc4 SHA512 bdbd381aae59709485a5aa05c964a0392ccee1654a6df75e99e114947f18291bb21371d06bf53b28dbd9de135897db9fc34fa75e52807b97d50525ecc1c2c76f WHIRLPOOL 2b93eb348e415b096c95d3f2e1e0ea676b2f58b005d177aeae73815d9cb4207f9cad50a9b20f1b649603e38c4c12c080904c34fc45d870bca711c32a5c93d30d
AUX 0003-SSL-ssl_buffer_size-directive.patch 4964 SHA256 20e23a98e2e5073b9e6e08ed3813837bf4cb84b4586e6049c23f5af4df2c35d9 SHA512 6dfb71f50694f2d1ed8f160f42c6d65563ff8a0233133247f69d087e8cab5561a2d5922dfb98fa7541aa40f9a5e0ab48f6660e90b4e7faa3c85e2812b4786250 WHIRLPOOL 0d058ee115e3aea72c89e8f45c7632435859c5bfb099dafc5fd57ced88fca88dccf21d6f3d41023907378d915bc276935c223232143c9fe13a723422877e74e1
AUX 01_gzip.conf 483 SHA256 796edb56a2eefa0c876b0bb27bd409210ed3de1bbec5a1874937503ea86916b2 SHA512 4f02b27a7eb47767e7b8fd32698cecb493dd6a5448c968d5ffaf60f6d4c00de11a37c69672483e98390cee54fd74ebdf556e74a6ce8c366e9e987a75374fc0d3 WHIRLPOOL 2930a62b2eff89b0e7d6ea8f19f674d63d9393129faa520136e15b475c01c28007c883b36732d57afc2f5a86b323e4577ba7c27439bd9b5139ad0a0a6718592b
AUX 05_geoip.conf 452 SHA256 fbbe97ab6a409e542c403a7ab1cddd702100578319332ebe392acb5e34183a1b SHA512 dbfe3ca52a7300d80baf65ec68795b33ce619a7acd859042cdb0a3763b70f22509fbdb6c627135f2c455f66e3e2d434736a6cc7b912da79a6034a0b209239924 WHIRLPOOL 9e8bf9bf3eaba600a3865928ce3719c48ddeacd892cfdaa0d566f4983d3fa0ebff25dfa3b80239782185b36570207ffd96702b0ec014ab84a12977d573300792
AUX 05_proxy.conf 475 SHA256 00f18a4c195aaa40b11fbb40f67fa0b553f058edc5f724943dd6f1fc543231cd SHA512 25f6b991b73ebb923074373ec35a16a1af3e2d2cc1dadf4e0fc2641e431b440978641a688bb2b380e0d073398c6693ed284658c9a31287351e63abfec8ed38e6 WHIRLPOOL e96c473a24c7ab5df617e1669e14469ee8b177d4265850d439eaab7bcc28e74db233f868394609fd9e744b59fa5de4e5c1ba91eb9b75a1e23d8a406568bbfde3
AUX 07_browser.conf 365 SHA256 9bb7b4bb4a95cfc3932d9b432adae831f5063b4f5444adc1c46da494b3f987e7 SHA512 240298f7b5dadff2b746b3a94cc8dafde8d4aa3a1fa7bf3f16604437655bac0bbda92efd014a75ee1a6b34b13c25ab86ad420c2640397a18e1c443683107190f WHIRLPOOL 983e0d0385cfcde9310cb4c1a19e6000a117c11c9d77e3b3c8648cc00eb694f0178acc59a28dc159adb09167f7040388f5623e5bad2bfd6c051774e7e95c5e03
AUX 99_localhost.conf 656 SHA256 e300b6440b81da6d635e42be80f3e35015a1d4f85a6ba322e403fc5d81ee9a52 SHA512 13dc21ab81f537d1b0a936c133acd8235051adcfa8d313894b1e1a5b1ad5e0b2fd62bf20438d99aef442ab56620024cd18a94985e91434b2d78f60f22a0cd81a WHIRLPOOL f0a316cbc50eaf92b4fb9688f1c3b3279bb22dcd29139de1a3cd0d0ce0ee8b99827a3b3273a630ac6f11209d6f17c30e3df3ab6a46cc227887ac7355db370ec2
AUX http_redis-0.3.6-trailer.patch 863 SHA256 c6f3076765cc58d0ef8a6908f3b8a0de4687465cdddddd3af20b8fdc7b81bf18 SHA512 8c9baa0c992cfa8ff01b6398140a9406edad5af9a9889dffa2a100dcce3253ff901305352ee3566159e5af72be8eec3e0f0efa0e140f7b9bf290ca3c81161149 WHIRLPOOL 171eb3fe97671dbdb41978cd2c7ea72a0734d38ad022f6b1557df123cb77455a183efab705138c350ec0949059abb3382db59869eaa14e530c233d3c4f852246
AUX lua-nginx-module-0.9.12-compat-1.7.15-patch 1362 SHA256 02e8eca7895831ef34690286338509f652d4376ef0d7b93bcf2e794e2e20de48 SHA512 ebe40dbc7ad6983d91243e30bda5b87e2b947ff5c94db2287ee75c281cc95f567f3140abd6099cbfd2f0454e1eb71423e464ff8c4931148379812512aaa168d5 WHIRLPOOL 5e07e50bddaaeb4213104ff89b95a1a07096daeed910edb8e729783daa650b591ca963c79b1a88007f216c51c8b44fc6e52a70877aa3d1beeff36682e327e293
AUX nginx-1.1.5-zero_filesize_check.patch 2680 SHA256 84cd09e431d159ff58eb369abf7fe0a82c3968ad7ba72105e27378d27bd53ced SHA512 46f122c782fde6ede8cfddb043f753bca5174f252c2732d0506f0562554682f9ed2a954192ffada06c5594d083bfc44e1f11c6055503984dd2d60cae5da7bb07 WHIRLPOOL d854930b2db596fd00236a49793f903994a1de232ed1c5cf4a71e517e2ba3ecbdb192a6fdd868906c491153426c3e706165908236fbbf753a618cb7d7150545e
AUX nginx-1.3.4-if_modified_since.patch 712 SHA256 484ef6c5e4968a0eb2e77e06c1ce9fe67d5731610a83a64954cd4b0e9cbdcdb0 SHA512 87e26e1bfdc30e2353a73c49fc89abb9a269250fdb51a2675b96bec9348ea0496b59cc0129a01dbb7b037b17d018ec2efae171d44bc0a3da8f75ddaed7d665c5 WHIRLPOOL 48c3383b14d69db0188c5140285943c2a35f3b201aadd84db690a4d67330920cffe82040c42b43bee75030eb35e27ff961081904b5cc1835b7ff99eade3a6af4
AUX nginx-1.5.6-3072-bit-dhparam.patch 5475 SHA256 2735019b39bf6ca8c76645147876e99e5bd66f1c22ec0a078ec614c21c333c76 SHA512 2a34d79cb268ace74f661da4c66f70407b9eb48ed8db6aa518b1966796ccbad0b5a89f294be88729196ec1292a5e9e39dd0206518193e9afb7e3405ad3615396 WHIRLPOOL 6bf4b7ef9faca6f0cfa5c711c2343e2bb118f150cce16cfde09a5322e8dae0c15c4a028e40f9d69a204dd8a2574e238e81ccb9ab82be852fe4e536ec7af0a6c3
AUX nginx-1.5.6-random_dhparam.patch 3123 SHA256 8485f825c7bdc18e6bbc23f1b388990f5486d9eee363bdf24e1d07416d7dc0ec SHA512 66a8a74547f62251042f04f60b2dfb37e4d2ef983afdb5ce9904fd9088aebb5eb1c19647ba8d988d1feaccaad0e0fbae2892c7e075fdd9333a4a363dc0cfde97 WHIRLPOOL 6f10b046262a7728b94902f26b9d92f8619f9d07f544e81edbaa363df600e82da09993a829454921fe9675df468d0e3dd9eec7974f86786ce7418d2f2b2bc381
AUX nginx-1.5.8-lua-nginx-module-0.9.3-resolver-fix.patch 8608 SHA256 3ad579328024e341f6b45446871517f6b49f52fbba3e1ae1b30e63d430bcdb21 SHA512 aae40da9368c3290610604b689c313ca5ac1afb2d4407a6616fec88d252e8a525c47950702e96f99936c6b19a08b70553621131ecd36a2b869b8b456d710e140 WHIRLPOOL c3da455e59bb49ef5ae0ea99b79055da219d122ed700ec66afb6c0e068550f85b3b4cbe8f2271784197a9c3dd3daf19558d4709508b220689d9104486fcb87f4
AUX nginx-1.5.8-remove-RC4-from-the-list-of-default-ciphers.patch 1310 SHA256 f61257f186636122fcc694183f5d6afa9cc4e7af9d73020871ed644f68eb6d23 SHA512 4fba017bbca600977e552215c7145854a42dac45f9c70e46f6332a88def6bebd234c7026d65f60bed7080d06833d58c3d6be6a04c4861aa4b8c85121f0bdf19d WHIRLPOOL b24528fbdef2beb482909cb3bc3525d779c8877f7efb75e407377ecfbd26ec8a676be9e4d8e68b1e7ff7384141eb4b4df97a5e2f9c7916697fcaa7cb7320becb
AUX nginx.conf-r5 965 SHA256 b274f63353b6832cbaaa5ec3da7961db018e34e0a587ac444957ff29b5cbce9f SHA512 1063b9df4da2e00a5c7231cf8cff00ae95f68d11ca0ed1f7efc31fc1a22b128edba2c747db258a8f4faba27d252bb0b138e6f78ecad280049f912ab9bf885938 WHIRLPOOL 5328b9fd044d7eb02cff986ed99627259451786fd79a91d00fe8ae6c651791a0522a46cd770aa599d23608a50bb41c75619cba671d69818ef339c9fe4843932d
AUX nginx.init-r3 2057 SHA256 b24365bda7fb77b3bb359550b8598c4633ba32560b096f7ecda5757dc5faf761 SHA512 8e4515885a93e20ca9e7c82473b1f5b28b8554d5e0be9129dbc57b26930224ad1f2724b557314020147fb00b12c2e0a734e28f60f8e0f5d84c7aadf9ee3560c0 WHIRLPOOL 83447ba3cd4bdbdf00a817d971ab9726a6ba847c334e5185b7b17a2fadf758590ca1500dea84371022d0ce8e3aff96b37de3bbe75657b7f9dba9e7475e04f3d6
AUX nginx.logrotate 364 SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925 SHA512 bdb56d90cfa163a9b22262c77d702cfa2319c0c61e3ce2cc2a0c099681bbd6a631a2e2f442ee28802e178799c592e5dd560f3bd33bf2c86d7ecf2b40a204746c WHIRLPOOL be1b76c1d51e6e597f9b441753dda3a943c31ccfb94f02a8da6edcd5c8f22b251df3086b6029101143beef0ca9c624d3ee709aca3e307ab0c910002931c1dc08
AUX nginx.service-r1 327 SHA256 17c404c5130115e3ebadb09e25cff0103b48ae7dbff2284fa690161fda7888ae SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9 WHIRLPOOL 126c56732b8bd9948595727aa8c056c44df05f4c8e708b00c9de715a7260e4e120fd9e076672312b55c889ff4a3ca100ce696165a4eaf93d89e808e1e28653fa
DIST agentzh-echo-nginx-module-0.56.tar.gz 65110 SHA256 a523b3296f71982db3eeff4929360bbdc1c87af1172545a8a60ff913501f3bee SHA512 7495dc6da181da421ca8a3389b21ac6bb67d7fa59fceaf93e8cef49aa37ea58b333ab1e489b5bdea886190b275b389a6f609e4dcc0c8f951de47d16626cbadfb WHIRLPOOL 5d54667c2349a903c10132cb68ad7b2c2fb7d1d6fd1a46835344fcbc98f9933dfbe6f793cde017decd281b0bb8a57ef5dbd24ad256267af92682c1930f63ba30
+DIST agentzh-echo-nginx-module-0.57.tar.gz 65082 SHA256 1c20511adb616917cfa13868a19b8dfefe7f9c7c31730a81ad6f0a8a67d61d04 SHA512 04029882e0d638da9e78d60db5c775797edc5be91e9773e86c43fb8a30e121a2a756f7db5c84156b43560489fe6623d77ec1797d2c6989fa62a57cfc19efbbfd WHIRLPOOL 845e53de66216c172c4a8136daec6354706347c02408c0f01efe0da64fd345057e30be773c52ce0d124b5b0348118a9a06b3cb7d842bd8eef859eb7ef89d6097
DIST agentzh-headers-more-nginx-module-0.25.tar.gz 27961 SHA256 e68077d6a1031aaf933373ece18ff8c21ae030798836d3334cf9925f931cb04b SHA512 fd9866b440194033f8f4868cbfa64d2a45e19f199edd9ab79a499d904700f05c2f753a7a645f8bd465649eb5e9cd86f8b36b518d1fe189f304e0d9c92ed02008 WHIRLPOOL eeb6b7ca303d440d1a4e8845220e75e0b4acbb5725ba46c4d897b16fafa24f1febce83bf17d52a0061c76c973e4583f5471f14f54bcd55a28bdec561187863fe
DIST agentzh-redis2-nginx-module-0.11.tar.gz 28530 SHA256 8a587cc7e90e33123dc0cd01bdba9e1ff7f1db26ba555e88a0070ea8a90afa29 SHA512 ae8618bd11f15f543c3e87916e7a0e1a6a68968e79fd58c987dfaf196655b0cf19aeed2deecb9016fecd2842153dc6cf0e93c9f61f7696a94653a9ea0f97a680 WHIRLPOOL 898fa9f948be185871efd51116f326b13ddb51e7a2c8380f244ea5c0e1a9c1bd6c1d45aaeaffb9c0b2fd82fd8f164f0f55946446cf0a90577b44dd983f7a0c4e
+DIST nginx-1.7.10.tar.gz 828607 SHA256 df73c1b468cebaf3530a5de910bed45ff2cfccf2cf4b9215d0aa0f4e39cf4460 SHA512 b35f8761ca458ce7197d1474eee59ef0871e044198b18a426dc0a8e0aa834e4578a7080133126a15432c9e1d437778c4759059a870d0b184ea7bb4a4ab517902 WHIRLPOOL ba889799acfad5b2224a71f0e52637240427146edd2f6a5e125d6cbd75244f8615f91fb871a3099087683d5d45f895c21b89bf4341208a182211c678407650a2
DIST nginx-1.7.8.tar.gz 823122 SHA256 12f75ec302d3d3b841408e59bbf5116d38527b8c679abfcba7ceb866be60e8e5 SHA512 54833ad6d0ed6bda15d805d171abe980177c0a6d0651dd995d4bbb3d76b6ac77f7fe83d036716cab25c71d61477790967e6e5dcd8bbfdaa98c7e3baa5512323d WHIRLPOOL 2fec99391b394941ae1ffad34acefda3a94047ab509668b4eee99c62be3e1179a382206d90a714c107280e9f600493c1aad8bba73d868d136bee55d569316630
DIST nginx-http-concat-1.2.2.tbz2 6155 SHA256 efbe188d3f705491fe4b1d990d79769ec03398ba8816fb81d784b3efee735a56 SHA512 5f7003b72f8f320a417245cb903b77f81e4ba0e3aa955302afa125a9b2f6028893f882ae0a4ca3ec04eb55566e14b318ed2f8b5eb640b30e86e9d4c2ce236aed WHIRLPOOL 9ff827ab2221a9be267e2abb6a6d8a505263dd6752f510837208f4fa80627e143fc7912ec700330378c853c031e81c221833017331f100633643262a1b50889d
DIST nginx-statsd-20130318.tar.xz 61700 SHA256 61135601dc0575b8bc64a4eceded786f033d052cde64c905e6854be44a363d27 SHA512 40d3cad400f66ea395e604d79ede8028714d76964f9c84a29e4ec41e29ef5799b8c9262a8a1d965e974da4b3b7eee709ce92b2375114178e5e473158d7a64b99 WHIRLPOOL 70afd515673e08443a24ac0e1a3a65b5690c317316a7dd7a340decea8030d86a2eaae6d1a74de011ea08a47472782bc5ff55432e60a83f34cd592cd30cb3dce4
DIST nginx_http_push_module-0.73.tar.gz 50310 SHA256 a2a5b53a847493abef89c27360460997bea2b01d1394a7a612f1e13e4cfbb98a SHA512 ba0038af0e28f03f2201d26c10e356eceef5b188778be83a93c76c5969bc366da9d84edfd4ec93817a9c12029d494456a4c5ee40eaff10554cff9b6a9b7ca4e3 WHIRLPOOL a63205b587199a8c9736efef9c3fa2fc83c36e1debd75977f1a75f4831f25fe23013dc737c2a856d0f43af725b812509b9ceeba490c12aa8694894f9e8258b7c
DIST ngx_cache_purge-2.1.tar.gz 10535 SHA256 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9 SHA512 1b70b2c35601949edd53d55922e81425aef0b2c486b071c2bcf53db7c5278e55966ffd2c9e32f599ee63e147a395e708d442515fe414f39b323d26722324db8b WHIRLPOOL f020841139988ae516969ffcd5bf7b2c264749fef5c20a5c8f0cca70f5eddcd3efcb3676bbe9a4550535de7b53fcd7326294fcae2a14dc6bf66d1ab77205b83f
+DIST ngx_cache_purge-2.3.tar.gz 12248 SHA256 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0 WHIRLPOOL 5451ef3e33044210453995ea916acec679599c0ded5471d464db5003a07e7a06e9690812091148c2af7b50384e52b32e49136eac02e0330724ba2408d893f96c
DIST ngx_devel_kit-0.2.19-r1.tar.gz 65029 SHA256 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 SHA512 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 WHIRLPOOL 0ce6bffc0fe2cef28ee74f5862ca6d914ed18fdee18d900608ff2a9983594c707aab3e335957b79dd7e77ae1beed054d8f71965ca0f57fc5f1d41ac06106c5a4
DIST ngx_http_lua-0.9.12.tar.gz 512403 SHA256 e85c1924ca4670d5708b58efcd6e77793c43f243317a9850a112964067f63150 SHA512 c08546c074570408f646fc7ee60e60d732763a91f10b652858d95de070bd0dd4f0d4117114fc4b46d0f32cff88b21db5f394c3fbb2d2e5f1494fc01eedb782e4 WHIRLPOOL 2223bacff56b4ef942372e4eac3b1a02f21952804b0df6c626456ac2b6894ea068b704606f8a25c47de7887e97577a771fca6ce31d7288992f6f28eb0be27022
+DIST ngx_http_lua-0.9.14.tar.gz 519065 SHA256 dc6d7d3ff7f79ef9a9a80d7adb91ede1cb242eddd2df5f37fca97415646155db SHA512 84d4f3471b0da83f0e192e80385d99a07b4396453050a8ce80d8617418329a5bad9575a9fe90a3e2fa7c33a5d98a10099bafcaa39031bfad3fabe078a8b5a59c WHIRLPOOL de6adf1ecdaf5f9feba8d88fbf7764e06800670b14b445ecd604bf079b8f00a1e601c3228586b366cbd1a38abb1538248a6e7e68b5c825499177e8952b685511
DIST ngx_http_redis-0.3.7.tar.gz 12165 SHA256 9dfc14db81f431fdf3d69f3661a37daf110aef5f9479aa7c88cf362bb5d62604 SHA512 38b7618f35aac4512724df6421d7795b666252b73ea80068b41dd5d9d8d1bdc31293822ae4a57a4cf9e2f39a45abb42c1596c7cf9c8fe1c571f51e3388bbcb3c WHIRLPOOL f9a1f2879092a7d8711513c28d5f012d0e7604a772f480895b6fdba3508eaf3b5e26db1deab1a2414c7aacb1157f415d5632ba89a76b364e92a72a8b5b105cbe
DIST ngx_slowfs_cache-1.10.tar.gz 11809 SHA256 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d WHIRLPOOL a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18
DIST ngx_upload_progress-0.9.1.tar.gz 17198 SHA256 f6e2d867ab545eda2028799ac1af09bf0fd8814530cc387df5218cd8de6bbb18 SHA512 44d5a1065b661d8e17557e97e1b2af173f7005f2b9625ae472cde783d6157f10940e2899073843231d8cbcf0272dd1d9bda14e097249d3d9a7c6e33500e9f4b9 WHIRLPOOL 15d95a2242c5c7290e77138f2e43a2762ad8c05fa6017e8d5b4a3f83ddcd25b6d869d757e165ff16e9acdc44531c01b40009cf4540f1630d56dde21175dd957d
+EBUILD nginx-1.7.10.ebuild 19985 SHA256 35138e2360aa110b095b151ff7d4bd99bf4d37d6b9d0f697f86fa6f83cb48284 SHA512 f0206a504da830cc7f9fd1d15590c94428c01749dbd59f2d3e2728a47e12a6ee845b9ebdc5dce23b0e61e750fd694ec3571d3a4081377b18b536193b7a0de712 WHIRLPOOL f169abad47267b0e8965e0c7c45863acf157ca9dfaa49658f07d5fd820c80ac88d5f7f040fafcba1399d43292fa0cad425cbb906d6f1054a4d70299382c65ac2
EBUILD nginx-1.7.8.ebuild 20141 SHA256 52b43efc1df68a8d4b0e84529a9b2da043980d4103b1b38cce74c8eaa324dfd4 SHA512 2f4e08a8da9abed23fef3539fead5c24cd6eddff9acc0dca84bbbb29b9800567e35675fa6195ddc38cc304d846f0b7ce05eb7e38959a2935a18a299a422e89e9 WHIRLPOOL 4c07140553c9451f7a098c3ee826a729b617cb0b1f66fd02984a6c7c37fc80a8f1d69431eade3cd9f45b7211863ba1b08cbcb83d4675d336b99d62f7b93dff61
diff --git a/www-servers/nginx/nginx-1.7.10.ebuild b/www-servers/nginx/nginx-1.7.10.ebuild
new file mode 100644
index 0000000..5c3a1e4
--- /dev/null
+++ b/www-servers/nginx/nginx-1.7.10.ebuild
@@ -0,0 +1,570 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Copyright 2011-2015 W-Mark Kubacki
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI="5"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+# * alive upstream
+# * sane packaging
+# * builds cleanly
+# * does not need a patch for nginx core
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.2.19"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_SHA1="39e4d53"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_redis (http://wiki.nginx.org/HttpRedis)
+HTTP_REDIS_MODULE_P="ngx_http_redis-0.3.7"
+
+# nginx-statsd (https://github.com/zebrafishlabs/nginx-statsd)
+HTTP_STATSD_MODULE_P="nginx-statsd-20130318"
+HTTP_STATSD_MODULE_PN="nginx-statsd"
+
+# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.25"
+HTTP_HEADERS_MORE_MODULE_SHA1="0c6e05d"
+HTTP_HEADERS_MORE_MODULE_PN="agentzh-headers-more-nginx-module"
+HTTP_HEADERS_MORE_MODULE_P="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_S="${HTTP_HEADERS_MORE_MODULE_PN}-${HTTP_HEADERS_MORE_MODULE_SHA1}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/${HTTP_HEADERS_MORE_MODULE_PN/-//}/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.9.14"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_echo (https://github.com/agentzh/echo-nginx-module)
+HTTP_ECHO_MODULE_PV="0.57"
+HTTP_ECHO_MODULE_SHA1="91ee9a8"
+HTTP_ECHO_MODULE_PN="agentzh-echo-nginx-module"
+HTTP_ECHO_MODULE_P="${HTTP_ECHO_MODULE_PN}-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_S="openresty-echo-nginx-module-${HTTP_ECHO_MODULE_SHA1}"
+HTTP_ECHO_MODULE_URI="https://github.com/${HTTP_ECHO_MODULE_PN/-//}/tarball/v${HTTP_ECHO_MODULE_PV}"
+
+# http_set_misc (https://github.com/agentzh/set-misc-nginx-module)
+HTTP_SET_MISC_MODULE_PV="0.28"
+HTTP_SET_MISC_MODULE_SHA1="f72abf1"
+HTTP_SET_MISC_MODULE_PN="agentzh-set-misc-nginx-module"
+HTTP_SET_MISC_MODULE_P="${HTTP_SET_MISC_MODULE_PN}-${HTTP_SET_MISC_MODULE_PV}"
+HTTP_SET_MISC_MODULE_S="${HTTP_SET_MISC_MODULE_PN}-${HTTP_SET_MISC_MODULE_SHA1}"
+HTTP_SET_MISC_MODULE_URI="https://github.com/${HTTP_SET_MISC_MODULE_PN/-//}/tarball/v${HTTP_SET_MISC_MODULE_PV}"
+
+# http_redis2 (https://github.com/agentzh/redis2-nginx-module)
+HTTP_REDIS2_MODULE_PV="0.11"
+HTTP_REDIS2_MODULE_SHA1="828803d"
+HTTP_REDIS2_MODULE_PN="agentzh-redis2-nginx-module"
+HTTP_REDIS2_MODULE_P="${HTTP_REDIS2_MODULE_PN}-${HTTP_REDIS2_MODULE_PV}"
+HTTP_REDIS2_MODULE_S="${HTTP_REDIS2_MODULE_PN}-${HTTP_REDIS2_MODULE_SHA1}"
+HTTP_REDIS2_MODULE_URI="https://github.com/${HTTP_REDIS2_MODULE_PN/-//}/tarball/v${HTTP_REDIS2_MODULE_PV}"
+
+# http_push (http://pushmodule.slact.net/, MIT license)
+HTTP_PUSH_MODULE_PV="0.73"
+HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
+HTTP_PUSH_MODULE_URI="https://github.com/slact/nginx_http_push_module/archive/v${HTTP_PUSH_MODULE_PV}.tar.gz"
+HTTP_PUSH_MODULE_WD="${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
+
+# http_concat (https://github.com/alibaba/nginx-http-concat)
+HTTP_CONCAT_MODULE_PV="1.2.2"
+HTTP_CONCAT_MODULE_P="nginx-http-concat-${HTTP_CONCAT_MODULE_PV}"
+HTTP_CONCAT_MODULE_URI="http://binhost.ossdl.de/distfiles/${HTTP_CONCAT_MODULE_P}.tbz2"
+
+inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="http://nginx.org/"
+SRC_URI="http://nginx.org/download/${P}.tar.gz
+ ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+ nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+ nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+ nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+ nginx_modules_http_redis? ( http://people.freebsd.org/~osa/${HTTP_REDIS_MODULE_P}.tar.gz )
+ nginx_modules_http_statsd? ( https://binhost.ossdl.de/distfiles/${HTTP_STATSD_MODULE_P}.tar.xz )
+ nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+ nginx_modules_http_redis2? ( ${HTTP_REDIS2_MODULE_URI} -> ${HTTP_REDIS2_MODULE_P}.tar.gz )
+ nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} -> ${HTTP_PUSH_MODULE_P}.tar.gz )
+ nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
+ nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
+ nginx_modules_http_concat? ( ${HTTP_CONCAT_MODULE_URI} )
+ "
+# nginx_modules_http_set_misc? ( ${HTTP_SET_MISC_MODULE_URI} -> ${HTTP_SET_MISC_MODULE_P}.tar.gz )
+RESTRICT="primaryuri"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+ "
+
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
+geo gzip headers index limit_conn limit_req log map memcached proxy referer
+rewrite scgi ssi upstream_ip_hash userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
+image_filter mp4 perl random_index realip secure_link spdy split_clients status
+sub xslt"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+ http_concat
+ http_upload_progress
+ http_headers_more
+ http_lua
+ http_redis
+ http_echo
+ http_redis2
+ http_push
+ http_cache_purge
+ http_slowfs_cache
+ http_statsd
+ "
+# http_set_misc
+
+IUSE="aio debug +http +http-cache ipv6 libatomic +pcre +pcre-jit selinux ssl
+paranoia userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+ IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+ IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+ IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+ IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+CDEPEND="
+ pcre? ( >=dev-libs/libpcre-4.2 )
+ pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+ selinux? ( sec-policy/selinux-nginx )
+ ssl? ( >=dev-libs/openssl-1.0.2_pre20140805 )
+ http-cache? ( userland_GNU? ( dev-libs/openssl ) )
+ nginx_modules_http_geoip? ( dev-libs/geoip )
+ nginx_modules_http_gzip? ( sys-libs/zlib )
+ nginx_modules_http_gzip_static? ( sys-libs/zlib )
+ nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
+ nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
+ nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
+ nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
+ nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1i )
+ nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+ nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
+ "
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+ arm? ( dev-libs/libatomic_ops )
+ ppc? ( dev-libs/libatomic_ops )
+ libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+ nginx_modules_http_lua? ( nginx_modules_http_rewrite ssl )
+ nginx_modules_http_spdy? ( ssl http )
+ "
+
+pkg_setup() {
+ NGINX_HOME="/var/lib/nginx"
+ NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+ ebegin "Creating nginx user and group"
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+ eend $?
+
+ if use libatomic; then
+ ewarn "GCC 4.1+ features built-in atomic operations."
+ ewarn "Using libatomic_ops is only needed if using"
+ ewarn "a different compiler or a GCC prior to 4.1"
+ fi
+
+ if [[ -n $NGINX_ADD_MODULES ]]; then
+ ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+ ewarn "This nginx installation is not supported!"
+ ewarn "Make sure you can reproduce the bug without those modules"
+ ewarn "_before_ reporting bugs."
+ fi
+
+ if use !http; then
+ ewarn "To actually disable all http-functionality you also have to disable"
+ ewarn "all nginx http modules."
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/0001-SSL-support-automatic-selection-of-ECDH-temporary-ke.patch"
+ epatch "${FILESDIR}/nginx-1.3.4-if_modified_since.patch"
+ epatch "${FILESDIR}/nginx-1.1.5-zero_filesize_check.patch"
+ if use paranoia; then
+ epatch "${FILESDIR}/nginx-1.5.6-random_dhparam.patch"
+ else
+ epatch "${FILESDIR}/nginx-1.5.6-3072-bit-dhparam.patch"
+ fi
+ epatch "${FILESDIR}/nginx-1.5.8-remove-RC4-from-the-list-of-default-ciphers.patch"
+
+ find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+ # We have config protection, don't rename etc files
+ sed -i 's:.default::' auto/install || die
+ # remove useless files
+ sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+ # don't install to /etc/nginx/ if not in use
+ local module
+ for module in fastcgi scgi uwsgi ; do
+ if ! use nginx_modules_http_${module}; then
+ sed -i -e "/${module}/d" auto/install || die
+ fi
+ done
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf= http_enabled= mail_enabled=
+
+ use aio && myconf+=" --with-file-aio --with-aio_module"
+ use debug && myconf+=" --with-debug"
+ use ipv6 && myconf+=" --with-ipv6"
+ use libatomic && myconf+=" --with-libatomic"
+ use pcre && myconf+=" --with-pcre"
+ use pcre-jit && myconf+=" --with-pcre-jit"
+
+ # HTTP modules
+ for mod in $NGINX_MODULES_STD; do
+ if use nginx_modules_http_${mod}; then
+ http_enabled=1
+ else
+ myconf+=" --without-http_${mod}_module"
+ fi
+ done
+
+ for mod in $NGINX_MODULES_OPT; do
+ if use nginx_modules_http_${mod}; then
+ http_enabled=1
+ myconf+=" --with-http_${mod}_module"
+ fi
+ done
+
+ if use nginx_modules_http_fastcgi; then
+ myconf+=" --with-http_realip_module"
+ fi
+
+ # third-party modules
+ if use nginx_modules_http_upload_progress; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
+ fi
+
+ if use nginx_modules_http_headers_more; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_HEADERS_MORE_MODULE_S}"
+ fi
+
+ if use nginx_modules_http_lua; then
+ http_enabled=1
+ myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}"
+ myconf+=" --add-module=${HTTP_LUA_MODULE_WD}"
+ fi
+
+ if use nginx_modules_http_redis; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_REDIS_MODULE_P}"
+ fi
+
+ if use nginx_modules_http_echo; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_ECHO_MODULE_S}"
+ fi
+
+# if use nginx_modules_http_set_misc; then
+# http_enabled=1
+# myconf+=" --add-module=${WORKDIR}/${HTTP_SET_MISC_MODULE_S}"
+# fi
+
+ if use nginx_modules_http_redis2; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_REDIS2_MODULE_S}"
+ fi
+
+ if use nginx_modules_http_push; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_WD}"
+ fi
+
+ if use nginx_modules_http_cache_purge; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
+ fi
+
+ if use nginx_modules_http_slowfs_cache; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
+ fi
+
+ if use nginx_modules_http_concat; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_CONCAT_MODULE_P}"
+ fi
+
+ if use nginx_modules_http_statsd; then
+ http_enabled=1
+ myconf+=" --add-module=${WORKDIR}/${HTTP_STATSD_MODULE_PN}"
+ fi
+
+ if use http || use http-cache; then
+ http_enabled=1
+ fi
+
+ if [ $http_enabled ]; then
+ use http-cache || myconf+=" --without-http-cache"
+ use ssl && myconf+=" --with-http_ssl_module"
+ else
+ myconf+=" --without-http --without-http-cache"
+ fi
+
+ # MAIL modules
+ for mod in $NGINX_MODULES_MAIL; do
+ if use nginx_modules_mail_${mod}; then
+ mail_enabled=1
+ else
+ myconf+=" --without-mail_${mod}_module"
+ fi
+ done
+
+ if [ $mail_enabled ]; then
+ myconf+=" --with-mail"
+ use ssl && myconf+=" --with-mail_ssl_module"
+ fi
+
+ # custom modules
+ for mod in $NGINX_ADD_MODULES; do
+ myconf+=" --add-module=${mod}"
+ done
+
+ # https://bugs.gentoo.org/286772
+ export LANG=C LC_ALL=C
+ tc-export CC
+
+ if ! use prefix; then
+ myconf+=" --user=${PN} --group=${PN}"
+ fi
+
+ # CPU specific options
+ use amd64 && myconf+=" --with-cpu-opt=amd64"
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+ --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+ --pid-path="${EPREFIX}"/run/${PN}.pid \
+ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+ --with-cc-opt="-I${EROOT}usr/include" \
+ --with-ld-opt="-L${EROOT}usr/lib" \
+ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+ --http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \
+ --http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \
+ --http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \
+ --http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \
+ --http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \
+ ${myconf} \
+ ${EXTRA_ECONF} || die "configure failed"
+}
+
+src_compile() {
+ # https://bugs.gentoo.org/286772
+ export LANG=C LC_ALL=C
+ emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ cp "${FILESDIR}"/nginx.conf-r5 conf/nginx.conf
+ sed -i -e 's:worker_processes 2:worker_processes auto:g' \
+ conf/nginx.conf
+
+ dodir /etc/${PN}
+ insinto /etc/${PN}
+ doins conf/*
+
+ dodir /etc/${PN}/vhosts.d
+ insinto /etc/${PN}/vhosts.d
+ doins "${FILESDIR}"/99_localhost.conf
+
+ dodir /etc/${PN}/modules.d
+ insinto /etc/${PN}/modules.d
+ use nginx_modules_http_gzip && doins "${FILESDIR}"/01_gzip.conf
+ use nginx_modules_http_geoip && doins "${FILESDIR}"/05_geoip.conf
+ use nginx_modules_http_proxy && doins "${FILESDIR}"/05_proxy.conf
+ use nginx_modules_http_browser && doins "${FILESDIR}"/07_browser.conf
+
+ fperms 0750 /etc/nginx
+ fowners ${PN}:0 /etc/nginx
+
+ newinitd "${FILESDIR}"/nginx.init-r3 nginx
+
+ systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+ doman man/nginx.8
+ nonfatal dodoc CHANGES* README
+
+ # just keepdir. do not copy the default htdocs files (bug #449136)
+ keepdir /var/www/localhost
+ rm -rf "${D}"/usr/html || die
+
+ # set up a list of directories to keep
+ local keepdir_list="${NGINX_HOME_TMP}"/client
+ local module
+ for module in proxy fastcgi scgi uwsgi; do
+ use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+ done
+
+ keepdir /var/log/nginx ${keepdir_list}
+
+ # this solves a problem with SELinux where nginx doesn't see the directories
+ # as root and tries to create them as nginx
+ fperms 0750 "${NGINX_HOME_TMP}"
+ fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+ fperms 0700 /var/log/nginx ${keepdir_list}
+ fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
+
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/nginx.logrotate nginx
+
+ if use nginx_modules_http_perl; then
+ cd "${S}"/objs/src/http/modules/perl/
+ einstall DESTDIR="${D}" INSTALLDIRS=vendor
+ fixlocalpod
+ fi
+
+ if use nginx_modules_http_lua; then
+ docinto ${HTTP_LUA_MODULE_P}
+ nonfatal dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
+ fi
+
+ if use nginx_modules_http_cache_purge; then
+ docinto ${HTTP_CACHE_PURGE_MODULE_P}
+ nonfatal dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
+ fi
+
+ if use nginx_modules_http_push; then
+ docinto ${HTTP_PUSH_MODULE_P}
+ nonfatal dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
+ fi
+
+ if use nginx_modules_http_slowfs_cache; then
+ docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+ nonfatal dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
+ fi
+}
+
+pkg_postinst() {
+ if use ssl; then
+ if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.dhparam ]; then
+ # implies prefix ${ROOT}
+ install_cert /etc/ssl/${PN}/${PN}
+ use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem,dhparam}
+ fi
+
+ einfo "For FIPS 140-2 compliance enable fips_mode in your openssl.cnf:"
+ einfo ""
+ einfo " openssl_conf = openssl_options"
+ einfo " [ openssl_options ]"
+ einfo " alg_section = algs"
+ einfo " [ algs ]"
+ einfo " fips_mode = yes"
+ einfo ""
+ einfo "... and set this in your nginx.conf:"
+ einfo ""
+ einfo " ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # excludes SSLv3"
+ einfo " ssl_ciphers FIPS:!3DES:!SHA1;"
+ einfo " #ssl_ecdh_curve prime256v1;"
+ einfo " ssl_prefer_server_ciphers on;"
+ einfo ""
+ einfo "DSA and ECDSA are prone to leak the key on loss of entropy."
+ einfo "Don't enable them unless you have a reliable random number generator."
+ einfo ""
+ ewarn "Generate ssl_dhparam files for every certificate you use:"
+ ewarn ""
+ ewarn " openssl dhparam -rand - 2048 > mydomain.tld.dhparam"
+ if use paranoia; then
+ ewarn ""
+ ewarn "... and set ssl_dhparam accordingly or else every time Nginx"
+ ewarn "starts a new dhparam will be generated, delaying that start."
+ ewarn ""
+ fi
+ einfo ""
+ einfo "Please note this new directive, with the recommended value being:"
+ einfo ""
+ einfo " ssl_buffer_size 1370;"
+ fi
+
+ if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
+ ewarn "Lua 3rd party module author warns against using ${P} with"
+ ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
+ fi
+
+# if use arm64; then
+# # arm64 knows different cache lines
+# einfo 'add EXTRA_ECONF=" NGX_CPU_CACHE_LINE=64" if applicable'
+# fi
+
+ # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
+ # existing installations
+ local fix_perms=0
+
+ for rv in ${REPLACING_VERSIONS} ; do
+ version_compare ${rv} 1.4.1-r2
+ [[ $? -eq 1 ]] && fix_perms=1
+ done
+
+ if [[ $fix_perms -eq 1 ]] ; then
+ ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
+ ewarn "directories the world-readable bit removed (if set):"
+ ewarn " ${EPREFIX}/var/log/nginx"
+ ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+ ewarn "Check if this is correct for your setup before restarting nginx!"
+ ewarn "This is a one-time change and will not happen on subsequent updates."
+ ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
+ chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+ fi
+
+ # If the nginx user can't change into or read the dir, display a warning.
+ # If su is not available we display the warning nevertheless since we can't check properly
+ su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
+ if [ $? -ne 0 ] ; then
+ ewarn "Please make sure that the nginx user or group has at least"
+ ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
+ ewarn "Otherwise you end up with empty log files after a logrotate."
+ fi
+}
|
mark-kubacki/ossdl-overlay | 2cb913145d119df93bf6f68446a6a62f91445f87 | net-misc/nghttp2-0.7.3 | diff --git a/net-misc/nghttp2/Manifest b/net-misc/nghttp2/Manifest
index 2694d28..71c66a3 100644
--- a/net-misc/nghttp2/Manifest
+++ b/net-misc/nghttp2/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Set-content-type-header-with-charset-for-.html-files.patch 2514 SHA256 39378f8b815ebc4ede87719b67fe8d1dafddc2226cf6194e530b623d94739da8 SHA512 9b05085272b929b71c47d05e0f1c7145676a8c5e247a908b7b60d45fc31c1c4aa22f2bacd9e3527c1e65687cfee6238f0bbce65329f79508cf1030665949171b WHIRLPOOL 1e748d8b5647971dda61428488dd7d0d02fe116cdaee6c2d9117ef530a158bacfdd36e2524a75f51b777a62e3f989322213f745f968159d3015f16fd86006384
DIST nghttp2-0.6.7.tar.xz 813524 SHA256 6cd748982f03c0039072c6a61c8dd88fe270ec34b826fb4591e5ed93f1a8376c SHA512 c22c25f98ec66cacf28b70f5d9d4b78dcf3d6d1f0037642cbd16f03e61c87e4637c53ca6d126a0817eeca31f2e94f0ea452d76328d5d463ea32769b31d982ebc WHIRLPOOL d23529c16113314fcd33393ea10446399c553e98587dec442ecc0a8802174738af46238f1b91061c45d1473f5e9a36449bdae3184c187b55bb96cd60c4b7929c
-DIST nghttp2-0.7.1.tar.xz 821652 SHA256 0f37416e98477fc6b922a2630aea861bbe93a321ffb09462b121c4495a4dd7ab SHA512 323998c7385b035fd45cc28fd0bd949a8d5bca215793d0b9ae593e1976347a279253c6b77bb5e6a7554f1de5eb27e1c74c0ca38c865fd83b3793e8d49bd78ead WHIRLPOOL c77b9587485087b795a937e2c1e1f4e491e0199a2d42b3bf7136c851580c1b02102f80cf33e8ba1e0b71216c16b3b4d1a6d7b9d0fe429d54ee33c92b1553b141
+DIST nghttp2-0.7.3.tar.xz 834244 SHA256 73b7ec1fa2ca11b537fe6b40e48e30a1db30b93d810d5e3905ce620c67df634f SHA512 14361589494e42265786d1d9468d1b54e7cc59d0cc80b562bc54f2d7077e261cb4b94e70347ac0bdd59644819e5c646d8b0dc9b4edf3b8565ca4a4e6fab08d0f WHIRLPOOL c70bd77466a99de1160a1edf8091022ee9cf7e9cf8c97ab9748469017eda1ae78a0067d29ff1df8920b6810693869f6fb395f033dc413d8aa58162438a5e7a06
EBUILD nghttp2-0.6.7.ebuild 1754 SHA256 a82f849bb8e91d3a23aa9405c0a78e201aab15dbde44beaede6564e4978e7335 SHA512 04868000ad2b577715da08c26a5be63b0c4a7573c96381eaeb60debcd12f4fcc09efa2697d6d838abac391d27e7e0983bcf951040170d9ade0f9cbb9867a87be WHIRLPOOL 9765195467e57004448ccfb574800d160be6f1b538a3b5c10722af077f800ef4cd4129ad242f26b3c9bc213e0a00f2fa17e7924f23a118790f0bd20c384ee151
-EBUILD nghttp2-0.7.1.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
+EBUILD nghttp2-0.7.3.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
diff --git a/net-misc/nghttp2/nghttp2-0.7.1.ebuild b/net-misc/nghttp2/nghttp2-0.7.3.ebuild
similarity index 100%
rename from net-misc/nghttp2/nghttp2-0.7.1.ebuild
rename to net-misc/nghttp2/nghttp2-0.7.3.ebuild
|
mark-kubacki/ossdl-overlay | 30df610c7b5421e610559d08db06b1dc4dd2639e | net-misc/youtube-dl-2015.01.23.3 | diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 832a19a..9cc2407 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 765 SHA256 74359a5967116a63443d35fc8b8014b70829a7e1d40695f22cb7666464c7edd9 SHA512 e0934cf72bb53a5e62aef12c245f6d1199b42256114890e2cb0e23b1778047d6ffc453943a4a34c774c2e0a8cc29b51ce1477e7433d8f071291fabef3d2e9551 WHIRLPOOL cce5d5048062fb9581ac63fe47d1c20db8b6a640c244bf7461ecdcaec2ffcd69a9f72b712a9fc3463acba7aa33b797674d09d171b3223424a688e777ca00ab5c
-DIST youtube-dl-2014.12.17.2.tar.gz 1198383 SHA256 302cc64b5a283f60a1b34a5ccf0f09964bf64aa29c5996c945065a72016f68fa SHA512 7c7ccdc83de804ad70b45c47600413b2fdbebb5d78000cb87651926b06c2e6fca1f71382ccb91940384db663e7862804a9dfc92093e352efe18f56e502085add WHIRLPOOL ec09ed3c6f041098ea9fcd05c704c6de7b724ec96c2aff17005fec3ddf5dadddf7f42ecba143bc9d901d9a0ec0bdd237da54ee38757a1693b1fb06bf47839cf5
-EBUILD youtube-dl-2014.12.17.2.ebuild 1034 SHA256 2006dfbd58e05983d8627ef19cc21e4b60f72f501983dfc7c364d393de75a74a SHA512 0bd7dee07475a30df3a74154fc2cd94546aebd9b6610d6fbfe1d6abff243779afa638e8b1d6c7453ce689cfa037301c1078ae1e80eca74245bafa62b1cde34f4 WHIRLPOOL 08761c37aefdfb98ced40d5efdbaeabf526e422d145ca86d9db701b8f8921f88a72142d3784c299ae224452072d55e51a57a6ee500ac319204ac02aec752e615
+DIST youtube-dl-2015.01.23.3.tar.gz 1293171 SHA256 0f8bcc7b5ef11e219f0645423f9f1be0f0c3c2b15ed6b36b6f9cca240775f633 SHA512 f1c7508f43bf8cce949043f7293a2cb575f2f60c78eba2439d0b2fa693df1b1706c43e97132b18a3b22f8252a50dad4a4f45ccedb01138a23c204866f8479c8a WHIRLPOOL ca1647ac678a3ee37586c333ebcc0fe476dd18cf1298ac9a3fd43b60f325f92d0f30e97b3fe42f9b0ad0466df5b160caeb7d22e761982f905c4e0bfc95c7d59d
+EBUILD youtube-dl-2015.01.23.3.ebuild 1056 SHA256 5b447a97fa759b0f4e98bb11b98fec1cfe9625061b108ad69fb8f20d64f7929e SHA512 f2b9eda2359150720adc0e1aaf30605d4c84642dd608a5d27eac83144943b6de437ac92a7eb2d7cc580a19de4c7ca72ee130455d852376ede36d942b8ef87bf3 WHIRLPOOL e0a747ab30bc485400d387d845bc7580f47072a8098e0deed11b42a25cba86b7cc37e909dba20a8a8fae5f9bfb18ebf182c304718b4884372bc56e5438e81eea
diff --git a/net-misc/youtube-dl/youtube-dl-2014.12.17.2.ebuild b/net-misc/youtube-dl/youtube-dl-2015.01.23.3.ebuild
similarity index 97%
rename from net-misc/youtube-dl/youtube-dl-2014.12.17.2.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.01.23.3.ebuild
index a548b49..16ae734 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.12.17.2.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.01.23.3.ebuild
@@ -1,45 +1,46 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
DISTUTILS_SINGLE_IMPL=true
inherit bash-completion-r1 distutils-r1 eutils
DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
HOMEPAGE="http://rg3.github.com/youtube-dl/"
SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+RESTRICT="primaryuri"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 amd64-linux arm-linux x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[coverage(+)] )
"
S="${WORKDIR}/${PN}"
src_prepare() {
epatch "${FILESDIR}"/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
}
src_compile() {
distutils-r1_src_compile
}
src_test() {
emake test
}
src_install() {
python_domodule youtube_dl
dobin bin/${PN}
dodoc README.txt
doman ${PN}.1
newbashcomp ${PN}.bash-completion ${PN}
python_fix_shebang "${ED}"
}
|
mark-kubacki/ossdl-overlay | d5282719fd5ea84f9100502114016d70ba43d5b8 | dev-libs/thrift - Add sys-devel/bison version dependency | diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
index 576473d..051fda5 100644
--- a/dev-libs/thrift/Manifest
+++ b/dev-libs/thrift/Manifest
@@ -1,4 +1,4 @@
DIST libtool-2.4.tar.xz 852248 SHA256 afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae SHA512 6b706656cbe8a18d9b377b913d7430984abe4bcff1db1bfba3e32e7eff38eca433cd95a507f8aafd96daf28e6426eed14c98fcdb79bae63d56c93503d107b4df WHIRLPOOL 1330996e0a30dcb187eedc88a4548fab11f0585e4a30774572e65b9fde02502fc0c032c3c342ccb0bcf2fd4b895f1ea2c17c81c1f5f4c2f7b5a1b8dfe6a52ef8
DIST thrift-0.9.2.tar.gz 8053046 SHA256 cef50d3934c41db5fa7724440cc6f10a732e7a77fe979b98c23ce45725349570 SHA512 477717138c59815bddc6524bb311a2f78b20967295f23efa4612da3c2dd35eb3d4d7b4f2222c1897800a5747b29c6d8c01ad5462220af26c490f93785559541d WHIRLPOOL 30d4c1c09a528d04c3088eb918aea310835105a5d4b48bc7a4f8f90a3738674d19f55240192a66095d561d4e732f965a4487d3464e1ef1c26708b02b1b54b174
-EBUILD thrift-0.9.2.ebuild 1665 SHA256 f9f8f7c81dee0862fa9e56c281731fc26bfbb188fbc03c76a8f2777646fffa94 SHA512 ff4710cad79b14fee055b9035032337bc0e40a3ec9de7a2d0b2c9fcfc9ad45fb49c9e1ed4cba14e2ce4e42f3aec55a38d4fcd80975235da9316d42e57d30c21a WHIRLPOOL 5a62367c7802decf367ac01797d5d6f5bc194fdbfbf3691a9e535215f3556d6d3e8f0598176fcd501ea2ffc1c2fb68ba8fbea6a19bd93e4a1bb2242eb982256b
+EBUILD thrift-0.9.2.ebuild 1688 SHA256 c6bcec60f6f49a5dc3169acf87bcee1eb5c682a242ff4c83b5ff0f7a0525d31c SHA512 96356ec1d5a2463774e585d8f516b6f7380f4124671cca2e1b3db39dad952a4e4d4194926a463543c4532151733211f884eedd3ae0016c390c44ad479a8bdd39 WHIRLPOOL a5d2182c7a98a259eba42629c67d719c0fc93a368c742eae07f572137103b641a8758125d0b32f780a2fc539dc57b34f4732e0faac968fd61189d3cd5018ceeb
EBUILD thrift-0.9.9999-r1.ebuild 2770 SHA256 5609ba9f8388ecac32129cbeb122c5e1e0f0d3fdaa2969f50181b49c308c2a8f SHA512 a7f2cb2135a81d257afce7731be5b26e019f9f907ae6909acaa3a15e4de799836377784a49f3d0258eccd24f81f8a38f81ba0468b5d7c20039a2ac6c97b8cf4c WHIRLPOOL b59b407a7f6dac03686ac7a0b4abc4507e113d72754c1a2e45e68fbf60b0bd8e1857584203c5454b604ec8bcc592909df6af80047aaa3c3cd72eb524d1e93a76
diff --git a/dev-libs/thrift/thrift-0.9.2.ebuild b/dev-libs/thrift/thrift-0.9.2.ebuild
index 960cf90..e334e41 100644
--- a/dev-libs/thrift/thrift-0.9.2.ebuild
+++ b/dev-libs/thrift/thrift-0.9.2.ebuild
@@ -1,80 +1,81 @@
# Copyright 2012-2014 W. Mark Kubacki
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="3"
inherit flag-o-matic
DESCRIPTION="Data serialization and communication toolwork"
HOMEPAGE="http://thrift.apache.org/"
SRC_URI="mirror://apache/${PN}/${PV}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
IUSE="+pic cpp c_glib csharp java erlang python perl php php_extension ruby haskell go"
RDEPEND=">=dev-libs/boost-1.40.0
virtual/yacc
sys-devel/flex
dev-libs/openssl
cpp? (
>=sys-libs/zlib-1.2.3
dev-libs/libevent
)
csharp? ( >=dev-lang/mono-1.2.4 )
java? (
>=virtual/jdk-1.5
dev-java/ant
dev-java/ant-ivy
dev-java/commons-lang
dev-java/slf4j-api
)
erlang? ( >=dev-lang/erlang-12.0.0 )
python? (
>=dev-lang/python-2.4.0
!dev-python/thrift
)
perl? (
dev-lang/perl
dev-perl/Bit-Vector
dev-perl/Class-Accessor
)
php? ( >=dev-lang/php-5.0.0 )
php_extension? ( >=dev-lang/php-5.0.0 )
ruby? ( virtual/rubygems )
haskell? ( dev-haskell/haskell-platform )
go? ( sys-devel/gcc[go] )
"
DEPEND="${RDEPEND}
>=sys-devel/gcc-4.2[cxx]
+ >=sys-devel/bison-2.5
c_glib? ( dev-libs/glib )
"
S="${WORKDIR}/${P/_beta[0-9]/}"
src_configure() {
local myconf
for USEFLAG in ${IUSE}; do
myconf+=" $(use_with ${USEFLAG/+/})"
done
# This flags either result in compilation errors
# or byzantine runtime behaviour.
filter-flags -fwhole-program -fwhopr
econf \
${myconf}
}
src_compile() {
if use cpp; then
# -jx fails for x > 1 with use cpp
emake -j1 || die "emake install failed"
else
emake || die "emake install failed"
fi
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}
|
mark-kubacki/ossdl-overlay | 3bc8b42f673a29c08af5415987a7beeb79622fb7 | sys-devel/gcc-5.0_alpha20150111 | diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 74a9926..4eb5ead 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,17 +1,17 @@
AUX awk/fixlafiles.awk 7807 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c073e5c29433c3cdf9c5c SHA512 a39e09db4f34d1358de9e929b4c1e10b677d7e8aeffd6afb36d42543b18f1dfa77e3e26331e3fa1b556bae3d8c75ab4bd5796c7ccf2dda4eb365edb307828bed WHIRLPOOL 0cb6e5e96460514c17f3242d8fe936dc2545c07ca08c03ceb34730935435fde24d197300da54d4a19de86067f9e4bbc14178da2f7c03f4be57c89c81307f5d82
AUX awk/fixlafiles.awk-no_gcc_la 8596 SHA256 91e36c29133b6ff854bc84acd6cd2e9d07be6eaa73ef9b23e4f7bc6371107fab SHA512 a970ade3e0b57b3280dd01036a95338c4a7f0c7ec45e7aeb7255197df43e13a5fad8c565b4b345e3a0c8326f71ae7ab598b804eaeaa9d59eda8683195bccfe45 WHIRLPOOL e3da866b8902fbf639af545b43c3b6ccaca0f5d543647007f02e0b8bfc16a675463b8681e9fad11d6ce29517e099636f43708f880ef7a433e4578ee408c3b099
AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
AUX c99 446 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5 SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 WHIRLPOOL b888038b96615c7a0363555b407a3de2c1f17e34428fa16dfbf56fcf68875d6bcdecbc61b545d7f71842ff1909a3ffeff17165fa7f56b48f95adae22f5f8bff1
AUX fix_libtool_files.sh 1679 SHA256 0037e3f1303560f1ffadc61c7ed6bca13a41d6f2f70f196276938cda9dd158f0 SHA512 834beeb04f1057a0b1f79025fc9bbe0193ea8457055cc10b5b4c528a60e37ead7614a686aa6e7285e040161a91d4b5ff394539a33fc2f4b44be5c2514d0bb283 WHIRLPOOL c7e2f517e0c5c9a8930cd615f68222b44a6f227518ea71b5eb9b6436e1642be748d9cb4c0732f27df6c2ded2eb2c758d67ee9cb58e409f30814f988523dc649b
AUX gcc-configure-LANG.patch 2052 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 WHIRLPOOL 3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 WHIRLPOOL 39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb
DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad
DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
DIST gcc-4.9.2-patches-1.0.tar.bz2 18213 SHA256 e4e9a665381beb4018779a14d5124528a9d5df0e0772f3b7639390d6bda51515 SHA512 27deba0db6a500b160829fdcf5fc9a70be4b4fbd45c89d18dd2d0808d42803657693d0ed0f2b664e020a0d2ac39cdfe550e397eb4c2a6f64220cae1e7a16ff20 WHIRLPOOL 7e04ed92038f19a9b00fe0022c2c7ce3df8621fccca95cb2da37333a5edcc0857efe96aed68f5c4b51db19ecd23ec1194412f1bc24730cea30db7b342c12dfdf
DIST gcc-4.9.2-piepatches-v0.6.1.tar.bz2 14185 SHA256 590d11ea5723812fff3239c5eaed4b040b26a92586de0e42a84438f742eaac0b SHA512 89560e96bc205e848936acc4d3423ff5e1ea5ee478848edfe2b992585cea0df21eb102b1f1bee55c10568d4ca54bb3f4e8ae72aa695e34a908abfda3585fb992 WHIRLPOOL e6db4a2e5fdf762bd4f0fa70d630499bf6789a0c3b7ca193b455bb22f95f5f2983358ba9f28bd85b571a3a44a691ca797762302a1f2ea63ce170752f7e44128b
DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
-DIST gcc-5-20141207.tar.bz2 88526207 SHA256 2e9e0b678c0b690ea70c935d44172b2fcca44b30fb939b71d56e393f16d1f047 SHA512 b9f4ad0ec44d6fd2ce59fce2b6ed30a6c4922281e26cf5c590d5fb471c59c9b3bab03a88271c3c5d8f159eb8b8949cc1d7e59406f1df1a4ecf42ebe497e527c8 WHIRLPOOL 949494393e25f45b1ee01d8a12d69a42e182c6167b20d8310945ff0f61932b5f600848332b0e82fba6966e54c2a7cac34d93765001ee95812a37bbee2d0d3231
+DIST gcc-5-20150111.tar.bz2 89084324 SHA256 0b074c73f68cf824042ecdc5a047b2fc237665c677a327b1712488cefa5c4860 SHA512 0dc92dc1527cc0a76e558933ecd9a80331aa85e7862ff94272da68905c97b153e81795614b7c52a08a506f44e025225bd5abfe3d1d4d08980d6916ec82840acf WHIRLPOOL a458acc70b74e6b0235333a7cf13556accb2b2bee645a6b686b50b83a3a1760cff4eade684efd8c8ab89cc0527c6e1d609381c4b326ed8e0e9fe4bc15623b016
EBUILD gcc-4.9.2.ebuild 1343 SHA256 801f1cc98b27dfcfd1cfcb112c82131ed12f700595403ad76adeeec76f0a7b1e SHA512 12351ae88d87b7b3602f42c8e236965746708726a1bf4d22f4f95301cb62b564e696287ce1c5cf8914024734ebb54e01e28a210981d27dc3646485a9c499535f WHIRLPOOL 49e59732de3bc456a3ea673d399d277945aafe07a0c7b3385e1a5138ae640ef41fe6c94b0adaeb07ca86efae73eb5f943bd3d2a46077a3ce7d2f051cc971c10f
-EBUILD gcc-5.0_alpha20141207.ebuild 1298 SHA256 2d30c025325aef1e42804dad4769c254dfccfbef425346ed067adeb00b0b855b SHA512 55d552af87ff9c5ede5874e6dafb87dc058ffeeb092ed81c3879f2320035d8041794663fd271ffdf2566b8aed70665299f3c80fecc78e59507076a779e849ff3 WHIRLPOOL 3e4c205327325f9da7fc5b4dc7e81fd33961999f6adc93d288c5d177f40a0bfe9b1fcaa1b47a4c7d9fbb2e4da70601d167ffe6df0c3d11ec1750f89475c8f621
+EBUILD gcc-5.0_alpha20150111.ebuild 1298 SHA256 2d30c025325aef1e42804dad4769c254dfccfbef425346ed067adeb00b0b855b SHA512 55d552af87ff9c5ede5874e6dafb87dc058ffeeb092ed81c3879f2320035d8041794663fd271ffdf2566b8aed70665299f3c80fecc78e59507076a779e849ff3 WHIRLPOOL 3e4c205327325f9da7fc5b4dc7e81fd33961999f6adc93d288c5d177f40a0bfe9b1fcaa1b47a4c7d9fbb2e4da70601d167ffe6df0c3d11ec1750f89475c8f621
diff --git a/sys-devel/gcc/gcc-5.0_alpha20141207.ebuild b/sys-devel/gcc/gcc-5.0_alpha20150111.ebuild
similarity index 100%
rename from sys-devel/gcc/gcc-5.0_alpha20141207.ebuild
rename to sys-devel/gcc/gcc-5.0_alpha20150111.ebuild
|
mark-kubacki/ossdl-overlay | a1543463c21a39ad6f908c4f23dc4997f9287225 | dev-php/hhvm-3.4.2 | diff --git a/dev-php/hhvm/Manifest b/dev-php/hhvm/Manifest
index b625bfc..73d115d 100644
--- a/dev-php/hhvm/Manifest
+++ b/dev-php/hhvm/Manifest
@@ -1,6 +1,6 @@
AUX hhvm.confd-r4 1024 SHA256 53bfbbcbd90719d58e5c1ff483213d4f218816d0d9e3a29612eee95194209c06 SHA512 459d749db56fe03630bc5e8996c8b3b10dc083e092b86e0912d7172de09b2ea673fd67f57c1c2362270e965cc48539e256b8191fbeb9f1771197b4a9bbb55188 WHIRLPOOL e1fcb4914f2573bb1e78f8069ba4691cc7a2f4cac8bc6e8ce2c125004ae70dda609ea5a57d129e7094a810faf3387a45cc1769ab86ad98176da68191f2ab919c
AUX hhvm.initd-r4 3044 SHA256 399a9c8f67321dcd9381cf683f65116ed9d6bb4470ca19671e42315d466cb9b2 SHA512 3dcbd35e5b872e5d2d4357d32f41e48e8f3af9077372867290eb59c8c7cf57431b46b9f306ff187268c4d0c8470901c1c655c42b68983cb4bd667eab5926574f WHIRLPOOL 6fd8fbae0bbd87c7758c9503728945b2f75f2ad195a68aaf237576ac9582f36b938edb6876566f3e99aa53a5763f438eb74354c4caa3d68d091e6cc75e4365da
AUX hhvm.logrotate 147 SHA256 3b521ae4ec20b2a9c5acca1b974e3e116008a68cd2a67407fa14818a013eb3fd SHA512 ff4139f3a43436b37f191cc8e4873af646ab40cf4b9fd590c0a3d880b785183fa3efe9ae049362ceaf3c471c0fabedfd212c45aa12aa553c6acbfb33d7e1be96 WHIRLPOOL 57070dc9c3f0aae66824d37683a23163727f497f9c42e0b2ef9ac50973559e67ccda1d4035052d76d33caf41a11be5d1046364580b755ae76caff5a5d90efce0
AUX php.ini 1701 SHA256 f758dae7cd5374bd415d573a9e3ce859fd4f0e8d5910cb105138a591147fd5c2 SHA512 a91dc3073da4ea1c54af9bcd23c8356b32c2660943ab9a04ef3a3296767a0e33f1f586978ed139009fc14ed84771d544f39ef968f0ffac366898bb181999074f WHIRLPOOL 194feb161cc808b519a9981b5b098b3f8f6605855ef0d13e01c9316b0414c96c80c945edd8e60ec36e306167e940286e2cd8cc7936765b6e896ad935e2f7e083
AUX server.ini 296 SHA256 1deba06d5533178f026993d7f41703b19df2ba88ce623d675802a9cb7e8f8d77 SHA512 88682f8e903256db0bdea362e86e56d9d34f0a27ac5a269adaaf2efff0f2ca1c0275c039ad40de0a8489a6e3ca7e6e78cab27d3e87ab0ed1bb0029884129678c WHIRLPOOL 350f6d67f8847e31e2289d4ee5deec20cb88c23f56659de8cbe4573a66f809f3be4206d1d19694276f43b99ac43a8c09f2bbc5ed5598dfa6cebfb26f4b036182
-EBUILD hhvm-3.4.0.ebuild 4217 SHA256 33a5e3c651d9be38aefd0bda62fc9f9f404f8ef6c88a606b3a2b5d35360ad94d SHA512 1f26e2d5b52aa3bd72d518d6d9574f52e566f2d5329b9be444f23db78804fd014fa2af88116c43fe3ad557259892d56ed8151855903ca83cdb3fa17406dbe0ca WHIRLPOOL d0faedfd769043a1f3e914913d59a86600e752eba49c8a6c06e884db1a77208d9d67ddd473bd2608432be076e72514259ba0be4010dbe15e67e9e4ae36385b27
+EBUILD hhvm-3.4.2.ebuild 4252 SHA256 fe3d6e7cba8ce9a4b26319d8fdd25bb0a2b7af8a06c7f2f77ef23c5dffc1d18f SHA512 d16d866be8734758c5baa928fe1de61262eed95388e8b5311273a987fa3d11d051457605ca1204c33c46219346d418317f55cec6e6e922686ca38405bd836880 WHIRLPOOL db0dadca04c110a81007a147f1343a71a5630227d0f102ed625627c90cf99ffd870905a8a9b4abf2c94212bee508c2a4052da6c4bec8d97934e37a5d6c34586e
diff --git a/dev-php/hhvm/hhvm-3.4.0.ebuild b/dev-php/hhvm/hhvm-3.4.2.ebuild
similarity index 98%
rename from dev-php/hhvm/hhvm-3.4.0.ebuild
rename to dev-php/hhvm/hhvm-3.4.2.ebuild
index b077c9b..0f9d595 100644
--- a/dev-php/hhvm/hhvm-3.4.0.ebuild
+++ b/dev-php/hhvm/hhvm-3.4.2.ebuild
@@ -1,157 +1,158 @@
-# Copyright 2014 W. Mark Kubacki, Vadim Borodavko
+# Copyright 2014â2015 W. Mark Kubacki, Vadim Borodavko
# Distributed under the terms of the OSI Reciprocal Public License
EAPI="5"
inherit eutils flag-o-matic git-2 user versionator
DESCRIPTION="Virtual machine designed for executing programs written in Hack and PHP."
HOMEPAGE="http://hhvm.com/"
SRC_URI=""
LICENSE="PHP-3"
SLOT="0"
KEYWORDS="amd64 -x86 -arm"
EGIT_REPO_URI="git://github.com/facebook/hhvm.git"
EGIT_BRANCH="HHVM-$(get_version_component_range 1-2 )"
EGIT_COMMIT="HHVM-${PV}"
IUSE="cotire debug devel +freetype gmp hack iconv imagemagick +jemalloc +jpeg jsonc +png sqlite3 +webp xen yaml +zend-compat"
DEPEND="
>=dev-libs/libevent-2.0.9
>=dev-libs/libzip-0.11.0
>=dev-libs/oniguruma-5.9.5
|| ( >=dev-db/mariadb-10.0 virtual/mysql )
freetype? ( media-libs/freetype )
gmp? ( dev-libs/gmp )
hack? ( >=dev-lang/ocaml-3.12[ocamlopt] )
iconv? ( virtual/libiconv )
imagemagick? ( media-gfx/imagemagick )
jemalloc? ( >=dev-libs/jemalloc-3.5.1[stats,no-prefix] )
jsonc? ( dev-libs/json-c )
jpeg? ( virtual/jpeg )
png? ( media-libs/libpng )
sqlite3? ( =dev-db/sqlite-3.7* )
webp? ( media-libs/libvpx )
yaml? ( dev-libs/libyaml )
dev-cpp/glog
dev-cpp/tbb
dev-libs/elfutils
dev-libs/expat
dev-libs/icu
dev-libs/libdwarf
dev-libs/libmcrypt
dev-libs/libmemcached
>=dev-libs/libpcre-8.35[jit]
dev-libs/libxml2
dev-libs/libxslt
dev-libs/openssl
net-libs/c-client[kerberos]
>=net-misc/curl-7.28.0
net-nds/openldap
sys-libs/libcap
sys-libs/ncurses
sys-libs/zlib
"
RDEPEND="${DEPEND}
sys-process/lsof
"
DEPEND="${DEPEND}
>=dev-libs/boost-1.49[static-libs]
dev-libs/cloog[static-libs]
>=dev-util/cmake-3.0.2
media-libs/gd[jpeg,png,static-libs]
>=sys-devel/gcc-4.8[cxx(+),-hardened]
sys-devel/binutils[static-libs]
sys-devel/bison
sys-devel/flex
sys-libs/readline[static-libs]
+ sys-libs/zlib[static-libs]
"
# for DEPEND run:
# for LIB in $(ldd $(which hhvm) | cut -d ' ' -f 3 | grep -F / | sort -u); do q belongs "${LIB}" | cut -d ' ' -f 1; done | sort -u
pkg_setup() {
ebegin "Creating hhvm user and group"
enewgroup hhvm
enewuser hhvm -1 -1 "/var/lib/hhvm" hhvm
eend $?
}
src_prepare() {
git submodule update --init --recursive
filter-flags -ffast-math
replace-flags -Ofast -O2 # or compilation will fail
# output is not humanly readable without this:
if [[ $(gcc-major-version) -gt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 9 ]] ); then
append-flags -fdiagnostics-color=always
fi
# GCC 5.0 with CXX will complain about too few registers without this
if [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 0 ]]; then
replace-flags -O[3-6] -O2
fi
# HHVM's dependencies need this when statically compiled, which is desirable
append-flags -pthread
# PR#4342, dependencies already guarantee that PCRE works
sed -i \
-e 's:find_package(PCRE REQUIRED):find_package(PCRE):' \
CMake/HPHPFindLibs.cmake
# use the already installed PCRE
sed -i \
-e '/^ pcre/d' \
third-party/CMakeLists.txt
rm -rf third-party/pcre
epatch_user
}
src_configure() {
econf \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_INSTALL_DO_STRIP=OFF \
-DCMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-DSTATIC_CXX_LIB=ON \
-DBoost_USE_STATIC_LIBS=ON \
-DCMAKE_EXE_LINKER_FLAGS=-static \
-DENABLE_ZEND_COMPAT=$(usex zend-compat ON OFF) \
$(use cotire && printf -- "-DENABLE_COTIRE=ON") \
$(use jsonc && printf -- "-DUSE_JSONC=ON") \
$(use xen && printf -- "-DDISABLE_HARDWARE_COUNTERS=ON") \
${EXTRA_ECONF} || die "configure failed"
}
src_install() {
emake DESTDIR="${D}" install
if use hack; then
dobin hphp/hack/bin/hh_client
dobin hphp/hack/bin/hh_server
dobin hphp/hack/bin/hh_single_type_check
dodir "/usr/share/hhvm/hack"
cp -a "${S}/hphp/hack/tools" "${D}/usr/share/hhvm/hack/"
fi
if use devel; then
cp -a "${S}/hphp/test" "${D}/usr/lib/hhvm/"
fi
newinitd "${FILESDIR}"/hhvm.initd-r4 hhvm
newconfd "${FILESDIR}"/hhvm.confd-r4 hhvm
dodir "/etc/hhvm"
insinto /etc/hhvm
newins "${FILESDIR}"/php.ini php.ini
newins "${FILESDIR}"/php.ini php.ini.dist
newins "${FILESDIR}"/server.ini server.ini
newins "${FILESDIR}"/server.ini server.ini.dist
insinto /etc/logrotate.d
newins "${FILESDIR}"/hhvm.logrotate hhvm
}
|
mark-kubacki/ossdl-overlay | 5176417d66e2333cf87b15287ed31fd7a261d18c | net-misc/nghttp2-0.7.1 | diff --git a/net-misc/nghttp2/Manifest b/net-misc/nghttp2/Manifest
index 2be7268..2694d28 100644
--- a/net-misc/nghttp2/Manifest
+++ b/net-misc/nghttp2/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Set-content-type-header-with-charset-for-.html-files.patch 2514 SHA256 39378f8b815ebc4ede87719b67fe8d1dafddc2226cf6194e530b623d94739da8 SHA512 9b05085272b929b71c47d05e0f1c7145676a8c5e247a908b7b60d45fc31c1c4aa22f2bacd9e3527c1e65687cfee6238f0bbce65329f79508cf1030665949171b WHIRLPOOL 1e748d8b5647971dda61428488dd7d0d02fe116cdaee6c2d9117ef530a158bacfdd36e2524a75f51b777a62e3f989322213f745f968159d3015f16fd86006384
DIST nghttp2-0.6.7.tar.xz 813524 SHA256 6cd748982f03c0039072c6a61c8dd88fe270ec34b826fb4591e5ed93f1a8376c SHA512 c22c25f98ec66cacf28b70f5d9d4b78dcf3d6d1f0037642cbd16f03e61c87e4637c53ca6d126a0817eeca31f2e94f0ea452d76328d5d463ea32769b31d982ebc WHIRLPOOL d23529c16113314fcd33393ea10446399c553e98587dec442ecc0a8802174738af46238f1b91061c45d1473f5e9a36449bdae3184c187b55bb96cd60c4b7929c
-DIST nghttp2-0.7.0.tar.xz 821656 SHA256 41765d7ed8a4790b674ac27ae5106006799de402c0f0427a71c40875e2971542 SHA512 2fc7076419353e1b45261100f9ec0878d0e3987364106f1df7851f1371fefdb64e87c18e34957c43508a2e245b60ac31f19754bfc465ffc86f87ef1cab7e3088 WHIRLPOOL a6cc6c82c5a6ef81e0b0946ef0522ff28672ab9e48f839b008e8c9cdba581d8e04682430a2d41610e30599273945f6886762385f16d4ccf3b86dee469d543523
+DIST nghttp2-0.7.1.tar.xz 821652 SHA256 0f37416e98477fc6b922a2630aea861bbe93a321ffb09462b121c4495a4dd7ab SHA512 323998c7385b035fd45cc28fd0bd949a8d5bca215793d0b9ae593e1976347a279253c6b77bb5e6a7554f1de5eb27e1c74c0ca38c865fd83b3793e8d49bd78ead WHIRLPOOL c77b9587485087b795a937e2c1e1f4e491e0199a2d42b3bf7136c851580c1b02102f80cf33e8ba1e0b71216c16b3b4d1a6d7b9d0fe429d54ee33c92b1553b141
EBUILD nghttp2-0.6.7.ebuild 1754 SHA256 a82f849bb8e91d3a23aa9405c0a78e201aab15dbde44beaede6564e4978e7335 SHA512 04868000ad2b577715da08c26a5be63b0c4a7573c96381eaeb60debcd12f4fcc09efa2697d6d838abac391d27e7e0983bcf951040170d9ade0f9cbb9867a87be WHIRLPOOL 9765195467e57004448ccfb574800d160be6f1b538a3b5c10722af077f800ef4cd4129ad242f26b3c9bc213e0a00f2fa17e7924f23a118790f0bd20c384ee151
-EBUILD nghttp2-0.7.0.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
+EBUILD nghttp2-0.7.1.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
diff --git a/net-misc/nghttp2/nghttp2-0.7.0.ebuild b/net-misc/nghttp2/nghttp2-0.7.1.ebuild
similarity index 100%
rename from net-misc/nghttp2/nghttp2-0.7.0.ebuild
rename to net-misc/nghttp2/nghttp2-0.7.1.ebuild
|
mark-kubacki/ossdl-overlay | 8af41ce419cb8fc07072689474ce9ebd0e9ff64e | net-misc/curl-7.40.0 | diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index cda02cc..557c647 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,12 +1,12 @@
AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5
AUX curl-7.34.0-deselect-weak-ciphers.patch 2242 SHA256 059ed102b05d69b8863a5cefaa1406b1528d55cd0f27351b87dc410f4674a87d SHA512 1637bb248385573f91126badc66750573434f71e457b4366d311ef29c885a2f58b95f69445377e8ce6ce173e9558d4cf85641284dc26ea8c17530afbfdee9ec8 WHIRLPOOL 7ab89485f696155d50c18026fab5176a6422c6917e190af5fada4bd546c8e15ce7a1e017c50f2f35181c228679c1dfc23452ee55a819b22626265bbccc9122e4
AUX curl-7.34.0-fix-ipv6-failover.patch 960 SHA256 8907994a7fbae7e652f33a4c6a04a1dbc73cf992d8495e21b79e7dd224191e99 SHA512 be345aaa8d9cc044957c0aadcb1b5348911055227593f9df53bca3e8a6dad16abe73f4b7a1c161c3bb3b2f1196691e14b6e69115ad78aa8c61d71d77aa6b66ed WHIRLPOOL fc6c2d66933e066ea4e0921fc4dd4d2e8a8bf83324976effc7913d8dfeced75263d4980d90bc2e52ce0111c26462fff2cdb464ff7ea45b71fcf9a955e4ed39cd
AUX curl-7.35.0-deselect-weak-ciphers.patch 954 SHA256 a0961cc94dc2213ef87f5cbfc62471d797404c05eb1830e5e940b2232d64696f SHA512 9f4eafd3e849ebe3937894c760dfcc4d4cba7527eabf40b58eaa7d197a0a88785db634a7511c49fe17226d9ea4052ac424f6d770f3393845ffa3d21ea3a6f172 WHIRLPOOL 902e8efcf4e3a24edcd850af18f0f332464371b3c3683aceba186709d397e4bc654623de46ed073f482f93c26b8666509782eec5a95038315a8647651c3c4e2e
AUX curl-7.36.0-demote-weak-ciphers.patch 917 SHA256 d1958b32b8c932a921ca46a50d30f5d5fd8585bb1afe22d14ee00b3e265a8dac SHA512 cd30f3df6a71fe76dcd22aa400e0592e5760399480f715721eaa7f5adf565663652f32d15c691c85c85f9177212488a2acb4ade5577a8011a250417f872f4f08 WHIRLPOOL 53b5bdf841a6b546af7282e07bdcfc14db1523fa3daf0f0cf57f179fa3681742a3abdcbda465be8ab708b7d37f470ba7ea4013a07ee2eaf92f871a118bb5c128
AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548baec4d392e2d7bb059a7551b5f65d7 SHA512 49810a5bc4554a694d4c684aaa400d791098d50a14b0d5146c762e83ea25f18408d1e3382e3d26d76b19785c1ac0314c346e74d6bb37a408489d22243fbae9dd WHIRLPOOL b98e37de05cfe75c7be84712f641a9968528cb7f060462381031d8187e3d47cf183d87481b29ac63df8f22afd18d7ed49c89079e842acdd7c199350aaf70e8fe
AUX curl-7.38.0-openssl-detect-rsa-dsa-dh.patch 1871 SHA256 3c8ac887bb3e233b5cf00dc7bf16d4fa84374823b7c96d1b68f75f6a1ff7e46b SHA512 ad274e4c9b905112d11686a039cb7d59199ce44f231bc5a0f02bc943976e5da5f11766ee9b580e3c206d617145f3106594ec702b04ed303531636e9120bc93fc WHIRLPOOL 9b4c5ae590aa7d73264cb07c7ab37324b88895609e4e10f17e33560080d50ec4e53b981e06e53ebfc5cb2164b0c6d246bceef872d8eba74a175a09403f4271d7
AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
AUX pre/7.37.1-compile-with-latest-nghttp2.patch 6317 SHA256 c4a9daf32fa2c79cd251da0281ea786271657aea23e81a97e3af1288fac12db5 SHA512 3bbe23b9335b9b8f0a262c75794c4e237e95d4d73e369d25fa4dd1d355a1cc37b83288aeb04ffd76500b14b6ab2f521204fffc77b958a85e5563a97e45549ece WHIRLPOOL 977514736d973002714fc970fcf35ff6e3c9807aea4d53fa243ccc55fb1430170803e64de26edd077fb774979f375b12088ef4daf8e9855a366dcab578929e20
-DIST curl-7.39.0.tar.bz2 3241619 SHA256 b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0 SHA512 9d82e29c0b40530080c62bc3b81e729092b6de0dc3551e709ab1e65cb451259a5380f155fc911664ef523f57ea4be80bb27b330b720ad9a8bc3d9b967bdc3fd2 WHIRLPOOL 05fe3cd33a7716f88b63d3f3d8e9da49dec166cb42064d52ec2a182f68e792e83dd16d53edd1cd1b996a5f262faed1e1163197e1c3f717827859bd73e1570c36
-EBUILD curl-7.39.0.ebuild 7245 SHA256 80bde4fbf3132dcd0879f6091b248b1e7d92044838056a6cc73222ae064efa72 SHA512 d59a479957e2579b8fe698c2f3304aa5aae6de89a2279b1c63425475721bb5cb33c62e1d0f0f7ce62960c24db67fa2b23afdb9e9eeb62b4a00008b92cd80aa91 WHIRLPOOL 5004e3aec6226ec0e59ae5cde476546dc5b7fcb376f87cbcdd04e60fa21d971299338de72bd8693a76624f09b0b9b6ff8ccce60aa355255ec09ee54052c570fb
+DIST curl-7.40.0.tar.bz2 3266944 SHA256 899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba SHA512 4d1cd0aa0c4fd9f14559e2824389ed42222a456c268e92107ef4d3257af76d64e5a8f69e9a3fccb9d4c9ae232426ee8f8f58f7d2eaa3db789dfa4d919cf229a3 WHIRLPOOL 5e3f9038696d7476e76b1a848766a2068f20c6aa0392d4018e2d90529914a059b771d66937bbe28697925acaf96a2025eba77e4af9b331ab66ee1323cf079678
+EBUILD curl-7.40.0.ebuild 7245 SHA256 80bde4fbf3132dcd0879f6091b248b1e7d92044838056a6cc73222ae064efa72 SHA512 d59a479957e2579b8fe698c2f3304aa5aae6de89a2279b1c63425475721bb5cb33c62e1d0f0f7ce62960c24db67fa2b23afdb9e9eeb62b4a00008b92cd80aa91 WHIRLPOOL 5004e3aec6226ec0e59ae5cde476546dc5b7fcb376f87cbcdd04e60fa21d971299338de72bd8693a76624f09b0b9b6ff8ccce60aa355255ec09ee54052c570fb
diff --git a/net-misc/curl/curl-7.39.0.ebuild b/net-misc/curl/curl-7.40.0.ebuild
similarity index 100%
rename from net-misc/curl/curl-7.39.0.ebuild
rename to net-misc/curl/curl-7.40.0.ebuild
|
mark-kubacki/ossdl-overlay | aeb6609ceef17497ed2bad14f095d0db39df590a | net-misc/nghttp2-0.7.0 | diff --git a/net-misc/nghttp2/Manifest b/net-misc/nghttp2/Manifest
index 7bb6326..2be7268 100644
--- a/net-misc/nghttp2/Manifest
+++ b/net-misc/nghttp2/Manifest
@@ -1,2 +1,5 @@
+AUX 0001-Set-content-type-header-with-charset-for-.html-files.patch 2514 SHA256 39378f8b815ebc4ede87719b67fe8d1dafddc2226cf6194e530b623d94739da8 SHA512 9b05085272b929b71c47d05e0f1c7145676a8c5e247a908b7b60d45fc31c1c4aa22f2bacd9e3527c1e65687cfee6238f0bbce65329f79508cf1030665949171b WHIRLPOOL 1e748d8b5647971dda61428488dd7d0d02fe116cdaee6c2d9117ef530a158bacfdd36e2524a75f51b777a62e3f989322213f745f968159d3015f16fd86006384
DIST nghttp2-0.6.7.tar.xz 813524 SHA256 6cd748982f03c0039072c6a61c8dd88fe270ec34b826fb4591e5ed93f1a8376c SHA512 c22c25f98ec66cacf28b70f5d9d4b78dcf3d6d1f0037642cbd16f03e61c87e4637c53ca6d126a0817eeca31f2e94f0ea452d76328d5d463ea32769b31d982ebc WHIRLPOOL d23529c16113314fcd33393ea10446399c553e98587dec442ecc0a8802174738af46238f1b91061c45d1473f5e9a36449bdae3184c187b55bb96cd60c4b7929c
+DIST nghttp2-0.7.0.tar.xz 821656 SHA256 41765d7ed8a4790b674ac27ae5106006799de402c0f0427a71c40875e2971542 SHA512 2fc7076419353e1b45261100f9ec0878d0e3987364106f1df7851f1371fefdb64e87c18e34957c43508a2e245b60ac31f19754bfc465ffc86f87ef1cab7e3088 WHIRLPOOL a6cc6c82c5a6ef81e0b0946ef0522ff28672ab9e48f839b008e8c9cdba581d8e04682430a2d41610e30599273945f6886762385f16d4ccf3b86dee469d543523
EBUILD nghttp2-0.6.7.ebuild 1754 SHA256 a82f849bb8e91d3a23aa9405c0a78e201aab15dbde44beaede6564e4978e7335 SHA512 04868000ad2b577715da08c26a5be63b0c4a7573c96381eaeb60debcd12f4fcc09efa2697d6d838abac391d27e7e0983bcf951040170d9ade0f9cbb9867a87be WHIRLPOOL 9765195467e57004448ccfb574800d160be6f1b538a3b5c10722af077f800ef4cd4129ad242f26b3c9bc213e0a00f2fa17e7924f23a118790f0bd20c384ee151
+EBUILD nghttp2-0.7.0.ebuild 1838 SHA256 2ada6951a6c26afda0bcba604ac5eeef4d51eba95b285dcf3660c49822f6f03e SHA512 b2fbc8afc2494ac6e23a8a01051d4fa590d1b67a7b47a65c881fe3ff7452b7da218a16cfbf333db2b585c6d3957f4109d95e1056343d1a51c69a171bca01fcac WHIRLPOOL e400973fd922a07a4c0c3777a6681a7c45bb7a99bb652ce7274562cda6c4b80a9f25a7fbd297feb46412701e64454cc93372709d5905e2a93b5df7e22b4f9271
diff --git a/net-misc/nghttp2/files/0001-Set-content-type-header-with-charset-for-.html-files.patch b/net-misc/nghttp2/files/0001-Set-content-type-header-with-charset-for-.html-files.patch
new file mode 100644
index 0000000..5a3f41c
--- /dev/null
+++ b/net-misc/nghttp2/files/0001-Set-content-type-header-with-charset-for-.html-files.patch
@@ -0,0 +1,64 @@
+From 3e4a94a92d604c16102c8d0daee2d17155575050 Mon Sep 17 00:00:00 2001
+From: W-Mark Kubacki <[email protected]>
+Date: Sat, 10 Jan 2015 15:11:39 +0100
+Subject: [PATCH] Set content-type header with charset for .html files.
+
+This enables correct rendering of such files containing UTF-8 runes.
+---
+ src/HttpServer.cc | 7 ++++++-
+ src/HttpServer.h | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/HttpServer.cc b/src/HttpServer.cc
+index b9b404d..b5e495c 100644
+--- a/src/HttpServer.cc
++++ b/src/HttpServer.cc
+@@ -673,6 +673,7 @@ int Http2Handler::verify_npn_result() {
+ int Http2Handler::submit_file_response(const std::string &status,
+ Stream *stream, time_t last_modified,
+ off_t file_length,
++ const std::string path,
+ nghttp2_data_provider *data_prd) {
+ std::string content_length = util::utos(file_length);
+ std::string last_modified_str;
+@@ -683,12 +684,16 @@ int Http2Handler::submit_file_response(const std::string &status,
+ http2::make_nv_ll("cache-control", "max-age=3600"),
+ http2::make_nv_ls("date", sessions_->get_cached_date()),
+ http2::make_nv_ll("", ""),
++ http2::make_nv_ll("", ""),
+ };
+ size_t nvlen = 5;
+ if (last_modified != 0) {
+ last_modified_str = util::http_date(last_modified);
+ nva[nvlen++] = http2::make_nv_ls("last-modified", last_modified_str);
+ }
++ if (nghttp2::util::endsWith(path, ".html")) {
++ nva[nvlen++] = http2::make_nv_ll("content-type", "text/html; charset=UTF-8");
++ }
+ return nghttp2_submit_response(session_, stream->stream_id, nva, nvlen,
+ data_prd);
+ }
+@@ -999,7 +1004,7 @@ void prepare_response(Stream *stream, Http2Handler *hd,
+ }
+
+ hd->submit_file_response(STATUS_200, stream, buf.st_mtime, buf.st_size,
+- &data_prd);
++ path, &data_prd);
+ }
+ } // namespace
+
+diff --git a/src/HttpServer.h b/src/HttpServer.h
+index 87d3296..8f88e7b 100644
+--- a/src/HttpServer.h
++++ b/src/HttpServer.h
+@@ -104,6 +104,7 @@ public:
+
+ int submit_file_response(const std::string &status, Stream *stream,
+ time_t last_modified, off_t file_length,
++ const std::string path,
+ nghttp2_data_provider *data_prd);
+
+ int submit_response(const std::string &status, int32_t stream_id,
+--
+2.0.4
+
diff --git a/net-misc/nghttp2/nghttp2-0.7.0.ebuild b/net-misc/nghttp2/nghttp2-0.7.0.ebuild
new file mode 100644
index 0000000..1b3ed46
--- /dev/null
+++ b/net-misc/nghttp2/nghttp2-0.7.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2014 W. Mark Kubacki
+# Distributed under the terms of the OSI Reciprocal Public License
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic autotools python-r1
+
+DESCRIPTION="Implementation of Hypertext Transfer Protocol version 2 in C"
+HOMEPAGE="https://nghttp2.org/"
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/${PN}.git
+ git://github.com/tatsuhiro-t/${PN}.git"
+ EGIT_MASTER="master"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ RESTRICT="primaryuri"
+fi
+
+LICENSE="MIT"
+SLOT="0/16" # as in h2-16
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="+alpn +apps +examples python +spdy test +xml"
+
+REQUIRED_USE="xml? ( apps )
+ alpn? ( apps )"
+RDEPEND=">=dev-libs/jansson-2.5
+ apps? (
+ dev-libs/jemalloc
+ dev-libs/libev
+ xml? ( >=dev-libs/libxml2-2.7.7 )
+ >=dev-libs/openssl-1.0.1:=
+ alpn? ( >=dev-libs/openssl-1.0.2_alpha:= )
+ >=sys-libs/zlib-1.2.3
+ )
+ spdy? ( net-misc/spdylay:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/cython-0.19
+ )"
+DEPEND="${RDEPEND}
+ >=dev-util/pkgconfig-0.20
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-util/cunit-2.1
+ )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ else
+ default_src_prepare
+ fi
+
+ epatch "${FILESDIR}"/0001-Set-content-type-header-with-charset-for-.html-files.patch
+ epatch_user
+
+ replace-flags -O* -Os
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable apps app) $(use_with apps jemalloc) \
+ $(use_enable examples) \
+ $(use_enable python python-bindings) \
+ $(use_with spdy spdylay) \
+ $(use_with xml libxml2) $(use !xml && echo --disable-xmltest --without-libxml2)
+}
+
+src_test() {
+ # tests can be parallelised, using emake
+ emake check || die "test failed"
+}
|
mark-kubacki/ossdl-overlay | 24a79d4e9f0a8fe73ac3299bb975b65f1fb50ed6 | dev-libs/openssl-1.0.2_pre20150110 | diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 0d5004a..e92f65a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,18 +1,18 @@
AUX 0001-Add-RAND-engine-for-Linux-syscall-getrandom.patch 7246 SHA256 6f67d97fe7ffd63b20bb80d387c852eb41dce44be62177a51fe36be20e9ad0fd SHA512 a4860b4db56c1225ef401db2881b68eaccb674185718a9070694fb21ef1a8d8949bfa58436a9e68da3f17d7eb361fab5109fe8cf79526629dd93a149fcafffe7 WHIRLPOOL b1d08b6b4796e4d9c2a072c7f014f25262242bdc2c2610c27aace413fac52d245be42a42c2b7c7f48614dfc44e29816a925162bd7a6e34be6e67dac96f265ba0
AUX 0001-Disable-RC4-for-TLS-v1.1-server-side.patch 749 SHA256 ae5f6e2d3a2dd306ea3f60c4ca2f219efea58a4c5c6b167b603b56132fd2eb89 SHA512 1872f424c23e7a480f9f664b0ba8a0f6e029dc8df2e22df8243f638785be0ac7cdfbde419ac86f7d5e1e7cec8ad82017ecb49bd3f79ddf2703e0d2b0f2c1d593 WHIRLPOOL 80660c4311a1c5a2a70adb288bac42e242e80952640b768dfd495036204f23aee74cf1d5fdce2c089ec368f99644fde71c325eb50dac7c8a8cc2047221f47d43
AUX 0001-Enable-parallel-builds-for-example-with-MAKEOPTS-j4.patch 11974 SHA256 af20453d1f5f7dda2bbf81f1cdb19572d6c8c6bac017a0673182e2983837c1cb SHA512 93c9b911a42fdbb0029fa4020d8efcadbb02750ac89c77cb87d85678d0862584d36f0193968c6978d7423288a80c3ed6de15fa0014249774cf5db865e96b0114 WHIRLPOOL bcdd54b2ae705d689c9032b587cbfd7e3e8ce7590cc5d4d2fa976bd0dc94d084ace6ed30ee702b5c5b7cf0299604bd02edfc5ee9e568f867700c48cc92d9cc75
AUX 0001-Fix-compilation-with-no-des.patch 848 SHA256 8762d386c57202e80528a20fa1d6ad2a52f7c0c8ac686408758ce9806612d337 SHA512 6d8c7c5f6568e0802a7b312c36375d72f367ad7edd92728456ac982655e0f18555686c8483221590947585c4e6f178abb2e9c8bb2f852aa17aefd7433d0f77fb WHIRLPOOL eb9b39f7e2a743fb41f0ef0cda52df542e349ea39eeec5eb0beb23d982e6afff27da7f52190e267affb7cdb2598c4cb6899051a57cff88548f793a05fd53fe98
AUX 0001-IPv6-support-for-s_client-s_server-and-DTLS.patch-v2 19432 SHA256 eccdfc3c9b53eca9b81a241badcdd71db4ad8cb90afe26a160e28cd3914aa325 SHA512 793b598d21a458ae2e83548fec02a140595d35005a6fdad6da3a584d4a81229cfc21f8f1ebd40b487b29f6d1742f18220f8dd160cc39118eb1a22f9c8edef0f0 WHIRLPOOL 0a98d26c8c5e02351ab0196565ede28e150cff631bba880f90b3cafddd9cddbf18435c180cb300d32e60efed5060c6a271f81f72cfc333e712600105b4f4e54b
AUX 0001-Make-the-assembly-syntax-compatible-with-x32-gcc.patch 3404 SHA256 82ee7862907f0ce5e87c2e917080950105114d82434010a7b5c01e9004139cdc SHA512 2087c2ff1317d19af4d8f3b6d4c0506efa7c4adaa653174a3749c3cd0079a29a59fcd95fdf04d8b1759d669f12aa418925d03a41594ccb3d55c802f5e9a5827b WHIRLPOOL c2f986c6d0151a8677e58a60f1c91f1a800dc25b876658d0cb4ef95ab08ce40c7acd8ef5d118f58a3555de22c181bd15baa97d0ef7a26fe2311cd9bf0220e2a6
AUX 0001-Use-HIGH-ciphers-by-default.patch 946 SHA256 d19170e83c1f0cc3075b9f88cb8c267eabcd91dca388e18979f9ee441d112b34 SHA512 f21d8a15146852406c3f1d17bea20d9eeccbbf0751c1f9224ad9377d7294d68094595faa24635a93851cf06c25ff32e215dd31a709908858dfcd30c8e1ffe155 WHIRLPOOL 88eb3ed23f0368f563453fd514b60185331fd7b2f790ff75bdaaf49c76b9b85eb59d0695f2b0bfcee9d79a3ac453c758d0a5b161a269c94fec86f167d872037e
AUX 0001-require-DH-group-of-1024-bits.patch 2089 SHA256 82ac351ddfb1a2593b0ce3f5a9d3ec77e813500eea05093dbf26a74bb972f32c SHA512 60601fc24361f08e26fa8293d06561e2052e772f215acb5a08a784d7bb329d42d9976d4d451c3db3ea3f445e8073407ed4a20a7434c9bb6a89660698d00f1e4e WHIRLPOOL 6aaeb9a2aa6299fdc81ec41dc7855b0f4273f6cf708639bb0d1ae98e7ffb9cc34512acfec82d633cc99c381052039b4d27cbe888f75b00a8c71cea69dd94be25
AUX 0001-x86-_64-cpuid.pl-rdrand-to-fill-a-buffer.patch 6024 SHA256 d14e92c53738ff9a332bacd7e3c0f91b74c17c2a0a1d9c4478aad706783f2f34 SHA512 c19fa7830f0c1e2e0c207b8059e791f84f9cacd903cee5751e29566f621c204c6cf6ed381e2d00dd5263d70fe22f260c3c8d25b6ec2970fa19fbee8c17c3495c WHIRLPOOL c24ecad27370b157cb60ce1ebdd55febb3ab9c0a091e03e5516214f1e6aeef268eb1009cd8b2343d4f093394659f87820207db6599bb4e7b7ba5644c0c455e02
AUX 0002-Add-syscall-number-for-getrandom-and-ARM64.patch 732 SHA256 33f16d6e34560517b09c8840be9e94c0bcb940a4e53e3d9c61eb9f2e7be9e1b6 SHA512 c670648928cbc5c6c07187e1a1e299a556dd133e868dfb39f5aa6bcd3c19e79d58829d603b827c73f776079aea281b84e5ed9878e963d10d063155c59e614667 WHIRLPOOL 6eb4b8c23b9df0695a4ce935b8702a19f4c79c0ff02af159485b865ea6b2237cc750f4db0451e17c1181f874a202abcab8bbdcaa554ffaa52d77f1b08986dbad
AUX 0003-crypto-engine-eng_linux_getrandom.c-Do-not-register-.patch 884 SHA256 2e1fa2a9ca662232ea07053e3157863694ffbc98626edd7ef0a704553500056f SHA512 0125c639bf4ebca30ccc414936688cd21eb29edd32eb23eec98efb5c7560cd65540b8165f98d5477e811cb6da495005e36b44ef433d2bf6c251e60de24e87a1c WHIRLPOOL b6b6dc2c3149ba3da7acaf4921803df2024ab9c86cdbbf252a341cc7b0b6d09259be634aa1fb6d01d750fc693c890f4482029fbb1a791cbb3f487b012333afa7
AUX gentoo.config-1.0.1 4784 SHA256 26d1b360f094dd4e1acf47c3e830b52343c0f778dcd8f2c5b6c213b7e5192d13 SHA512 605e86cc68bbce5405b359098cc0a5abdc071a36462ca868d2fce57cabd928536fbcb0f5dea7318c96b3f9fca39b8c303601fff4442a8e68d7f99254180980e7 WHIRLPOOL eb7540c99ad4bbc60a3decd30e9d7d3816bb7cdd948c9c76950b278acec34a4737f1afaf543e9e524ea0cef8ae26008c065bef44129673e40ccaec9509052575
AUX openssl-1.0.0a-ldflags.patch 891 SHA256 f04cef1b912681393236f9631792cd404783586c2fd8e0f011ace6236cc6dc4a SHA512 8ced9f22e413f81ff0563793bd6b765912af16671a0d10bff0c518c44bced0177dbcd6536359ff5b6bd5d49fa5032de47c719198444254d4814e4b21301f606c WHIRLPOOL f9b2641b8df926ff5d9d5cf5a7737f5cb4a3a2be2225911ebebd944f13219acfac07d496eec9a8e91af3f50ac1275dc7b0652354e8e958a0d3f6708e641f8970
AUX openssl-1.0.0d-windres.patch 2890 SHA256 27664cfab4852f1a301c4020375eba029c8a1728d58829c831a36d3aa2fbe9f4 SHA512 32187d0a04c85118cc763ff1fe8c4635622294fe629b920c47e16408aa720fee2bcc42f97120f6750b59996878e0a3d249143d728a5b5775ec3a022f81bc230a WHIRLPOOL d5979143f7e637b0072f7d5f214d80f5cc0e53f54358781d7f10c0cdb15c2b52813e12d2aa07dde2b40e7a88fcb26d1d619443a8012530d90789609cf5ac4083
AUX openssl-1.0.1e-s_client-verify.patch 592 SHA256 6f540fce663eefbe68cee16ad7d8d561d6c898eeb4180c2f4a4caa7e43c6d0c9 SHA512 117b1017e1259667078d3ccdcd9fd46357c6f85cf2702794f49c612b37acdc044fe88f871dbe46fcad9ed4cd8aaaaee800dddb5286203322802efd7549a43b68 WHIRLPOOL 70a4cc36b1dcb24d7e9bcef016684fb2394977f7f20aa332ebd0aa15e3f4c16c74563d2fc0ba8d70669f6cc9a13bf8a30cdb28ebafe2d102cd2859a4e32c38d7
-DIST openssl-1.0.2-stable-SNAP-20141229.tar.gz 5251559 SHA256 a47326ee51085d1711be1a8d24493be4f19f2cfe117def702e7634695d63c451 SHA512 3c6b71a308f6e5966c744a7b6717e0209fde332dc78bc35d823e09db39acae0a0938601a637728f3176a0dc0f70aaee5ee318eb978e0842af6c4df15e5c22b32 WHIRLPOOL 6a43c04f279a2dba38c11a2869ada2c6d1dcedf5fbe7f7ef5240e5d5c2e2d3e8324f4f62692e1a2544dd32b2a3f014453e54adeb4aab083af15868269278a568
+DIST openssl-1.0.2-stable-SNAP-20150110.tar.gz 5254190 SHA256 7dfc1b3289eb34059b75e0f1efb612bf4924409d5d13f47d3deaa5758aff5ecd SHA512 d442066923be88563824ac78ceb2eb8921da72afb75e00b86767156b4c6ef36fd234cffb60e596d4be63c492032ce1158437f090c9b419412025207f654e5e9a WHIRLPOOL 5580bfa75dedfdfc5e4f50fb76eba5bde3942defe5ec2d805b6e6bf0940d6239880860bc008523b0d4eac3502a8e3039cae617279d3ad7d79f464fc2104c4e4d
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
-EBUILD openssl-1.0.2_pre20141229.ebuild 11774 SHA256 381124e7a8951263f23d82b4dfb0c9d62756547c4071c434e3d801f6fd0d29d4 SHA512 13fb19195a7128d563854a02c1853a94351d5d36757efc235f06c8d888ceee8ea6dfbf282a8319dd00543931ebb953b01741c2b612a5a09fa304b242a07640d8 WHIRLPOOL 126ab53407b874780967ec49375c1171a8b933cdc7111ca2ff4c379c918371ce02a58059b78a7f8d03eef78fa6412a10156cb355b7602ca7d0f83568b2fef8f4
+EBUILD openssl-1.0.2_pre20150110.ebuild 11693 SHA256 bc33774dbdafa1a622d40d486b82992634e84920738afa6ca4d214f145462406 SHA512 deef6ae2157dc3cdb6a494f89c97003faf72c119bda47fb09a1da707ce1d4c42d8c437116edeb15f28b55b70d8fe312044acb0e358509aa82ba25314a45b3fd7 WHIRLPOOL c81f282b7c43eb840820b8559bacd64962ee8cc5c424c08f0b196aa8c348fd25e1d39a322c0e458419c1183dbbce5691384e2f2ab3c5e157d1ba6c296a913ea9
diff --git a/dev-libs/openssl/openssl-1.0.2_pre20141229.ebuild b/dev-libs/openssl/openssl-1.0.2_pre20150110.ebuild
similarity index 99%
rename from dev-libs/openssl/openssl-1.0.2_pre20141229.ebuild
rename to dev-libs/openssl/openssl-1.0.2_pre20150110.ebuild
index 0812ec1..c1240f6 100644
--- a/dev-libs/openssl/openssl-1.0.2_pre20141229.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2_pre20150110.ebuild
@@ -1,357 +1,356 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 2013â2014 W. Mark Kubacki
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
# MY_PV=1.0.2, MY_PRE=20131117, MY_P=openssl-1.0.2-stable-SNAP-20131117
# G_P is Gentoo's equivalent P, openssl-1.0.2
MY_PV="${PV%%_*}"
MY_PRE="${PV##*_pre}"
MY_PRE="${MY_PRE%%_*}"
MY_P="${PN}-${MY_PV}-stable-SNAP-${MY_PRE}"
G_P="${PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
REV="1.7"
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
HOMEPAGE="http://www.openssl.org/"
SRC_URI="mirror://openssl-snapshots/${MY_P}.tar.gz
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
LICENSE="openssl"
SLOT="0"
KEYWORDS="amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="bindist +cryptodev +gmp kerberos rfc3779 smime sse2 static-libs test tls-heartbeat vanilla zlib"
IUSE="${IUSE} +dsa dtls jpake +psk srp srtp ssl2 ssl3"
IUSE="${IUSE} +camellia +des +rc4 rc5"
IUSE="${IUSE} +blowfish +cast gost idea md4 mdc2 rc2 seed"
REQUIRED_USE="cryptodev? ( dsa )
ssl2? ( ssl3 )
ssl3? ( des )
srtp? ( dtls )
dtls? ( srtp )
smime? ( des md4 rc2 )"
# The blocks are temporary just to make sure people upgrade to a
# version that lack runtime version checking. We'll drop them in
# the future.
RDEPEND="gmp? ( dev-libs/gmp[static-libs(+)?,${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib[static-libs(+)?,${MULTILIB_USEDEP}] )
kerberos? ( app-crypt/mit-krb5 )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)
!<net-misc/openssh-5.9_p1-r4
!<net-libs/neon-0.29.6-r1"
DEPEND="${RDEPEND}
sys-apps/diffutils
>=dev-lang/perl-5
test? ( sys-devel/bc )"
PDEPEND="app-misc/ca-certificates"
# This is part of the kernel:
# cryptodev? ( app-crypt/cryptodev-linux )
MULTILIB_WRAPPED_HEADERS=(
usr/include/openssl/opensslconf.h
)
src_prepare() {
if use bindist; then
# We have to retain the USE flag bindist for OpenSSH.
die "bindist has been removed from this ebuild."
fi
SSL_CNF_DIR="/etc/ssl"
sed \
-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
> "${WORKDIR}"/c_rehash || die #416717
# Make sure we only ever touch Makefile.org and avoid patching a file
# that gets blown away anyways by the Configure script in src_configure
rm -f Makefile
if ! use vanilla ; then
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
sed -i -e "s:OpenSSL-libssl:OpenSSL:" Makefile.org
epatch "${FILESDIR}"/0001-Enable-parallel-builds-for-example-with-MAKEOPTS-j4.patch
epatch "${FILESDIR}"/0001-Make-the-assembly-syntax-compatible-with-x32-gcc.patch
- epatch "${FILESDIR}"/0001-IPv6-support-for-s_client-s_server-and-DTLS.patch-v2
for F in $(find -name '*.pod' -type d); do
sed -i -E 's:=item ([0-9]+):=item C<\1>:' $F
done
epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584
fi
if ! use des ; then
epatch "${FILESDIR}"/0001-Fix-compilation-with-no-des.patch
fi
epatch "${FILESDIR}"/0001-Add-RAND-engine-for-Linux-syscall-getrandom.patch \
"${FILESDIR}"/0002-Add-syscall-number-for-getrandom-and-ARM64.patch \
"${FILESDIR}"/0003-crypto-engine-eng_linux_getrandom.c-Do-not-register-.patch
epatch "${FILESDIR}"/0001-x86-_64-cpuid.pl-rdrand-to-fill-a-buffer.patch
# raises minimum DH group size, from 'any' to '1024 bits or greater'
epatch "${FILESDIR}"/0001-require-DH-group-of-1024-bits.patch
# limits usage of RC4 to TLS 1.0 and older; from CloudFlare
epatch "${FILESDIR}"/0001-Disable-RC4-for-TLS-v1.1-server-side.patch
epatch "${FILESDIR}"/0001-Use-HIGH-ciphers-by-default.patch
# disable fips in the build
# make sure the man pages are suffixed #302165
# don't bother building man pages if they're disabled
sed -i \
-e '/DIRS/s: fips : :g' \
-e '/^MANSUFFIX/s:=.*:=ssl:' \
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
Makefile.org \
|| die
# show the actual commands in the log
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
# allow openssl to be cross-compiled
cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
chmod a+rx gentoo.config
append-flags -fno-strict-aliasing
append-flags $(test-flags-CC -Wa,--noexecstack)
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
if use cryptodev; then
ewarn "If you have not compiled cryptodev into the kernel"
ewarn "emerge app-crypt/cryptodev-linux before OpenSSL!"
# sys-kernel/linux-headers doesn't contain crypto/cryptodev.h, therefore:
append-flags -I/usr/src/linux
fi
if ! use vanilla; then
epatch_user #332661
fi
sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
# The config script does stupid stuff to prompt the user. Kill it.
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
#./config --test-sanity || die "I AM NOT SANE"
multilib_copy_sources
}
multilib_src_configure() {
unset APPS #197996
unset SCRIPTS #312551
unset CROSS_COMPILE #311473
tc-export CC AR RANLIB RC
# Clean out patent-or-otherwise-encumbered code
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
# RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
echoit() { echo "$@" ; "$@" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
# See if our toolchain supports __uint128_t. If so, it's 64bit
# friendly and can use the nicely optimized code paths. #460790
local ec_nistp_64_gcc_128
# Disable it for now though #469976, except for amd64
if (use amd64 || use amd64-fbsd || use x86 || use x86-linux || use x86-fbsd) ; then
echo "__uint128_t i;" > "${T}"/128.c
if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
fi
fi
local sslout=$(./gentoo.config)
einfo "Use configuration ${sslout:-(openssl knows best)}"
local config="Configure"
[[ -z ${sslout} ]] && config="config"
echoit \
./${config} \
${sslout} \
$(use sse2 || echo "no-sse2") \
$(use_ssl camellia) \
$(use_ssl des) \
enable-ec \
${ec_nistp_64_gcc_128} -DECP_NISTZ256_ASM \
$(use_ssl cast) \
$(use_ssl seed) \
$(use_ssl idea) \
$(use_ssl mdc2) \
$(use_ssl md4) \
$(use_ssl rc2) \
$(use_ssl rc4) \
$(use_ssl rc5) \
enable-tlsext \
$(use_ssl gmp gmp -lgmp) \
$(multilib_native_use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
$(use_ssl rfc3779) \
$(use_ssl tls-heartbeat heartbeats -DOPENSSL_NO_HEARTBEATS) \
$(use_ssl zlib) \
--prefix="${EPREFIX}"/usr \
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
$(use cryptodev && echo "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -DHASH_MAX_LEN=64") \
shared threads \
$(use_ssl dsa) \
$(use_ssl ssl2) $(use_ssl ssl3) \
$(use_ssl dtls) $(use_ssl dtls dtls1) $(use_ssl dtls dtls1_2) $(use_ssl srtp) \
$(use_ssl blowfish bf) \
$(use_ssl jpake) \
$(use_ssl psk) \
$(use_ssl srp) \
$(use_ssl gost) \
${EXTRA_ECONF} \
|| die
# Clean out hardcoded flags that openssl uses
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-e 's:^CFLAG=::' \
-e 's:-fomit-frame-pointer ::g' \
-e 's:-O[0-9] ::g' \
-e 's:-march=[-a-z0-9]* ::g' \
-e 's:-mcpu=[-a-z0-9]* ::g' \
-e 's:-m[a-z0-9]* ::g' \
)
sed -i \
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
Makefile || die
}
multilib_src_compile() {
# depend is needed to use $confopts; it also doesn't matter
# that it's -j1 as the code itself serializes subdirs
emake -j1 depend
emake all
# rehash is needed to prep the certs/ dir; do this
# separately to avoid parallel build issues.
emake rehash
}
multilib_src_test() {
emake -j1 test
}
multilib_src_install() {
emake INSTALL_PREFIX="${D}" install
}
multilib_src_install_all() {
dobin "${WORKDIR}"/c_rehash #333117
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
dohtml -r doc/*
use rfc3779 && dodoc engines/ccgost/README.gost
# This is crappy in that the static archives are still built even
# when USE=static-libs. But this is due to a failing in the openssl
# build system: the static archives are built as PIC all the time.
# Only way around this would be to manually configure+compile openssl
# twice; once with shared lib support enabled and once without.
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
# create the certs directory
dodir ${SSL_CNF_DIR}/certs
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
# Namespace openssl programs to prevent conflicts with other man pages
cd "${ED}"/usr/share/man
local m d s
for m in $(find . -type f | xargs grep -L '#include') ; do
d=${m%/*} ; d=${d#./} ; m=${m##*/}
[[ ${m} == openssl.1* ]] && continue
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
mv ${d}/{,ssl-}${m}
# fix up references to renamed man pages
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
ln -s ssl-${m} ${d}/openssl-${m}
# locate any symlinks that point to this man page ... we assume
# that any broken links are due to the above renaming
for s in $(find -L ${d} -type l) ; do
s=${s##*/}
rm -f ${d}/${s}
ln -s ssl-${m} ${d}/ssl-${s}
ln -s ssl-${s} ${d}/openssl-${s}
done
done
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
dodir /etc/sandbox.d #254521
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diropts -m0700
keepdir ${SSL_CNF_DIR}/private
}
pkg_preinst() {
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
}
pkg_postinst() {
ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
eend $?
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
if use cryptodev; then
einfo "Please remember:"
einfo ""
einfo " modprobe cryptodev"
einfo ""
einfo "Use as follows:"
einfo ""
einfo " shell: openssl -evp -engine cryptodev ..."
einfo " apache: SSLCryptoDevice cryptodev"
einfo " nginx: main {ssl_engine cryptodev; ...}"
fi
if use cast || use idea || use rc2 || use seed || use md4 || use mdc2; then
elog "You are building OpenSSL with some archaic ciphers or hash functions."
fi
if ! use rc4; then
ewarn
ewarn "You need RC4 for torrents over encrypted connections."
fi
if ! use md4; then
ewarn
ewarn "SASL still needs MD4 support."
fi
if ! use des; then
ewarn
ewarn "Your OpenSSL installation has no support for DES and 3DES."
ewarn "The latter is a mandatory cipher according to specs in TLS 1.0 and S/MIME."
fi
if ! use rc2; then
ewarn
ewarn "RC2 is a mandatory cipher in S/MIME, which is still used e.g. with MS Outlook"
ewarn "unless you enable support for 'alternate ciphers' (= AES, SHA2) there."
fi
if ! (use dsa && use des && use blowfish && use cast); then
ewarn
ewarn "Old versions of OpenSSH will not compile and will not work."
fi
}
|
mark-kubacki/ossdl-overlay | 0a785d8f6c0c772b8d8c922682e48b2703ef8e1a | dev-libs/openssl-1.0.2_pre20141229 | diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d810287..0d5004a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,18 +1,18 @@
AUX 0001-Add-RAND-engine-for-Linux-syscall-getrandom.patch 7246 SHA256 6f67d97fe7ffd63b20bb80d387c852eb41dce44be62177a51fe36be20e9ad0fd SHA512 a4860b4db56c1225ef401db2881b68eaccb674185718a9070694fb21ef1a8d8949bfa58436a9e68da3f17d7eb361fab5109fe8cf79526629dd93a149fcafffe7 WHIRLPOOL b1d08b6b4796e4d9c2a072c7f014f25262242bdc2c2610c27aace413fac52d245be42a42c2b7c7f48614dfc44e29816a925162bd7a6e34be6e67dac96f265ba0
AUX 0001-Disable-RC4-for-TLS-v1.1-server-side.patch 749 SHA256 ae5f6e2d3a2dd306ea3f60c4ca2f219efea58a4c5c6b167b603b56132fd2eb89 SHA512 1872f424c23e7a480f9f664b0ba8a0f6e029dc8df2e22df8243f638785be0ac7cdfbde419ac86f7d5e1e7cec8ad82017ecb49bd3f79ddf2703e0d2b0f2c1d593 WHIRLPOOL 80660c4311a1c5a2a70adb288bac42e242e80952640b768dfd495036204f23aee74cf1d5fdce2c089ec368f99644fde71c325eb50dac7c8a8cc2047221f47d43
AUX 0001-Enable-parallel-builds-for-example-with-MAKEOPTS-j4.patch 11974 SHA256 af20453d1f5f7dda2bbf81f1cdb19572d6c8c6bac017a0673182e2983837c1cb SHA512 93c9b911a42fdbb0029fa4020d8efcadbb02750ac89c77cb87d85678d0862584d36f0193968c6978d7423288a80c3ed6de15fa0014249774cf5db865e96b0114 WHIRLPOOL bcdd54b2ae705d689c9032b587cbfd7e3e8ce7590cc5d4d2fa976bd0dc94d084ace6ed30ee702b5c5b7cf0299604bd02edfc5ee9e568f867700c48cc92d9cc75
AUX 0001-Fix-compilation-with-no-des.patch 848 SHA256 8762d386c57202e80528a20fa1d6ad2a52f7c0c8ac686408758ce9806612d337 SHA512 6d8c7c5f6568e0802a7b312c36375d72f367ad7edd92728456ac982655e0f18555686c8483221590947585c4e6f178abb2e9c8bb2f852aa17aefd7433d0f77fb WHIRLPOOL eb9b39f7e2a743fb41f0ef0cda52df542e349ea39eeec5eb0beb23d982e6afff27da7f52190e267affb7cdb2598c4cb6899051a57cff88548f793a05fd53fe98
AUX 0001-IPv6-support-for-s_client-s_server-and-DTLS.patch-v2 19432 SHA256 eccdfc3c9b53eca9b81a241badcdd71db4ad8cb90afe26a160e28cd3914aa325 SHA512 793b598d21a458ae2e83548fec02a140595d35005a6fdad6da3a584d4a81229cfc21f8f1ebd40b487b29f6d1742f18220f8dd160cc39118eb1a22f9c8edef0f0 WHIRLPOOL 0a98d26c8c5e02351ab0196565ede28e150cff631bba880f90b3cafddd9cddbf18435c180cb300d32e60efed5060c6a271f81f72cfc333e712600105b4f4e54b
AUX 0001-Make-the-assembly-syntax-compatible-with-x32-gcc.patch 3404 SHA256 82ee7862907f0ce5e87c2e917080950105114d82434010a7b5c01e9004139cdc SHA512 2087c2ff1317d19af4d8f3b6d4c0506efa7c4adaa653174a3749c3cd0079a29a59fcd95fdf04d8b1759d669f12aa418925d03a41594ccb3d55c802f5e9a5827b WHIRLPOOL c2f986c6d0151a8677e58a60f1c91f1a800dc25b876658d0cb4ef95ab08ce40c7acd8ef5d118f58a3555de22c181bd15baa97d0ef7a26fe2311cd9bf0220e2a6
AUX 0001-Use-HIGH-ciphers-by-default.patch 946 SHA256 d19170e83c1f0cc3075b9f88cb8c267eabcd91dca388e18979f9ee441d112b34 SHA512 f21d8a15146852406c3f1d17bea20d9eeccbbf0751c1f9224ad9377d7294d68094595faa24635a93851cf06c25ff32e215dd31a709908858dfcd30c8e1ffe155 WHIRLPOOL 88eb3ed23f0368f563453fd514b60185331fd7b2f790ff75bdaaf49c76b9b85eb59d0695f2b0bfcee9d79a3ac453c758d0a5b161a269c94fec86f167d872037e
AUX 0001-require-DH-group-of-1024-bits.patch 2089 SHA256 82ac351ddfb1a2593b0ce3f5a9d3ec77e813500eea05093dbf26a74bb972f32c SHA512 60601fc24361f08e26fa8293d06561e2052e772f215acb5a08a784d7bb329d42d9976d4d451c3db3ea3f445e8073407ed4a20a7434c9bb6a89660698d00f1e4e WHIRLPOOL 6aaeb9a2aa6299fdc81ec41dc7855b0f4273f6cf708639bb0d1ae98e7ffb9cc34512acfec82d633cc99c381052039b4d27cbe888f75b00a8c71cea69dd94be25
AUX 0001-x86-_64-cpuid.pl-rdrand-to-fill-a-buffer.patch 6024 SHA256 d14e92c53738ff9a332bacd7e3c0f91b74c17c2a0a1d9c4478aad706783f2f34 SHA512 c19fa7830f0c1e2e0c207b8059e791f84f9cacd903cee5751e29566f621c204c6cf6ed381e2d00dd5263d70fe22f260c3c8d25b6ec2970fa19fbee8c17c3495c WHIRLPOOL c24ecad27370b157cb60ce1ebdd55febb3ab9c0a091e03e5516214f1e6aeef268eb1009cd8b2343d4f093394659f87820207db6599bb4e7b7ba5644c0c455e02
AUX 0002-Add-syscall-number-for-getrandom-and-ARM64.patch 732 SHA256 33f16d6e34560517b09c8840be9e94c0bcb940a4e53e3d9c61eb9f2e7be9e1b6 SHA512 c670648928cbc5c6c07187e1a1e299a556dd133e868dfb39f5aa6bcd3c19e79d58829d603b827c73f776079aea281b84e5ed9878e963d10d063155c59e614667 WHIRLPOOL 6eb4b8c23b9df0695a4ce935b8702a19f4c79c0ff02af159485b865ea6b2237cc750f4db0451e17c1181f874a202abcab8bbdcaa554ffaa52d77f1b08986dbad
AUX 0003-crypto-engine-eng_linux_getrandom.c-Do-not-register-.patch 884 SHA256 2e1fa2a9ca662232ea07053e3157863694ffbc98626edd7ef0a704553500056f SHA512 0125c639bf4ebca30ccc414936688cd21eb29edd32eb23eec98efb5c7560cd65540b8165f98d5477e811cb6da495005e36b44ef433d2bf6c251e60de24e87a1c WHIRLPOOL b6b6dc2c3149ba3da7acaf4921803df2024ab9c86cdbbf252a341cc7b0b6d09259be634aa1fb6d01d750fc693c890f4482029fbb1a791cbb3f487b012333afa7
AUX gentoo.config-1.0.1 4784 SHA256 26d1b360f094dd4e1acf47c3e830b52343c0f778dcd8f2c5b6c213b7e5192d13 SHA512 605e86cc68bbce5405b359098cc0a5abdc071a36462ca868d2fce57cabd928536fbcb0f5dea7318c96b3f9fca39b8c303601fff4442a8e68d7f99254180980e7 WHIRLPOOL eb7540c99ad4bbc60a3decd30e9d7d3816bb7cdd948c9c76950b278acec34a4737f1afaf543e9e524ea0cef8ae26008c065bef44129673e40ccaec9509052575
AUX openssl-1.0.0a-ldflags.patch 891 SHA256 f04cef1b912681393236f9631792cd404783586c2fd8e0f011ace6236cc6dc4a SHA512 8ced9f22e413f81ff0563793bd6b765912af16671a0d10bff0c518c44bced0177dbcd6536359ff5b6bd5d49fa5032de47c719198444254d4814e4b21301f606c WHIRLPOOL f9b2641b8df926ff5d9d5cf5a7737f5cb4a3a2be2225911ebebd944f13219acfac07d496eec9a8e91af3f50ac1275dc7b0652354e8e958a0d3f6708e641f8970
AUX openssl-1.0.0d-windres.patch 2890 SHA256 27664cfab4852f1a301c4020375eba029c8a1728d58829c831a36d3aa2fbe9f4 SHA512 32187d0a04c85118cc763ff1fe8c4635622294fe629b920c47e16408aa720fee2bcc42f97120f6750b59996878e0a3d249143d728a5b5775ec3a022f81bc230a WHIRLPOOL d5979143f7e637b0072f7d5f214d80f5cc0e53f54358781d7f10c0cdb15c2b52813e12d2aa07dde2b40e7a88fcb26d1d619443a8012530d90789609cf5ac4083
AUX openssl-1.0.1e-s_client-verify.patch 592 SHA256 6f540fce663eefbe68cee16ad7d8d561d6c898eeb4180c2f4a4caa7e43c6d0c9 SHA512 117b1017e1259667078d3ccdcd9fd46357c6f85cf2702794f49c612b37acdc044fe88f871dbe46fcad9ed4cd8aaaaee800dddb5286203322802efd7549a43b68 WHIRLPOOL 70a4cc36b1dcb24d7e9bcef016684fb2394977f7f20aa332ebd0aa15e3f4c16c74563d2fc0ba8d70669f6cc9a13bf8a30cdb28ebafe2d102cd2859a4e32c38d7
-DIST openssl-1.0.2-stable-SNAP-20141222.tar.gz 5251404 SHA256 104bdb6396a72376bfd527abffada51b25d6393446bd6cefc5edb3e08742af29 SHA512 493106ced9203c93174d2e22c759db1540559a2917f54a6c8d1854fe6625d69bcf4979a9ec291a11e4a67c0ddef4b8fec74ecc07159602bf6bac805fb59c3a18 WHIRLPOOL 4fe732a1d672aa435dfd888c18fc3082cc2ece47a368d3dc63958a874882526e69843906acb9d63c910940d90251cf961cf839cd85c164945fa2062e21b3f9b7
+DIST openssl-1.0.2-stable-SNAP-20141229.tar.gz 5251559 SHA256 a47326ee51085d1711be1a8d24493be4f19f2cfe117def702e7634695d63c451 SHA512 3c6b71a308f6e5966c744a7b6717e0209fde332dc78bc35d823e09db39acae0a0938601a637728f3176a0dc0f70aaee5ee318eb978e0842af6c4df15e5c22b32 WHIRLPOOL 6a43c04f279a2dba38c11a2869ada2c6d1dcedf5fbe7f7ef5240e5d5c2e2d3e8324f4f62692e1a2544dd32b2a3f014453e54adeb4aab083af15868269278a568
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
-EBUILD openssl-1.0.2_pre20141222.ebuild 11774 SHA256 381124e7a8951263f23d82b4dfb0c9d62756547c4071c434e3d801f6fd0d29d4 SHA512 13fb19195a7128d563854a02c1853a94351d5d36757efc235f06c8d888ceee8ea6dfbf282a8319dd00543931ebb953b01741c2b612a5a09fa304b242a07640d8 WHIRLPOOL 126ab53407b874780967ec49375c1171a8b933cdc7111ca2ff4c379c918371ce02a58059b78a7f8d03eef78fa6412a10156cb355b7602ca7d0f83568b2fef8f4
+EBUILD openssl-1.0.2_pre20141229.ebuild 11774 SHA256 381124e7a8951263f23d82b4dfb0c9d62756547c4071c434e3d801f6fd0d29d4 SHA512 13fb19195a7128d563854a02c1853a94351d5d36757efc235f06c8d888ceee8ea6dfbf282a8319dd00543931ebb953b01741c2b612a5a09fa304b242a07640d8 WHIRLPOOL 126ab53407b874780967ec49375c1171a8b933cdc7111ca2ff4c379c918371ce02a58059b78a7f8d03eef78fa6412a10156cb355b7602ca7d0f83568b2fef8f4
diff --git a/dev-libs/openssl/openssl-1.0.2_pre20141222.ebuild b/dev-libs/openssl/openssl-1.0.2_pre20141229.ebuild
similarity index 100%
rename from dev-libs/openssl/openssl-1.0.2_pre20141222.ebuild
rename to dev-libs/openssl/openssl-1.0.2_pre20141229.ebuild
|
mark-kubacki/ossdl-overlay | ddb47206c20c960bb107f1db2f4c42eba929b0a4 | dev-libs/openssl-1.0.2_pre20141222 | diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 693ff74..d810287 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,18 +1,18 @@
AUX 0001-Add-RAND-engine-for-Linux-syscall-getrandom.patch 7246 SHA256 6f67d97fe7ffd63b20bb80d387c852eb41dce44be62177a51fe36be20e9ad0fd SHA512 a4860b4db56c1225ef401db2881b68eaccb674185718a9070694fb21ef1a8d8949bfa58436a9e68da3f17d7eb361fab5109fe8cf79526629dd93a149fcafffe7 WHIRLPOOL b1d08b6b4796e4d9c2a072c7f014f25262242bdc2c2610c27aace413fac52d245be42a42c2b7c7f48614dfc44e29816a925162bd7a6e34be6e67dac96f265ba0
AUX 0001-Disable-RC4-for-TLS-v1.1-server-side.patch 749 SHA256 ae5f6e2d3a2dd306ea3f60c4ca2f219efea58a4c5c6b167b603b56132fd2eb89 SHA512 1872f424c23e7a480f9f664b0ba8a0f6e029dc8df2e22df8243f638785be0ac7cdfbde419ac86f7d5e1e7cec8ad82017ecb49bd3f79ddf2703e0d2b0f2c1d593 WHIRLPOOL 80660c4311a1c5a2a70adb288bac42e242e80952640b768dfd495036204f23aee74cf1d5fdce2c089ec368f99644fde71c325eb50dac7c8a8cc2047221f47d43
AUX 0001-Enable-parallel-builds-for-example-with-MAKEOPTS-j4.patch 11974 SHA256 af20453d1f5f7dda2bbf81f1cdb19572d6c8c6bac017a0673182e2983837c1cb SHA512 93c9b911a42fdbb0029fa4020d8efcadbb02750ac89c77cb87d85678d0862584d36f0193968c6978d7423288a80c3ed6de15fa0014249774cf5db865e96b0114 WHIRLPOOL bcdd54b2ae705d689c9032b587cbfd7e3e8ce7590cc5d4d2fa976bd0dc94d084ace6ed30ee702b5c5b7cf0299604bd02edfc5ee9e568f867700c48cc92d9cc75
AUX 0001-Fix-compilation-with-no-des.patch 848 SHA256 8762d386c57202e80528a20fa1d6ad2a52f7c0c8ac686408758ce9806612d337 SHA512 6d8c7c5f6568e0802a7b312c36375d72f367ad7edd92728456ac982655e0f18555686c8483221590947585c4e6f178abb2e9c8bb2f852aa17aefd7433d0f77fb WHIRLPOOL eb9b39f7e2a743fb41f0ef0cda52df542e349ea39eeec5eb0beb23d982e6afff27da7f52190e267affb7cdb2598c4cb6899051a57cff88548f793a05fd53fe98
AUX 0001-IPv6-support-for-s_client-s_server-and-DTLS.patch-v2 19432 SHA256 eccdfc3c9b53eca9b81a241badcdd71db4ad8cb90afe26a160e28cd3914aa325 SHA512 793b598d21a458ae2e83548fec02a140595d35005a6fdad6da3a584d4a81229cfc21f8f1ebd40b487b29f6d1742f18220f8dd160cc39118eb1a22f9c8edef0f0 WHIRLPOOL 0a98d26c8c5e02351ab0196565ede28e150cff631bba880f90b3cafddd9cddbf18435c180cb300d32e60efed5060c6a271f81f72cfc333e712600105b4f4e54b
AUX 0001-Make-the-assembly-syntax-compatible-with-x32-gcc.patch 3404 SHA256 82ee7862907f0ce5e87c2e917080950105114d82434010a7b5c01e9004139cdc SHA512 2087c2ff1317d19af4d8f3b6d4c0506efa7c4adaa653174a3749c3cd0079a29a59fcd95fdf04d8b1759d669f12aa418925d03a41594ccb3d55c802f5e9a5827b WHIRLPOOL c2f986c6d0151a8677e58a60f1c91f1a800dc25b876658d0cb4ef95ab08ce40c7acd8ef5d118f58a3555de22c181bd15baa97d0ef7a26fe2311cd9bf0220e2a6
AUX 0001-Use-HIGH-ciphers-by-default.patch 946 SHA256 d19170e83c1f0cc3075b9f88cb8c267eabcd91dca388e18979f9ee441d112b34 SHA512 f21d8a15146852406c3f1d17bea20d9eeccbbf0751c1f9224ad9377d7294d68094595faa24635a93851cf06c25ff32e215dd31a709908858dfcd30c8e1ffe155 WHIRLPOOL 88eb3ed23f0368f563453fd514b60185331fd7b2f790ff75bdaaf49c76b9b85eb59d0695f2b0bfcee9d79a3ac453c758d0a5b161a269c94fec86f167d872037e
AUX 0001-require-DH-group-of-1024-bits.patch 2089 SHA256 82ac351ddfb1a2593b0ce3f5a9d3ec77e813500eea05093dbf26a74bb972f32c SHA512 60601fc24361f08e26fa8293d06561e2052e772f215acb5a08a784d7bb329d42d9976d4d451c3db3ea3f445e8073407ed4a20a7434c9bb6a89660698d00f1e4e WHIRLPOOL 6aaeb9a2aa6299fdc81ec41dc7855b0f4273f6cf708639bb0d1ae98e7ffb9cc34512acfec82d633cc99c381052039b4d27cbe888f75b00a8c71cea69dd94be25
AUX 0001-x86-_64-cpuid.pl-rdrand-to-fill-a-buffer.patch 6024 SHA256 d14e92c53738ff9a332bacd7e3c0f91b74c17c2a0a1d9c4478aad706783f2f34 SHA512 c19fa7830f0c1e2e0c207b8059e791f84f9cacd903cee5751e29566f621c204c6cf6ed381e2d00dd5263d70fe22f260c3c8d25b6ec2970fa19fbee8c17c3495c WHIRLPOOL c24ecad27370b157cb60ce1ebdd55febb3ab9c0a091e03e5516214f1e6aeef268eb1009cd8b2343d4f093394659f87820207db6599bb4e7b7ba5644c0c455e02
AUX 0002-Add-syscall-number-for-getrandom-and-ARM64.patch 732 SHA256 33f16d6e34560517b09c8840be9e94c0bcb940a4e53e3d9c61eb9f2e7be9e1b6 SHA512 c670648928cbc5c6c07187e1a1e299a556dd133e868dfb39f5aa6bcd3c19e79d58829d603b827c73f776079aea281b84e5ed9878e963d10d063155c59e614667 WHIRLPOOL 6eb4b8c23b9df0695a4ce935b8702a19f4c79c0ff02af159485b865ea6b2237cc750f4db0451e17c1181f874a202abcab8bbdcaa554ffaa52d77f1b08986dbad
AUX 0003-crypto-engine-eng_linux_getrandom.c-Do-not-register-.patch 884 SHA256 2e1fa2a9ca662232ea07053e3157863694ffbc98626edd7ef0a704553500056f SHA512 0125c639bf4ebca30ccc414936688cd21eb29edd32eb23eec98efb5c7560cd65540b8165f98d5477e811cb6da495005e36b44ef433d2bf6c251e60de24e87a1c WHIRLPOOL b6b6dc2c3149ba3da7acaf4921803df2024ab9c86cdbbf252a341cc7b0b6d09259be634aa1fb6d01d750fc693c890f4482029fbb1a791cbb3f487b012333afa7
AUX gentoo.config-1.0.1 4784 SHA256 26d1b360f094dd4e1acf47c3e830b52343c0f778dcd8f2c5b6c213b7e5192d13 SHA512 605e86cc68bbce5405b359098cc0a5abdc071a36462ca868d2fce57cabd928536fbcb0f5dea7318c96b3f9fca39b8c303601fff4442a8e68d7f99254180980e7 WHIRLPOOL eb7540c99ad4bbc60a3decd30e9d7d3816bb7cdd948c9c76950b278acec34a4737f1afaf543e9e524ea0cef8ae26008c065bef44129673e40ccaec9509052575
AUX openssl-1.0.0a-ldflags.patch 891 SHA256 f04cef1b912681393236f9631792cd404783586c2fd8e0f011ace6236cc6dc4a SHA512 8ced9f22e413f81ff0563793bd6b765912af16671a0d10bff0c518c44bced0177dbcd6536359ff5b6bd5d49fa5032de47c719198444254d4814e4b21301f606c WHIRLPOOL f9b2641b8df926ff5d9d5cf5a7737f5cb4a3a2be2225911ebebd944f13219acfac07d496eec9a8e91af3f50ac1275dc7b0652354e8e958a0d3f6708e641f8970
AUX openssl-1.0.0d-windres.patch 2890 SHA256 27664cfab4852f1a301c4020375eba029c8a1728d58829c831a36d3aa2fbe9f4 SHA512 32187d0a04c85118cc763ff1fe8c4635622294fe629b920c47e16408aa720fee2bcc42f97120f6750b59996878e0a3d249143d728a5b5775ec3a022f81bc230a WHIRLPOOL d5979143f7e637b0072f7d5f214d80f5cc0e53f54358781d7f10c0cdb15c2b52813e12d2aa07dde2b40e7a88fcb26d1d619443a8012530d90789609cf5ac4083
AUX openssl-1.0.1e-s_client-verify.patch 592 SHA256 6f540fce663eefbe68cee16ad7d8d561d6c898eeb4180c2f4a4caa7e43c6d0c9 SHA512 117b1017e1259667078d3ccdcd9fd46357c6f85cf2702794f49c612b37acdc044fe88f871dbe46fcad9ed4cd8aaaaee800dddb5286203322802efd7549a43b68 WHIRLPOOL 70a4cc36b1dcb24d7e9bcef016684fb2394977f7f20aa332ebd0aa15e3f4c16c74563d2fc0ba8d70669f6cc9a13bf8a30cdb28ebafe2d102cd2859a4e32c38d7
-DIST openssl-1.0.2-stable-SNAP-20141215.tar.gz 5250399 SHA256 26c0ce5e3630111095dab3cfc2e5da4284f4cfa876997a3a04c42347dac5e156 SHA512 924ca08c0a79a44fb512b7163b4f6e2fc60aa20a56b7a5c6e1c04ae5ceeec9b8a22bf2146bb59df96ead499df46ba09b29adcb20866f4280dd67070c1dadf0ce WHIRLPOOL 6913d9d9eea2dddb6e81d48b1b26dd6e930533a06ccc8108809276e8f86c8d89e204a16758dff2f9f760cd06ad152d5167413b7864c2dfde9cab3c96cc3b943e
+DIST openssl-1.0.2-stable-SNAP-20141222.tar.gz 5251404 SHA256 104bdb6396a72376bfd527abffada51b25d6393446bd6cefc5edb3e08742af29 SHA512 493106ced9203c93174d2e22c759db1540559a2917f54a6c8d1854fe6625d69bcf4979a9ec291a11e4a67c0ddef4b8fec74ecc07159602bf6bac805fb59c3a18 WHIRLPOOL 4fe732a1d672aa435dfd888c18fc3082cc2ece47a368d3dc63958a874882526e69843906acb9d63c910940d90251cf961cf839cd85c164945fa2062e21b3f9b7
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
-EBUILD openssl-1.0.2_pre20141215.ebuild 11774 SHA256 381124e7a8951263f23d82b4dfb0c9d62756547c4071c434e3d801f6fd0d29d4 SHA512 13fb19195a7128d563854a02c1853a94351d5d36757efc235f06c8d888ceee8ea6dfbf282a8319dd00543931ebb953b01741c2b612a5a09fa304b242a07640d8 WHIRLPOOL 126ab53407b874780967ec49375c1171a8b933cdc7111ca2ff4c379c918371ce02a58059b78a7f8d03eef78fa6412a10156cb355b7602ca7d0f83568b2fef8f4
+EBUILD openssl-1.0.2_pre20141222.ebuild 11774 SHA256 381124e7a8951263f23d82b4dfb0c9d62756547c4071c434e3d801f6fd0d29d4 SHA512 13fb19195a7128d563854a02c1853a94351d5d36757efc235f06c8d888ceee8ea6dfbf282a8319dd00543931ebb953b01741c2b612a5a09fa304b242a07640d8 WHIRLPOOL 126ab53407b874780967ec49375c1171a8b933cdc7111ca2ff4c379c918371ce02a58059b78a7f8d03eef78fa6412a10156cb355b7602ca7d0f83568b2fef8f4
diff --git a/dev-libs/openssl/openssl-1.0.2_pre20141215.ebuild b/dev-libs/openssl/openssl-1.0.2_pre20141222.ebuild
similarity index 100%
rename from dev-libs/openssl/openssl-1.0.2_pre20141215.ebuild
rename to dev-libs/openssl/openssl-1.0.2_pre20141222.ebuild
|
mark-kubacki/ossdl-overlay | 37c2679dba20fe7bc9e2ffd91ff51d871c8bff73 | net-misc/youtube-dl-2014.12.17.2 | diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ffd6701..832a19a 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,9 +1,3 @@
-AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 764 SHA256 961609a1bf6894a5b48e074c285edea40d3225e1196b3ea35409fa0574f4dd09 SHA512 83327ef597ae326e2381a9a4ba3934ad8441bb7359a0da41f79585b609dd67939b5a17b807da9cc403bc2f79fe4ee2ffe4097c25f0f32f87658a82fbe2400fe3 WHIRLPOOL 5d71e34f484ff55ffc7829557e7b5a19f16d7a02e22c418f2baf32f476f97cf2d71e802bca9c9c96ee558b833c7c8173cf72669946ddd2c9a5324d4aa1ca76e2
-DIST youtube-dl-2014.06.26.tar.gz 853375 SHA256 8d953d3d9ed55fb409e90c745fc788fc5ae251512908c822afe4d7f4e805894a SHA512 408226135c8a15d4d6a262194c6b9eb7093089ad8a8d4f1b29e473a80dcfcbdc7d977a349428980216491e5d80662c0fa432fe457201660c1fe324493cfc9cfc WHIRLPOOL fd0994736a06c7bc0633a48e76ffc0d8ff5a906a399e2a51f0a812657fdf361af52e597e953759579d270837068452e7f6192dc8a5d2e3bf4cb30fdc2b168ee8
-DIST youtube-dl-2014.07.10.tar.gz 865576 SHA256 502588b8bce748644c3860975547a4f3b26695e5fb1cc2f5a8ffac00cbe17c56 SHA512 9743aa33c83a7ddfc64d7fe741c24af4a3103abb310be4174fffc3388603041527bebeeaa5607248495d022002440421409a5800f24c737d4d7a1de937e506ac WHIRLPOOL 74829e564f3f162e181e3a56901192fddadf663cb519495c6a52ffca4831d0107bf81bb22591007ecec1512be8885b7ead8e1f6bea6b2d2d5befd902acb74b13
-DIST youtube-dl-2014.08.29.tar.gz 983814 SHA256 f29ff268a995a78e84803a8a4afa20d6f82ccda672a89f64ad2f23ef703bdc3f SHA512 54beaad8e88641f4f2e4a08238e8aa4843b4a7576422f573784c37fea5bedbf9827bb6285f93da942e8acbeacc491cfaa6b7c4286410a61de1bb304d44c6de0a WHIRLPOOL 5f9391ebf10aef8a39be7b90ef60a2595bdb1d3f014c8d45191f1fa4edbaa33628b3575b2cfbd55385dc76a00a77f5630c9d8b9fdf628f802465d2643746aafe
-DIST youtube-dl-2014.09.12.tar.gz 1018680 SHA256 1bf98d40898ce8350583f1e9c907792aea2cfdbc7820593090ebebeddc15e514 SHA512 fce08274e0185c5d9be5e59e0d6d829bdaabdf6d545fdf2a096d28141a2c2b38fc88b8c0ba26c5770246eea343945ad37b77e0594b43d1aa09a949e37db001de WHIRLPOOL 0386f19ba575df39a177c4bccedad3cd374a0adeea2e4bd9299903591f72370ec2305874620a2d5d92222e6687db8857659c5da1d3cfd9bf5c70b790ecfb27dc
-EBUILD youtube-dl-2014.06.26.ebuild 1034 SHA256 2006dfbd58e05983d8627ef19cc21e4b60f72f501983dfc7c364d393de75a74a SHA512 0bd7dee07475a30df3a74154fc2cd94546aebd9b6610d6fbfe1d6abff243779afa638e8b1d6c7453ce689cfa037301c1078ae1e80eca74245bafa62b1cde34f4 WHIRLPOOL 08761c37aefdfb98ced40d5efdbaeabf526e422d145ca86d9db701b8f8921f88a72142d3784c299ae224452072d55e51a57a6ee500ac319204ac02aec752e615
-EBUILD youtube-dl-2014.07.10.ebuild 1034 SHA256 2006dfbd58e05983d8627ef19cc21e4b60f72f501983dfc7c364d393de75a74a SHA512 0bd7dee07475a30df3a74154fc2cd94546aebd9b6610d6fbfe1d6abff243779afa638e8b1d6c7453ce689cfa037301c1078ae1e80eca74245bafa62b1cde34f4 WHIRLPOOL 08761c37aefdfb98ced40d5efdbaeabf526e422d145ca86d9db701b8f8921f88a72142d3784c299ae224452072d55e51a57a6ee500ac319204ac02aec752e615
-EBUILD youtube-dl-2014.08.29.ebuild 1034 SHA256 2006dfbd58e05983d8627ef19cc21e4b60f72f501983dfc7c364d393de75a74a SHA512 0bd7dee07475a30df3a74154fc2cd94546aebd9b6610d6fbfe1d6abff243779afa638e8b1d6c7453ce689cfa037301c1078ae1e80eca74245bafa62b1cde34f4 WHIRLPOOL 08761c37aefdfb98ced40d5efdbaeabf526e422d145ca86d9db701b8f8921f88a72142d3784c299ae224452072d55e51a57a6ee500ac319204ac02aec752e615
-EBUILD youtube-dl-2014.09.12.ebuild 1034 SHA256 2006dfbd58e05983d8627ef19cc21e4b60f72f501983dfc7c364d393de75a74a SHA512 0bd7dee07475a30df3a74154fc2cd94546aebd9b6610d6fbfe1d6abff243779afa638e8b1d6c7453ce689cfa037301c1078ae1e80eca74245bafa62b1cde34f4 WHIRLPOOL 08761c37aefdfb98ced40d5efdbaeabf526e422d145ca86d9db701b8f8921f88a72142d3784c299ae224452072d55e51a57a6ee500ac319204ac02aec752e615
+AUX 0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch 765 SHA256 74359a5967116a63443d35fc8b8014b70829a7e1d40695f22cb7666464c7edd9 SHA512 e0934cf72bb53a5e62aef12c245f6d1199b42256114890e2cb0e23b1778047d6ffc453943a4a34c774c2e0a8cc29b51ce1477e7433d8f071291fabef3d2e9551 WHIRLPOOL cce5d5048062fb9581ac63fe47d1c20db8b6a640c244bf7461ecdcaec2ffcd69a9f72b712a9fc3463acba7aa33b797674d09d171b3223424a688e777ca00ab5c
+DIST youtube-dl-2014.12.17.2.tar.gz 1198383 SHA256 302cc64b5a283f60a1b34a5ccf0f09964bf64aa29c5996c945065a72016f68fa SHA512 7c7ccdc83de804ad70b45c47600413b2fdbebb5d78000cb87651926b06c2e6fca1f71382ccb91940384db663e7862804a9dfc92093e352efe18f56e502085add WHIRLPOOL ec09ed3c6f041098ea9fcd05c704c6de7b724ec96c2aff17005fec3ddf5dadddf7f42ecba143bc9d901d9a0ec0bdd237da54ee38757a1693b1fb06bf47839cf5
+EBUILD youtube-dl-2014.12.17.2.ebuild 1034 SHA256 2006dfbd58e05983d8627ef19cc21e4b60f72f501983dfc7c364d393de75a74a SHA512 0bd7dee07475a30df3a74154fc2cd94546aebd9b6610d6fbfe1d6abff243779afa638e8b1d6c7453ce689cfa037301c1078ae1e80eca74245bafa62b1cde34f4 WHIRLPOOL 08761c37aefdfb98ced40d5efdbaeabf526e422d145ca86d9db701b8f8921f88a72142d3784c299ae224452072d55e51a57a6ee500ac319204ac02aec752e615
diff --git a/net-misc/youtube-dl/files/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch b/net-misc/youtube-dl/files/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
index 3fae053..94c18a2 100644
--- a/net-misc/youtube-dl/files/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
+++ b/net-misc/youtube-dl/files/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
@@ -1,26 +1,26 @@
From d63d26f27cbcf58fd6ea3bcc25bc7425e6283053 Mon Sep 17 00:00:00 2001
From: W-Mark Kubacki <[email protected]>
Date: Wed, 2 Jul 2014 14:37:32 +0200
Subject: [PATCH] Allow cipher RC4, because Youtube won't work without.
---
youtube_dl/utils.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index b97e62a..7ab28dd 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -28,6 +28,9 @@ import traceback
import xml.etree.ElementTree
import zlib
+if 'RC4' not in ssl._DEFAULT_CIPHERS or '!RC4' in ssl._DEFAULT_CIPHERS:
-+ ssl._DEFAULT_CIPHERS = 'ECDHE+HIGH:DHE+HIGH:-3DES:-RC4:HIGH:RC4:!aNULL:!MD5'
++ ssl._DEFAULT_CIPHERS = 'EECDHE+HIGH:DHE+HIGH:-3DES:HIGH:-RC4:RC4:!aNULL:!MD5'
+
try:
import urllib.request as compat_urllib_request
except ImportError: # Python 2
--
1.9.3
diff --git a/net-misc/youtube-dl/youtube-dl-2014.07.10.ebuild b/net-misc/youtube-dl/youtube-dl-2014.07.10.ebuild
deleted file mode 100644
index a548b49..0000000
--- a/net-misc/youtube-dl/youtube-dl-2014.07.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 amd64-linux arm-linux x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.08.29.ebuild b/net-misc/youtube-dl/youtube-dl-2014.08.29.ebuild
deleted file mode 100644
index a548b49..0000000
--- a/net-misc/youtube-dl/youtube-dl-2014.08.29.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 amd64-linux arm-linux x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.09.12.ebuild b/net-misc/youtube-dl/youtube-dl-2014.09.12.ebuild
deleted file mode 100644
index a548b49..0000000
--- a/net-misc/youtube-dl/youtube-dl-2014.09.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 amd64-linux arm-linux x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/0001-Allow-cipher-RC4-because-Youtube-wont-work-without.patch
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.06.26.ebuild b/net-misc/youtube-dl/youtube-dl-2014.12.17.2.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2014.06.26.ebuild
rename to net-misc/youtube-dl/youtube-dl-2014.12.17.2.ebuild
|
mark-kubacki/ossdl-overlay | b5cac12833f7eea1ca2a8cac1c580aaa50e3ce12 | dev-lang/python: use "semi-static" to get a static version | diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index bd5a1ac..640b3d5 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,8 +1,9 @@
AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814
AUX pydoc.init 711 SHA256 bf42ce358c4505bb9c9923758cf7c237113b5465778fe8d0d9781625586003fd SHA512 328597e0f7594dcc1d929dcf15feb39e08a0f85067b226140219c03c2f0a0a5fa9518f26d52723aeb77e36eb5e46d54b5ee4ddbcfc52aa81540a738c49c03b73 WHIRLPOOL 846c7d90fc4b7b74d65c6019ea8e7c9f0d2efb0b6cad5b91d53b5b7bda509f3b625fb30eb27ea59cacf6233378d800c35375108762ba82fb4c2155f2dbf08f13
AUX python-2.7-02-Use-stronger-ciphers-by-default.patch 1668 SHA256 ba4c7ff79141948fd4e4bf34bf728a5d44fe46d757d313cb89e4869d1c87a20e SHA512 a0f9a069748a29a42deb8c1a270c0fec64b793eb5dc032f7a592504191c1deb705b97bc48cc1b20f5d1d0082efd0269a97126dbaeed6ee25deaba885e1419c23 WHIRLPOOL ae00c1ddba49b8d6720407aa1d6880ecabb0fb73c9f072f8d1e59808e23410d64557eb7eb3a3722641b293539d1c885660dd259ca721936733fabaab6ca82704
AUX python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch 2885 SHA256 1f5da8646c678144ecdcf14809ba74d0575fc0321b8838a88c725369e7bf5d95 SHA512 b2672a992388c095556599b84938965a704587c6e3a5be997eacbce7d534cf3558c5be888883a197b0e32283394563d33b02adc7a01be73542fd198af56d246a WHIRLPOOL 644de7191db8c2f83a194f688a040c6b3f90a93e7d4b07a918c0929ab53029e0f07ccd2a0f58a67f1ae7abc0957b0ce4fe21335dc48f6579186d6ca286d6a56d
+AUX python-2.7-Enable-static-linking-of-libraries.patch 2133 SHA256 32f42d870590732079f9948ad02ec04ff6c3092d4aba5114231ce5d493bc2369 SHA512 ba1c619b76833a16297bd4be6c26c6e12a3ff7641d9f43e1ac83cc147ca4ff33123dd9aa354d15f3b45c9f3394c0ce2a5b6ef7e34142b0ba35cea4198ddcbbc3 WHIRLPOOL eea4ec8c49c4744c57d69a6eab7328aa61218fd5ff79f8488bf4f4f5cada3b004bc8e5d52817d96e57566ce33af0cbd767387d4aef9163b544a69cb8af33ca8c
AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b
-EBUILD python-2.7.9.ebuild 10584 SHA256 677df42b0ead356366d9e60b8ae2e9443293d14ec90db87c734642bdf0262a5b SHA512 6ea813875b7977b0781e3dfca3c732a25532553b5370bc2c4e1eaf289931dd7b1ce54520649cb9622359165fec1546c0e2bcf3d96a30d60c3d997c6d53c5489e WHIRLPOOL 9408fa66b9d3d0d6877839d8718b001109999b11e010dc122eafa7e140f9264dd55fa166fae9306f4137e0c3ebdd8ea2074003a417044eff5cbbfa2885ef2fd1
+EBUILD python-2.7.9.ebuild 10943 SHA256 a743c3d8e6919835e057f983b1466543cecf71af56ac924248621953ba7a6879 SHA512 0838158fe53951e4e1ccf3186ee7e9ba05ee308bf0efb81ddd623e03c43558734dcd54495602c0a199e65519e213c2b8588086b6312e12cbe5ce05e72aa47db1 WHIRLPOOL f61cd5d490acffc113eccb2b4d99aba0a084c87e7d79683d931e238417ac62f159bd3710693c942a5d18d5d79c4a5a53ad774db3c6d75e7ac30445071efdf459
diff --git a/dev-lang/python/files/python-2.7-Enable-static-linking-of-libraries.patch b/dev-lang/python/files/python-2.7-Enable-static-linking-of-libraries.patch
new file mode 100644
index 0000000..3d9b66a
--- /dev/null
+++ b/dev-lang/python/files/python-2.7-Enable-static-linking-of-libraries.patch
@@ -0,0 +1,58 @@
+From 6a3b58806e6c4b88d6b618a87febf5ebfaf9f42c Mon Sep 17 00:00:00 2001
+From: W-Mark Kubacki <[email protected]>
+Date: Fri, 19 Dec 2014 01:59:29 +0100
+Subject: [PATCH] Enable static linking of libraries.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Libraries that are not commonly found are statically linked.
+
+OpenSSL is being included for this reasons:
+ * The base system could use BoringSSL or LibreSSL, or similar.
+ * ⦠or a stripped-down variant.
+This has been the cause of breaking builds in the past.
+---
+ setup.py | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 7868b7b..50cee6c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -248,6 +248,32 @@ class PyBuildExt(build_ext):
+ args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
+ self.compiler.set_executables(**args)
+
++ def link_static(ext, from_lib, to_static_libs=None, path='/usr/lib64'):
++ if not from_lib in ext.libraries:
++ return
++ ext.libraries = [l for l in ext.libraries if not l == from_lib]
++ if not to_static_libs:
++ to_static_libs = [from_lib]
++ for s in to_static_libs:
++ if s.startswith('/'):
++ path_to_s = s
++ else:
++ path_to_s = "%s/lib%s.a" % (path, s)
++ if path_to_s in ext.extra_link_args: # push back
++ [l for l in ext.extra_link_args if not l == path_to_s]
++ ext.extra_link_args.append(path_to_s)
++
++ for ext in self.extensions:
++ link_static(ext, "z")
++ link_static(ext, "ffi")
++ link_static(ext, "gdbm")
++ link_static(ext, "gdbm_compat", ["gdbm_compat", "gdbm"])
++ link_static(ext, "expat")
++ link_static(ext, "sqlite")
++ link_static(ext, "sqlite3")
++ link_static(ext, "crypto", ["crypto", "z"])
++ link_static(ext, "ssl", ["ssl", "crypto", "z"])
++
+ build_ext.build_extensions(self)
+
+ longest = 0
+--
+2.0.4
+
diff --git a/dev-lang/python/python-2.7.9.ebuild b/dev-lang/python/python-2.7.9.ebuild
index e72d6dd..6df4657 100644
--- a/dev-lang/python/python-2.7.9.ebuild
+++ b/dev-lang/python/python-2.7.9.ebuild
@@ -1,360 +1,373 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
WANT_AUTOMAKE="none"
WANT_LIBTOOL="none"
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
MY_P="Python-${PV}"
PATCHSET_VERSION="2.7.9-0"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="http://www.python.org/"
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
LICENSE="PSF-2"
SLOT="2.7"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline semi-static sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
+LIB_DEPEND=">=sys-libs/zlib-1.1.3[static-libs]
+ dev-libs/libffi[static-libs]
+ !build? (
+ sqlite? ( >=dev-db/sqlite-3.3.8:3[static-libs] )
+ ssl? ( dev-libs/openssl[static-libs] )
+ xml? ( >=dev-libs/expat-2.1[static-libs] )
+ )"
RDEPEND="app-arch/bzip2
- >=sys-libs/zlib-1.1.3
- virtual/libffi
+ !semi-static? (
+ virtual/libffi
+ !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) )
+ ${LIB_DEPEND//\[static-libs]}
+ )
virtual/libintl
!build? (
berkdb? ( || (
sys-libs/db:5.3
sys-libs/db:5.2
sys-libs/db:5.1
sys-libs/db:5.0
sys-libs/db:4.8
sys-libs/db:4.7
sys-libs/db:4.6
sys-libs/db:4.5
sys-libs/db:4.4
sys-libs/db:4.3
sys-libs/db:4.2
) )
- gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
>=sys-libs/ncurses-5.2
readline? ( >=sys-libs/readline-4.1 )
)
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
- ssl? ( dev-libs/openssl )
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
dev-tcltk/tix
)
- xml? ( >=dev-libs/expat-2.1 )
)
!!<sys-apps/portage-2.1.9"
DEPEND="${RDEPEND}
+ semi-static? (
+ dev-libs/libffi[static-libs]
+ !build? ( gdbm? ( sys-libs/gdbm[berkdb,static-libs] ) )
+ ${LIB_DEPEND}
+ )
virtual/pkgconfig
>=sys-devel/autoconf-2.65
!sys-devel/gcc[libffi]"
RDEPEND+=" !build? ( app-misc/mime-types )
doc? ( dev-python/python-docs:${SLOT} )"
PDEPEND="app-admin/eselect-python
app-admin/python-updater"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
if use berkdb; then
ewarn "'bsddb' module is out-of-date and no longer maintained inside"
ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
ewarn "is provided by dev-python/bsddb3."
else
if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
ewarn "You might need to migrate your databases."
fi
fi
}
src_prepare() {
epatch "${FILESDIR}/${PN}-2.7-02-Use-stronger-ciphers-by-default.patch"
epatch "${FILESDIR}/${PN}-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch"
+ if use semi-static; then
+ epatch "${FILESDIR}/${PN}-2.7-Enable-static-linking-of-libraries.patch"
+ fi
+
# Ensure that internal copies of expat, libffi and zlib are not used.
rm -r Modules/expat || die
rm -r Modules/_ctypes/libffi* || die
rm -r Modules/zlib || die
if tc-is-cross-compiler; then
local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
fi
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
# Fix for cross-compiling.
epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \
Lib/distutils/sysconfig.py \
Lib/site.py \
Lib/sysconfig.py \
Lib/test/test_site.py \
Makefile.pre.in \
Modules/Setup.dist \
Modules/getpath.c \
setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
epatch_user
eautoconf
eautoheader
}
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
export PYTHON_DISABLE_SSL="1"
else
# dbm module can be linked against berkdb or gdbm.
# Defaults to gdbm when both are enabled, #204343.
local disable
use berkdb || use gdbm || disable+=" dbm"
use berkdb || disable+=" _bsddb"
use gdbm || disable+=" gdbm"
use ncurses || disable+=" _curses _curses_panel"
use readline || disable+=" readline"
use sqlite || disable+=" _sqlite3"
use ssl || export PYTHON_DISABLE_SSL="1"
use tk || disable+=" _tkinter"
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
export PYTHON_DISABLE_MODULES="${disable}"
if ! use xml; then
ewarn "You have configured Python without XML support."
ewarn "This is NOT a recommended configuration as you"
ewarn "may face problems parsing any XML documents."
fi
fi
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
filter-flags -malign-double
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
# https://bugs.gentoo.org/show_bug.cgi?id=50309
if is-flagq -O3; then
is-flagq -fstack-protector-all && replace-flags -O3 -O2
use hardened && replace-flags -O3 -O2
fi
if tc-is-cross-compiler; then
# Force some tests that try to poke fs paths.
export ac_cv_file__dev_ptc=no
export ac_cv_file__dev_ptmx=yes
fi
# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
tc-export CXX
# The configure script fails to use pkg-config correctly.
# http://bugs.python.org/issue15506
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
# Set LDFLAGS so we link modules with -lpython2.7 correctly.
# Needed on FreeBSD unless Python 2.7 is already installed.
# Please query BSD team before removing this!
append-ldflags "-L."
local dbmliborder
if use gdbm; then
dbmliborder+="${dbmliborder:+:}gdbm"
fi
if use berkdb; then
dbmliborder+="${dbmliborder:+:}bdb"
fi
BUILD_DIR="${WORKDIR}/${CHOST}"
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
ECONF_SOURCE="${S}" OPT="" \
econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
- --with-pip \
$(use_with threads) \
$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
--with-dbmliborder="${dbmliborder}" \
--with-libc="" \
- --enable-loadable-sqlite-extensions \
--with-system-expat \
--with-system-ffi
if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
eerror "configure has detected that the sem_open function is broken."
eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
die "Broken sem_open function (bug 496328)"
fi
}
src_compile() {
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c
cd "${BUILD_DIR}" || die
emake
# Work around bug 329499. See also bug 413751 and 457194.
if has_version dev-libs/libffi[pax_kernel]; then
pax-mark E python
else
pax-mark m python
fi
}
src_test() {
# Tests will not work when cross compiling.
if tc-is-cross-compiler; then
elog "Disabling tests due to crosscompiling."
return
fi
cd "${BUILD_DIR}" || die
# Skip failing tests.
local skipped_tests="distutils gdb"
for test in ${skipped_tests}; do
mv "${S}"/Lib/test/test_${test}.py "${T}"
done
# Rerun failed tests in verbose mode (regrtest -w).
emake test EXTRATESTOPTS="-w" < /dev/tty
local result="$?"
for test in ${skipped_tests}; do
mv "${T}/test_${test}.py" "${S}"/Lib/test
done
elog "The following tests have been skipped:"
for test in ${skipped_tests}; do
elog "test_${test}.py"
done
elog "If you would like to run them, you may:"
elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
elog "and run the tests separately."
if [[ "${result}" -ne 0 ]]; then
die "emake test failed"
fi
}
src_install() {
local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
cd "${BUILD_DIR}" || die
emake DESTDIR="${D}" altinstall
sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
# Backwards compat with Gentoo divergence.
dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
# Fix collisions between different slots of Python.
mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
rm -f "${ED}usr/bin/smtpd.py"
if use build; then
rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
else
use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
fi
use threads || rm -r "${libdir}/multiprocessing" || die
use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r "${S}"/Tools
fi
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
emake --no-print-directory -s -f - 2>/dev/null)
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
sed \
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-e "s:@PYDOC@:pydoc${SLOT}:" \
-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
local PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
fi
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
}
pkg_preinst() {
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
python_updater_warning="1"
fi
}
eselect_python_update() {
if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
eselect python update
fi
if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
eselect python update --python${PV%%.*}
fi
}
pkg_postinst() {
eselect_python_update
if [[ "${python_updater_warning}" == "1" ]]; then
ewarn "You have just upgraded from an older version of Python."
ewarn "You should switch active version of Python ${PV%%.*} and run"
ewarn "'python-updater [options]' to rebuild Python modules."
fi
}
pkg_postrm() {
eselect_python_update
}
|
mark-kubacki/ossdl-overlay | 514f5d818b2252bcb36862252c36865b6376057f | dev-libs/python-2.7.9: stronger cipher ~ and a curve selection | diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 986e761..bd5a1ac 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,38 +1,8 @@
-AUX CVE-2013-4238_py27.patch 11591 SHA256 050cc2d4b9d588f2587010a30819591e02130fde90594782993a39c945c1559b SHA512 f9b1d0573bc7175b8fe6bdd8b6777a376cd717a594a14a6ddb334e0107596b0fbfbfe8a0c1743a0da54ce8ac8905cb7385aa2ae26698272f679763542c13e7e2 WHIRLPOOL bbf89edb2e3620aae3f54e80feba98d75fa566594b2e71e88b75c22036201a2692a77daf56080f4413612edf159f4282f5494a0a5dd11b350bcde248ef51f139
-AUX pydoc.conf 330 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1 SHA512 74787455e8b02bfb6faf7be5f2439900607298073337b5bfd723efc1a6c5f9a286570532793472038351fffe5e611973365c864aaea9bf4e52887336f7807097 WHIRLPOOL d957424a7d56121e9216178f3a6fa9a8b25fcf315accd964ede7ea365b8f5876e379f6728588983db478091027488b0659fc9b80e4553c4e8333b25dd1211867
-AUX pydoc.init 666 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628 SHA512 30153b992364249d3563717441997ea5417fec542d2dea167a0e52d58dffb1aeb7d92f7f9fef7dbb17277adb459193cc3a75e595904728e4cc30e6856deb69ea WHIRLPOOL cb5ded6a99b021439fdbcf5535b20fbea200a74ff76185d2f86b3c1b4686ea2c87bff625cb0575837c9c28cfb97a29e69c1516b873031ae3fcc38338dbed032e
-AUX python-2.7-01-Always-disable-SSLv2-except-when-PROTOCOL_SSLv2-is-e.patch 2439 SHA256 891f79f6d1ed89a91dd86c386f3a062eaa7382506d9d100b3ba0edc516b84253 SHA512 ae96f17f9f6563d180597308fac37a0ff685bfc7e468e1a44621c926acc922f9b299037d8c715e91ae97ff53fca1898d4cd355004e064d4933f9e9a8b5fc1128 WHIRLPOOL 8fd9e8d97239e4b70c5d36ca9cf82acf4dd274d4fcf3f8b7e9d6e6de33f8e0850adf794eb1062fdfd01454137cdd31edc87cc407afc08764fcd51f2536bfa100
-AUX python-2.7-02-Use-stronger-ciphers-by-default.patch 691 SHA256 b98ba6641d48d4dc580e56b263979e470d8721d2a6aabe67c0e97c16631f2153 SHA512 9f06943ae2fc1232cd66c3fcd46eb17e2e43fba034e5c941d6661db94eb48892be0830f4f41114932eff8fa4e2a459e8cdb735b14e96afeb73866bda1051293b WHIRLPOOL 425dea558b02d37c292dc97304c44c614f28267f835c4cc23c9b260639ff6e277e71afd1af2678c3708a2274719a58b38ea8872eb88a3c54ce302704a56ae2b0
-AUX python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch 1809 SHA256 8a574961b1fcfbf1e086fb214754b25134647838fb956a2350f5a05d56cbf5b2 SHA512 047b89e9145556ebfe77c0249e54a53acfcbf5c79387167c987db33185cb3d19693707f8410f7be9f82024c70d551d14f757e8eba4a379768d3e521106dffa14 WHIRLPOOL 3173ca851432356c5e7baa7c7c364918acedcf196696c75efa01b0be24452fa8c040167cfb8c734efbd3a847244d325f04ec24590ba08dbeabbf7c20748b0e9a
-AUX python-2.7-issue16248.patch 735 SHA256 ed137a0ab513e6d9c910e37f637aef2d58fb730070e447572f39d46d9cc99568 SHA512 da00f8571741d4cfb529b9db875b5d831d5d8e43fdc464bc43adee046f208165ab6b13d671bc90be988b1099afeac4fc0e7ba7fa473ff74a9ec7731da89e11a9 WHIRLPOOL ad770b848666efb5cc3b8c07a530f2a9aaca683f4b447c2d835e39be59a5dde35a28ab8cdb278ecf456e15e57b7401ff83fb04ac71bd8d80abc19d45beb84d62
-AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072caac22e47909fe188fc4b6becce6ea2eb SHA512 74916d541eb38c526dc1243fe5e5a9de3a7875f02c53e5f49e60182ba042de2f15514364e7fbd821146dcf92db2bba88d8a9f46d4c71237b73fd39cbabf93d85 WHIRLPOOL 62bb1c85941ccaac7ca6f6fb2d93dc27f206cf9f815b90ef1f89748dfdd1d38deda9f6bf7eb2ce9fd8635d1a77576819192e8049ec5de52fdeb9f981dfb32f9f
+AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814
+AUX pydoc.init 711 SHA256 bf42ce358c4505bb9c9923758cf7c237113b5465778fe8d0d9781625586003fd SHA512 328597e0f7594dcc1d929dcf15feb39e08a0f85067b226140219c03c2f0a0a5fa9518f26d52723aeb77e36eb5e46d54b5ee4ddbcfc52aa81540a738c49c03b73 WHIRLPOOL 846c7d90fc4b7b74d65c6019ea8e7c9f0d2efb0b6cad5b91d53b5b7bda509f3b625fb30eb27ea59cacf6233378d800c35375108762ba82fb4c2155f2dbf08f13
+AUX python-2.7-02-Use-stronger-ciphers-by-default.patch 1668 SHA256 ba4c7ff79141948fd4e4bf34bf728a5d44fe46d757d313cb89e4869d1c87a20e SHA512 a0f9a069748a29a42deb8c1a270c0fec64b793eb5dc032f7a592504191c1deb705b97bc48cc1b20f5d1d0082efd0269a97126dbaeed6ee25deaba885e1419c23 WHIRLPOOL ae00c1ddba49b8d6720407aa1d6880ecabb0fb73c9f072f8d1e59808e23410d64557eb7eb3a3722641b293539d1c885660dd259ca721936733fabaab6ca82704
+AUX python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch 2885 SHA256 1f5da8646c678144ecdcf14809ba74d0575fc0321b8838a88c725369e7bf5d95 SHA512 b2672a992388c095556599b84938965a704587c6e3a5be997eacbce7d534cf3558c5be888883a197b0e32283394563d33b02adc7a01be73542fd198af56d246a WHIRLPOOL 644de7191db8c2f83a194f688a040c6b3f90a93e7d4b07a918c0929ab53029e0f07ccd2a0f58a67f1ae7abc0957b0ce4fe21335dc48f6579186d6ca286d6a56d
AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
-AUX python-2.7.5-re_unsigned_ptrdiff.patch 941 SHA256 5b0c0465a23d27e1c8f0961a8d88b3af75fbc9933ab60c2a71091720a3681079 SHA512 d46fbbc8411fae78cdfca2564faca42f32bb95ee348b9aa3fd1ca90b346cc52cd468945cee07e6df4dff46c10cee6856a58004f8e453960f6dca2751c077802b WHIRLPOOL 10bb08242dd9a055f6bdaf3eb1546786b58f180667c6355ea7276114cbac0ffba6c34822add7965fe3b5d41cc92ce8ec45e2d1d56377d8a6aa2755ef4267d101
-AUX python-2.7.5-tls1.1-and-tls1.2.patch 80866 SHA256 5beb91b4a8c108bf33ba73821b7196659b063b97ec7f802acff15315387e566d SHA512 61a1922bf84e6baa94edd4d9f25cc547d2ed9b3e00972893057aba27a8b40710b8d9b8c72a02b5f5be1243661dc527b9a552696fefef832c82a4526f3ade6c9a WHIRLPOOL 4be280a7d35143345baacba9bf0da6186f171e294d772e46d1a93b503ec17d590ec95856d6a51883572d804bacedfb34f5ae38f95c74d9386d301460eb05b07b
-AUX python-2.7.5-tlssni.patch 10418 SHA256 f17942a92e329caaff5cee812d70063ec0617d1c25d28de39cad313530aafe27 SHA512 f2305d832feba785aed5d3670e8f9cd506d4324c789fecec94b7a23caa4e33329ccdeb2132be473d4b96023123dd3dc2077cebc32850b9ce37950a3ec0f284a7 WHIRLPOOL 01eed239be94f814f467bcceb4ecb7f651fa0cd240f6438a8ce68904282ba1062dd06f0aa588f7ae5ca841d3145e96f76936e1e2153143d38f05bcdfb50be14f
-DIST Python-2.6.5.tar.bz2 11095581 SHA256 62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc
-DIST Python-2.6.6.tar.bz2 11080872 SHA256 134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83
-DIST Python-2.7.1.tar.bz2 11722546 SHA256 80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292 SHA512 18ecc8782f134f7c52d6fbd261763d5a47eb1132a2c4b65ff47333dbb249fc9ec0818d5ff94a85acb8f645d4dfcf67c7319abb068e3a8359b165439f8e440445 WHIRLPOOL 6c8a9b18407718ad1e8eaafe4d2c4e2e456f82b4ce1a0bebd63546013f596f52d0c4282c4af08d6811e3d526f6816f1aaf9f156766726bb5c753e4083512cb88
-DIST Python-2.7.3.tar.bz2 11793433 SHA256 726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c SHA512 1fc5866b7bdbd3d6b89d92797ea4ad612a3dd6b77c4b9dde9feae64ce6c70013ea1b4d2086dd8e8be426689b4465b1a15d22b048d2f5335de629f5e8b0cb3820 WHIRLPOOL c980f465066ef0881d8b1141c6d8d4c54991c765fc258ddcd37ed2ec483f0686b8cc4cd076c56e0c8fa8891852905bed74d70b3f5071210cef7a9713542ab1a8
-DIST Python-2.7.5.tar.xz 10252148 SHA256 f33c4cab167dc69e10962e1cebf1c0768e2d0e8575648130c20e6bda84551db1 SHA512 c4691199d770cc4130604cd801375967ae0bb8a39ef34e01a4c8ab58d1c23ae83a1b493305178c4317c5622a19857750d33ffc3f10075becd5766ae664c68ee1 WHIRLPOOL fc5d3762cd67214b30de8b43024f5952362c4c811f23837e43ac2a7747c5353cc49b8785e75edd760ea58420609cd67a9a7e94abd2ea8ab25b3271af6a85168d
-DIST Python-2.7.6.tar.xz 10431288 SHA256 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 SHA512 e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 WHIRLPOOL 3b83106e89c96d2227573595bd96c868e6ece7fb04fda0aa22c8d3249af99cedebcd224ec8ae788eabe8a091a55d12af9ed093ee1eedb7c72b66732c62d5e1b3
-DIST python-2.6.5-to-stackless.diff.bz2 219210 SHA256 7633910003b0c835eb0d979a499fd2e87eda060fd8661908100284550bd0b982
-DIST python-2.6.6-to-stackless.diff.lzma 172301 SHA256 d08999d46504fe9c5b7abb778cf5bfe69e86d7926ff51a1909a8c146426160be
-DIST python-2.7.1-to-stackless.diff.lzma 942011 SHA256 c3d1e812e74e7183b39cbd3b7b594cfff14be1db82f9d34c4884b61a86dc7ef2 SHA512 0e5edf3bffa7bcab65ef5702cadbcacd6a0884e381ca339b885979c3d7a2ac3d43d03bf16661cb62ad2aa86dc32db83bfb0e81876dcb0f5a5c3d3b9891cbc031 WHIRLPOOL 905ed40dc2728a8aa6e84a3aba1081a68695e1bc83e68564a58088b0cebc7d28e78ac9f4944371c5a55610c83452f39bbe4702a6c60ebc400ac1e2965e11508f
-DIST python-2.7.3-to-stackless.patch.lzma 170548 SHA256 3d1ac205412a67e3ca9c4b7c88ab5fdf2de5de45efc10d251bcc95cbda1d35c0 SHA512 db70078f995a018e70ff6456688a761c669b38da2c496456879ad14e2a5c3e682028acd49a4b1085103a2b7a87fda6c6d3a0d9b4173feb233584cdf128ca6c34 WHIRLPOOL 8a20d0e7c844a68fd764791700d44b10e04f747a5e56f03213d1ea3119397b5e5dd3e3b1795948d8cc907fd7a17a65cd46cbd076d0779228ffec64cb2e8abe77
-DIST python-2.7.5-to-stackless.patch.xz 182688 SHA256 e0270191463d104bca55ce4d956c23ea5796f2f2c29019149d7a9553e76fafed SHA512 bd27174423251e66b098242edfe6e69de1befb0ca3cb274b60cbf5d0b854d4466a0b58fe26590d1fdbc09bfe45a7b7dd5f74f8a4e0d29d8a2035b77dfb7978f3 WHIRLPOOL 6a836862d6972c493828711cc65f8580e63a65518c5b840cbd2bacf0b8aa84eb335f29fb473c75f4359847e057a2915cd4c8bd04db0e6b4f7fded04daea09299
-DIST python-gentoo-patches-2.6.5-r5.tar.bz2 1482491 SHA256 6cb8cf0e1418cad035a243c08dfeee2e9395397dda74ada49667b3eba63bb76c
-DIST python-gentoo-patches-2.6.6-r1.tar.bz2 15729 SHA256 17d7fd6c4de686d41403322bc26bd306607f03843c4f9ab6365a985ded4f4ebb
-DIST python-gentoo-patches-2.7.1.tar.bz2 12322 SHA256 7937071d083a06c1196b794ed03c76c0448de2e16d975dec7c25b36cf9162784 SHA512 384c04f191e9e90d3cad67ffc8a35478a25e4dfb084aedc651c68921c0c5656773202df7e0a3b95ee84ca55a28571c39d324a07b417788f5784887dd86b27372 WHIRLPOOL 2ec40b2a587f97faf6c445231c5f8ca39602d7658b80f195f3d34f2f9fd1a54c782f522079222cf2e688f1b39a0581324ab1bf94971573540efc68f78fc80019
-DIST python-gentoo-patches-2.7.3-1.tar.bz2 13858 SHA256 51f6981ba02064998dfb020725c33233641b3743c4f5cf04091657313a49b8fd SHA512 afccc52ed695d3c99cb20a36d1673c0f5d9abe5e69ed42024a1cc27bb68feeafaff796b8e4e88c7264e5766aadef98d19cf548112e235848d0ca2fa271dc16c7 WHIRLPOOL b8c4e83354f913eb50b9c91ad558a4cc042a395fd4bd7227cc2e5e6ede8962eb699d44ec3b3a05b47ea658fce2e90b2d0e035282d9737d602f313bad1a7d314a
-DIST python-gentoo-patches-2.7.5-0.tar.xz 13848 SHA256 b84ff6a7669d639272cb2f94d4268d3be3af64903a380f4f60ab539e4a29b111 SHA512 9fec0ba9d958894861d4282ff9145f0387ad7fd3914a3689d148308f56158c1b397f0816c58383d2cf198f9a3b9bf321f2f441ec4aa91e4a503cd957b4a7fbd4 WHIRLPOOL 39d807453f6510f14db1b74f5dac1cd2c52d00be356d132c0f9229caeb8ba8bcbbbf32b05b3d3f6236e853b204ecb961e6b12cabacaadf5f515e93f00cda71d5
-DIST python-gentoo-patches-2.7.6-1.tar.xz 14572 SHA256 cb0fca8f006ee7b8501cfbed063c987ad6793f61072144ded2122bca6dc608ed SHA512 e6bc3de2053b1dbc5845effe86cc7d19acbcf10b52b2a1ce3d45988492a2430dd8f6ea3e547beaf57bdf176b06a07f267aa6afac82cde61ed730fe3f4b2ab238 WHIRLPOOL ecf800bc895609bbdf5ec5c53031142b56002b20930d9dd1c34610fb6628d0d5fa6874a1111fa691474bde6ae1e18a03da795bb298cde4a6f649e45637ea4da0
-DIST python-stackless-patches-2.6.5-r5.tar.lzma 2068069 SHA256 724abd43963ae2210b37fbdba7d0057ed28f204df13289df52272da9fe49571f
-EBUILD python-2.6.5-r3.ebuild 9797 SHA256 4788e06c3ca4393f7a9f6b0c29ea75d3319bbc5b26246584bf8977af190546ea SHA512 9d1014c3cb565898b80bc55b5960fea3f3b44b4a661e5c4ffef1027732b7f8676cfba704f5c2a0b2697a73ecb4dbb8b0a9192cc2af437ad52a3676f88abe88d3 WHIRLPOOL 9943ab0ca3f7efb918c7a58acfba1aa949acabd4609d8d7f7fe9ac502c95abd055f54cc373db1955a3107e1f8f15243ae3511cdb8c61d7302a91e9ef62691bb0
-EBUILD python-2.6.6-r1.ebuild 9684 SHA256 e61cc6cef34d877c5ca0e24e91e383dbd387d25cb4bd00ebe5927e44af517d55 SHA512 17d92609a0b2e86dbc9eade771c2b48dbb6e1a2930a143960df6028236e49a7f8f271149c98f597ceb620f582552f50ba6045b99caf38f4a343145f8465eed3a WHIRLPOOL a48c954e8f4f190da694a39f1d87c88a298703fab85e7f737171709742423d57025642cd31a4f5e864415c48beeba1756c386799e33eaee179fa388102f21c7a
-EBUILD python-2.7.1.ebuild 11374 SHA256 69d9bb490a09d99c1e521869baaccdbb00782612ec6929bc64cda630535cfdd0 SHA512 915ce779e3db6865fee626d02744e5962d48613783ef5850ca613db925d8a5a88c64aedbdfd41a71dd4eabe1238aa546acc2dc918dc679e791070b34f42cb26c WHIRLPOOL 02c91f80b3898065d2a5d984570a68ecf2e3550b687cd50be5e94f3c912465c2852d84d2a8634a85f7323503b02b5d9e9fa1ae902e37e414d0fb9b1cd3a39fa6
-EBUILD python-2.7.3-r2.ebuild 9748 SHA256 44c54017f70bd35c1ab2532a2428edf2c013c71a65f423d2c064796629ce23e4 SHA512 a7ad603ee15a653cfcf5d90a6fd4c70edc9be326bfd6b8149ae618e709d7b3aba2ce2ec957b93075f0ab5a7f5ba8f4f33e3fcd96f8fe57d6ce142719c30121c3 WHIRLPOOL 4120d3b0fa6eff59c610d5234137fbc0787da9b1782ec433bc63508a6be02c9527afe491fc9ebb8c37f6e2fd0f8e9c3bb8f046028e67673ec45d02becbff7685
-EBUILD python-2.7.5-r1.ebuild 11891 SHA256 50ccfb2ace18e3fc90f7e00d53938ef8e180ed303091046f5a2f2fde6dda2b39 SHA512 d3b11925476c03563e43dc0515e6a364812a060921f6e80ea599190e8cf440bcaaa93c481af5f564d3dcf7af9bab82923d2e1e227d423d8c1af2de73b42aa425 WHIRLPOOL b36bf3c20c5459bccfeb4cf0ccad08c6870a44007fa416ce9521e56e5eeca39a0178fe132db110ca4d0568aeec2a3d2ecaea0207589bac552d0768d511b68560
-EBUILD python-2.7.5-r3.ebuild 10519 SHA256 9ce42fe96be95830a2d120d8ca5b05f6d463f7304d5b9a40ff1e83e82750c0e5 SHA512 d2ac8e05951f12ac98e2425c2d0026db8d4a727b60b5663a04c1fc726c7ba6ed5dfeae436bfa71bb26cc80a35932b288a18bef4fe0360ae8025362a274d2bce4 WHIRLPOOL 840f9a9f12e0e8e7b00feca653e4cda24830b6b4bcf655155509f8c4f3fdc901f1afb3715a0e76c36cb14bf7e4bd66cbca61bd7595d463559a89270045e2d0b0
-EBUILD python-2.7.5.ebuild 11830 SHA256 a972fed05d67a3e1b271f5a418b374268ee7f5db6b258823540134f129f4fb09 SHA512 8a073af7b69bd25afa615c1532a25783c7a00d8cb93410f7a584f7ef65c16d1aad66f4bdee4f95fa7e70cb2d192d7080aba3f223ce063fc97e89a58f771284dc WHIRLPOOL 294dd2d63964d69c88b6764895e98209a99bbb68d54138d0e9db95109fbacbaa36c03e043592321b64b5116be9ebdd2a609a94cc176d1d4f812e57060e9b6341
-EBUILD python-2.7.6.ebuild 11083 SHA256 67aee153f3ca894c828335ed2624be658e882a6bdb6e9dba100a2ee92f6126de SHA512 373243e63f0ce9c1a781adfdfb41933e6a9b57041a8e65459176bf9d9bef4e8da018cc6924c000f98b8f3aaf1e3b8cecf3367a868cd9921b617886f5182aa7ec WHIRLPOOL 803f6bf75c11056eb8ea8eef4c60d444026e08c15ac1c7661565a0a4151223118331c98af030870f4d945e9759718ea8a1743d08cc6d95132e6a97abb12e93b1
+DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
+DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b
+EBUILD python-2.7.9.ebuild 10584 SHA256 677df42b0ead356366d9e60b8ae2e9443293d14ec90db87c734642bdf0262a5b SHA512 6ea813875b7977b0781e3dfca3c732a25532553b5370bc2c4e1eaf289931dd7b1ce54520649cb9622359165fec1546c0e2bcf3d96a30d60c3d997c6d53c5489e WHIRLPOOL 9408fa66b9d3d0d6877839d8718b001109999b11e010dc122eafa7e140f9264dd55fa166fae9306f4137e0c3ebdd8ea2074003a417044eff5cbbfa2885ef2fd1
diff --git a/dev-lang/python/files/CVE-2013-4238_py27.patch b/dev-lang/python/files/CVE-2013-4238_py27.patch
deleted file mode 100644
index e215589..0000000
--- a/dev-lang/python/files/CVE-2013-4238_py27.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -r 9ddc63c039ba Lib/test/nullbytecert.pem
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/Lib/test/nullbytecert.pem Sun Aug 11 18:13:17 2013 +0200
-@@ -0,0 +1,90 @@
-+Certificate:
-+ Data:
-+ Version: 3 (0x2)
-+ Serial Number: 0 (0x0)
-+ Signature Algorithm: sha1WithRSAEncryption
-+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/[email protected]
-+ Validity
-+ Not Before: Aug 7 13:11:52 2013 GMT
-+ Not After : Aug 7 13:12:52 2013 GMT
-+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/[email protected]
-+ Subject Public Key Info:
-+ Public Key Algorithm: rsaEncryption
-+ Public-Key: (2048 bit)
-+ Modulus:
-+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-+ 2f:85
-+ Exponent: 65537 (0x10001)
-+ X509v3 extensions:
-+ X509v3 Basic Constraints: critical
-+ CA:FALSE
-+ X509v3 Subject Key Identifier:
-+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
-+ X509v3 Key Usage:
-+ Digital Signature, Non Repudiation, Key Encipherment
-+ X509v3 Subject Alternative Name:
-+ *************************************************************
-+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL
-+ doesn't print the text after a NULL byte.
-+ *************************************************************
-+ DNS:altnull.python.org, email:[email protected], URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
-+ Signature Algorithm: sha1WithRSAEncryption
-+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
-+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
-+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
-+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
-+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
-+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
-+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
-+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
-+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
-+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
-+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
-+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
-+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
-+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
-+ c1:ca:a9:94
-+-----BEGIN CERTIFICATE-----
-+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
-+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
-+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
-+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
-+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
-+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
-+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
-+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
-+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
-+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
-+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
-+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
-+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
-+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
-+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
-+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
-+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
-+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
-+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
-+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
-+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
-+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
-+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
-+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
-+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
-+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
-+-----END CERTIFICATE-----
-diff -r 9ddc63c039ba Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py Sun Aug 11 13:04:50 2013 +0300
-+++ b/Lib/test/test_ssl.py Sun Aug 11 18:13:17 2013 +0200
-@@ -25,6 +25,7 @@
- HOST = test_support.HOST
- CERTFILE = None
- SVN_PYTHON_ORG_ROOT_CERT = None
-+NULLBYTECERT = None
-
- def handle_error(prefix):
- exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
-@@ -123,6 +124,27 @@
- ('DNS', 'projects.forum.nokia.com'))
- )
-
-+ def test_parse_cert_CVE_2013_4073(self):
-+ p = ssl._ssl._test_decode_cert(NULLBYTECERT)
-+ if test_support.verbose:
-+ sys.stdout.write("\n" + pprint.pformat(p) + "\n")
-+ subject = ((('countryName', 'US'),),
-+ (('stateOrProvinceName', 'Oregon'),),
-+ (('localityName', 'Beaverton'),),
-+ (('organizationName', 'Python Software Foundation'),),
-+ (('organizationalUnitName', 'Python Core Development'),),
-+ (('commonName', 'null.python.org\x00example.org'),),
-+ (('emailAddress', '[email protected]'),))
-+ self.assertEqual(p['subject'], subject)
-+ self.assertEqual(p['issuer'], subject)
-+ self.assertEqual(p['subjectAltName'],
-+ (('DNS', 'altnull.python.org\x00example.com'),
-+ ('email', '[email protected]\[email protected]'),
-+ ('URI', 'http://null.python.org\x00http://example.org'),
-+ ('IP Address', '192.0.2.1'),
-+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
-+ )
-+
- def test_DER_to_PEM(self):
- with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
- pem = f.read()
-@@ -1360,7 +1382,7 @@
-
-
- def test_main(verbose=False):
-- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT
-+ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT
- CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
- "keycert.pem")
- SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
-@@ -1368,10 +1390,13 @@
- "https_svn_python_org_root.pem")
- NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir,
- "nokia.pem")
-+ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir,
-+ "nullbytecert.pem")
-
- if (not os.path.exists(CERTFILE) or
- not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or
-- not os.path.exists(NOKIACERT)):
-+ not os.path.exists(NOKIACERT) or
-+ not os.path.exists(NULLBYTECERT)):
- raise test_support.TestFailed("Can't read certificate files!")
-
- tests = [BasicTests, BasicSocketTests]
-diff -r 9ddc63c039ba Modules/_ssl.c
---- a/Modules/_ssl.c Sun Aug 11 13:04:50 2013 +0300
-+++ b/Modules/_ssl.c Sun Aug 11 18:13:17 2013 +0200
-@@ -741,8 +741,13 @@
-
- /* get a rendering of each name in the set of names */
-
-+ int gntype;
-+ ASN1_STRING *as = NULL;
-+
- name = sk_GENERAL_NAME_value(names, j);
-- if (name->type == GEN_DIRNAME) {
-+ gntype = name-> type;
-+ switch (gntype) {
-+ case GEN_DIRNAME:
-
- /* we special-case DirName as a tuple of tuples of attributes */
-
-@@ -764,11 +769,61 @@
- goto fail;
- }
- PyTuple_SET_ITEM(t, 1, v);
-+ break;
-
-- } else {
-+ case GEN_EMAIL:
-+ case GEN_DNS:
-+ case GEN_URI:
-+ /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string
-+ correctly. */
-+ t = PyTuple_New(2);
-+ if (t == NULL)
-+ goto fail;
-+ switch (gntype) {
-+ case GEN_EMAIL:
-+ v = PyUnicode_FromString("email");
-+ as = name->d.rfc822Name;
-+ break;
-+ case GEN_DNS:
-+ v = PyUnicode_FromString("DNS");
-+ as = name->d.dNSName;
-+ break;
-+ case GEN_URI:
-+ v = PyUnicode_FromString("URI");
-+ as = name->d.uniformResourceIdentifier;
-+ break;
-+ }
-+ if (v == NULL) {
-+ Py_DECREF(t);
-+ goto fail;
-+ }
-+ PyTuple_SET_ITEM(t, 0, v);
-+ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as),
-+ ASN1_STRING_length(as));
-+ if (v == NULL) {
-+ Py_DECREF(t);
-+ goto fail;
-+ }
-+ PyTuple_SET_ITEM(t, 1, v);
-+ break;
-
-+ default:
- /* for everything else, we use the OpenSSL print form */
--
-+ switch (gntype) {
-+ /* check for new general name type */
-+ case GEN_OTHERNAME:
-+ case GEN_X400:
-+ case GEN_EDIPARTY:
-+ case GEN_IPADD:
-+ case GEN_RID:
-+ break;
-+ default:
-+ if (PyErr_Warn(PyExc_RuntimeWarning,
-+ "Unknown general name type") == -1) {
-+ goto fail;
-+ }
-+ break;
-+ }
- (void) BIO_reset(biobuf);
- GENERAL_NAME_print(biobuf, name);
- len = BIO_gets(biobuf, buf, sizeof(buf)-1);
-@@ -794,6 +849,7 @@
- goto fail;
- }
- PyTuple_SET_ITEM(t, 1, v);
-+ break;
- }
-
- /* and add that rendering to the list */
diff --git a/dev-lang/python/files/pydoc.conf b/dev-lang/python/files/pydoc.conf
index 4a98fd4..20e3628 100644
--- a/dev-lang/python/files/pydoc.conf
+++ b/dev-lang/python/files/pydoc.conf
@@ -1,8 +1,7 @@
# /etc/init.d/pydoc.conf
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.2 2008/06/30 15:10:28 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.3 2011/10/27 13:56:55 neurogeek Exp $
-# This file contains the configuration information for pydoc's internal
-# webserver. The variables should be rather self explanatory :-)
+# This file contains the configuration for pydoc's internal webserver.
-# Default port for Python's pydoc server
-PYDOC_PORT=7464
+# Default port for Python's pydoc server.
+@PYDOC_PORT_VARIABLE@="7464"
diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init
index 19b63e3..3f02ae9 100755
--- a/dev-lang/python/files/pydoc.init
+++ b/dev-lang/python/files/pydoc.init
@@ -1,26 +1,25 @@
#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Technologies, Inc.
+# Copyright 1999-2014 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public Licence v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.2 2008/06/30 15:10:28 hawking Exp $
-
-depend() {
- need net
-}
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.5 2014/10/12 12:37:07 djc Exp $
start() {
- if [ -z $PYDOC_PORT ] ; then
+ local pydoc_port="${@PYDOC_PORT_VARIABLE@-${PYDOC_PORT}}"
+
+ if [ -z "${pydoc_port}" ]; then
eerror "Port not set"
return 1
fi
- ebegin "Starting pydoc server on port $PYDOC_PORT"
+
+ ebegin "Starting pydoc server on port ${pydoc_port}"
start-stop-daemon --start --background --make-pidfile \
- --pidfile /var/run/pydoc.pid \
- --startas /usr/bin/pydoc -- -p $PYDOC_PORT
+ --pidfile /var/run/@[email protected] \
+ --exec /usr/bin/@PYDOC@ -- -p "${pydoc_port}"
eend $?
}
stop() {
ebegin "Stopping pydoc server"
- start-stop-daemon --stop --quiet --pidfile /var/run/pydoc.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/@[email protected]
eend $?
}
diff --git a/dev-lang/python/files/python-2.7-01-Always-disable-SSLv2-except-when-PROTOCOL_SSLv2-is-e.patch b/dev-lang/python/files/python-2.7-01-Always-disable-SSLv2-except-when-PROTOCOL_SSLv2-is-e.patch
deleted file mode 100644
index fe920e7..0000000
--- a/dev-lang/python/files/python-2.7-01-Always-disable-SSLv2-except-when-PROTOCOL_SSLv2-is-e.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 99accdd016b7807eca6c37c1b6bc50b1916c5256 Mon Sep 17 00:00:00 2001
-From: Antoine Pitrou <[email protected]>
-Date: Wed, 23 Apr 2014 14:27:15 +0200
-Subject: [PATCH 1/3] Always disable SSLv2 except when PROTOCOL_SSLv2 is
- explicitly asked for. [#20207]
-
----
- Lib/test/test_ssl.py | 2 +-
- Misc/NEWS | 3 +++
- Modules/_ssl.c | 7 +++++--
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
-index 9c33c8f..30a4f28 100644
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -1046,7 +1046,7 @@ else:
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True)
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL)
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED)
-- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, True)
-+ try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv23, False)
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv3, False)
- try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_TLSv1, False)
-
-diff --git a/Misc/NEWS b/Misc/NEWS
-index 326e755..3c5203f 100644
---- a/Misc/NEWS
-+++ b/Misc/NEWS
-@@ -9,6 +9,9 @@ Whats' New in Python 2.7.6?
- Library
- -------
-
-+- Issue #20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly
-+ asked for.
-+
- - Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
-
- IDLE
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index b0c052f..fc7a95e 100644
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -312,6 +312,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
- char *errstr = NULL;
- int ret;
- int verification_mode;
-+ long options;
-
- self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */
- if (self == NULL)
-@@ -417,8 +418,10 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
- }
-
- /* ssl compatibility */
-- SSL_CTX_set_options(self->ctx,
-- SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS);
-+ options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
-+ if (proto_version != PY_SSL_VERSION_SSL2)
-+ options |= SSL_OP_NO_SSLv2;
-+ SSL_CTX_set_options(self->ctx, options);
-
- verification_mode = SSL_VERIFY_NONE;
- if (certreq == PY_SSL_CERT_OPTIONAL)
---
-1.9.2
-
diff --git a/dev-lang/python/files/python-2.7-02-Use-stronger-ciphers-by-default.patch b/dev-lang/python/files/python-2.7-02-Use-stronger-ciphers-by-default.patch
index 0a7d5bc..72a154d 100644
--- a/dev-lang/python/files/python-2.7-02-Use-stronger-ciphers-by-default.patch
+++ b/dev-lang/python/files/python-2.7-02-Use-stronger-ciphers-by-default.patch
@@ -1,25 +1,47 @@
-From 17eb3571983ecd6e28616f56b594565186eac944 Mon Sep 17 00:00:00 2001
+From 98c22358b01b3298a3a1bb2d9c0a9c212457ba21 Mon Sep 17 00:00:00 2001
From: W-Mark Kubacki <[email protected]>
-Date: Wed, 23 Apr 2014 14:45:52 +0200
-Subject: [PATCH 2/3] Use stronger ciphers by default.
+Date: Thu, 18 Dec 2014 19:17:43 +0100
+Subject: [PATCH 1/2] Use stronger ciphers by default.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Use cipher groups instead of individual ciphers, so the selection
+is delegated to the SSL implementation (OpenSSL, BoringSSL, LibreSSL)
+and works with new ciphers (ChaCha20, AEGIS, NORXâ¦).
---
- Lib/ssl.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Lib/ssl.py | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Lib/ssl.py b/Lib/ssl.py
-index d03e60d..855c3de 100644
+index 0f82227..5004635 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
-@@ -107,7 +107,7 @@ import errno
+@@ -157,9 +157,9 @@ else:
+ # * Disable NULL authentication, NULL encryption, and MD5 MACs for security
+ # reasons
+ _DEFAULT_CIPHERS = (
+- 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
+- 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:'
+- 'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5'
++ 'EECDH+HIGH:EDH+HIGH:-AES256:EECDH+HIGH:EDH+HIGH:HIGH:'
++ '-3DES:HIGH:!kECDH:!kDH:'
++ '!aNULL:!MD5'
+ )
- # Disable weak or insecure ciphers by default
- # (OpenSSL's default setting is 'DEFAULT:!aNULL:!eNULL')
--_DEFAULT_CIPHERS = 'DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2'
-+_DEFAULT_CIPHERS = 'ECDH+HIGH:DH+HIGH:-3DES:HIGH:!aNULL:!MD5:!RC4'
+ # Restricted and more secure ciphers for the server side
+@@ -172,9 +172,8 @@ _DEFAULT_CIPHERS = (
+ # * Disable NULL authentication, NULL encryption, MD5 MACs, DSS, and RC4 for
+ # security reasons
+ _RESTRICTED_SERVER_CIPHERS = (
+- 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
+- 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:!aNULL:'
+- '!eNULL:!MD5:!DSS:!RC4'
++ 'EECDH+HIGH:EDH+HIGH:-AES256:EECDH+HIGH:EDH+HIGH:-3DES:-CAMELLIA:'
++ '!aNULL:!MD5:!RC4'
+ )
- class SSLSocket(socket):
--
-1.9.2
+2.0.4
diff --git a/dev-lang/python/files/python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch b/dev-lang/python/files/python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch
index 4c32289..19e9b1b 100644
--- a/dev-lang/python/files/python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch
+++ b/dev-lang/python/files/python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch
@@ -1,54 +1,87 @@
-From 8fe8b1a0703adbebb2eb877b469c0707265f80eb Mon Sep 17 00:00:00 2001
+From 0672774eda63746f8ce17e1f564b5188aa4f83a4 Mon Sep 17 00:00:00 2001
From: W-Mark Kubacki <[email protected]>
-Date: Wed, 23 Apr 2014 18:51:15 +0200
-Subject: [PATCH 3/3] Support SSL_CTX_set_ecdh_auto on newer OpenSSLs.
+Date: Thu, 18 Dec 2014 20:11:51 +0100
+Subject: [PATCH 2/2] Configure ECDH curves.
---
- Modules/_ssl.c | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
+ Modules/_ssl.c | 50 +++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 35 insertions(+), 15 deletions(-)
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index fc7a95e..a9a78ea 100644
+index 898d6c0..6361033 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
-@@ -374,6 +374,37 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
- }
- }
+@@ -200,6 +200,14 @@ static unsigned int _ssl_locks_count = 0;
+ # define HAVE_OPENSSL_VERIFY_PARAM
+ #endif
+
++/* For automatic curve selection. */
++#ifdef __AVX__
++#define OPENSSL_CURVES_SERVER "K-283:prime256v1"
++#define OPENSSL_CURVES_CLIENT "K-283:prime256v1:K-409:K-571:P-521:P-384"
++#else
++#define OPENSSL_CURVES_SERVER "prime256v1:K-283"
++#define OPENSSL_CURVES_CLIENT "prime256v1:K-283:P-521:P-384:K-409:K-571"
++#endif
+
+ typedef struct {
+ PyObject_HEAD
+@@ -483,6 +491,33 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
+ (void) ERR_get_state();
+ ERR_clear_error();
-+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#ifndef OPENSSL_NO_ECDH
++ /* Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use
++ prime256v1 by default. */
+#if defined(SSL_CTX_set_ecdh_auto)
+ if (socket_type == PY_SSL_SERVER) {
-+ // offering a conservative list of curves is the responsibility
-+ // of the server
-+ if (SSL_CTX_set1_curves_list(self->ctx, "K-283:prime256v1") == 0) {
-+ errstr = ERRSTR("Unknown curves: K-283 or prime256v1.");
-+ goto fail;
++ if (SSL_CTX_set1_curves_list(ctx, OPENSSL_CURVES_SERVER) == 0) {
++ PyErr_SetString(PyExc_NotImplementedError, "Unknown curves: "
++ OPENSSL_CURVES_CLIENT);
++ return NULL;
+ }
-+ } else {
-+ if (SSL_CTX_set1_curves_list(self->ctx, "K-571:K-409:P-521:P-384:K-283:prime256v1") == 0) {
-+ errstr = ERRSTR("Unknown curves: K-571, K-409, P-521, P-384, K-283 or prime256v1.");
-+ goto fail;
++ } else { /* socket_type == PY_SSL_CLIENT */
++ if (SSL_CTX_set1_curves_list(ctx, OPENSSL_CURVES_CLIENT) == 0) {
++ PyErr_SetString(PyExc_NotImplementedError, "Unknown curves: "
++ OPENSSL_CURVES_SERVER);
++ return NULL;
+ }
+ }
-+
-+ if (SSL_CTX_set_ecdh_auto(self->ctx, 1) == 0) {
-+ errstr = ERRSTR("Automatic curve selection is not possible or available.");
-+ goto fail;
++ SSL_CTX_set_ecdh_auto(ctx, 1);
++#else
++ {
++ EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
++ SSL_CTX_set_tmp_ecdh(ctx, key);
++ EC_KEY_free(key);
+ }
-+#else // not defined(SSL_CTX_set_ecdh_auto)
-+ { // fall back to prime256v1
-+ EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-+ SSL_CTX_set_tmp_ecdh(self->ctx, ecdh);
-+ EC_KEY_free(ecdh);
-+ }
-+#endif
+#endif
+#endif
+
- if (certreq != PY_SSL_CERT_NONE) {
- if (cacerts_file == NULL) {
- errstr = ERRSTR("No root certificates specified for "
+ PySSL_BEGIN_ALLOW_THREADS
+ self->ssl = SSL_new(ctx);
+ PySSL_END_ALLOW_THREADS
+@@ -2044,21 +2079,6 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ options |= SSL_OP_NO_SSLv2;
+ SSL_CTX_set_options(self->ctx, options);
+
+-#ifndef OPENSSL_NO_ECDH
+- /* Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use
+- prime256v1 by default. This is Apache mod_ssl's initialization
+- policy, so we should be safe. */
+-#if defined(SSL_CTX_set_ecdh_auto)
+- SSL_CTX_set_ecdh_auto(self->ctx, 1);
+-#else
+- {
+- EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+- SSL_CTX_set_tmp_ecdh(self->ctx, key);
+- EC_KEY_free(key);
+- }
+-#endif
+-#endif
+-
+ #define SID_CTX "Python"
+ SSL_CTX_set_session_id_context(self->ctx, (const unsigned char *) SID_CTX,
+ sizeof(SID_CTX));
--
-1.9.2
+2.0.4
diff --git a/dev-lang/python/files/python-2.7-issue16248.patch b/dev-lang/python/files/python-2.7-issue16248.patch
deleted file mode 100644
index ce9c654..0000000
--- a/dev-lang/python/files/python-2.7-issue16248.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <[email protected]>
-# Date 1375388712 -7200
-# Node ID 0f17aed78168e63ec058c219d03cea7240f83dd6
-# Parent bb546f6d8ab4f513804d7a420657963881e5b447
-Fix tkinter regression introduced by the security fix in #16248.
-
-diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
---- a/Lib/lib-tk/Tkinter.py
-+++ b/Lib/lib-tk/Tkinter.py
-@@ -1736,7 +1736,7 @@ class Tk(Misc, Wm):
- # ensure that self.tk is always _something_.
- self.tk = None
- if baseName is None:
-- import sys, os
-+ import os
- baseName = os.path.basename(sys.argv[0])
- baseName, ext = os.path.splitext(baseName)
- if ext not in ('.py', '.pyc', '.pyo'):
diff --git a/dev-lang/python/files/python-2.7.5-library-path.patch b/dev-lang/python/files/python-2.7.5-library-path.patch
deleted file mode 100644
index 6f43575..0000000
--- a/dev-lang/python/files/python-2.7.5-library-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Ned Deily <[email protected]>
-# Date 1368666045 25200
-# Node ID cd577c3288860b0deb459443ca5c489dc0f99ef6
-# Parent 149340b3004acfcb68e5ed36b1e96b7463c756c7
-Issue #17990: Only modify include and library search paths when cross-compiling.
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -437,9 +437,11 @@ class PyBuildExt(build_ext):
-
- def detect_modules(self):
- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-- self.add_gcc_paths()
-+ if not cross_compiling:
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+ if cross_compiling:
-+ self.add_gcc_paths()
- self.add_multiarch_paths()
-
- # Add paths specified in the environment variables LDFLAGS and
diff --git a/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch b/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch
deleted file mode 100644
index a905839..0000000
--- a/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=476426
-http://bugs.python.org/issue17998
-diff -r d91da96a55bf Modules/_sre.c
---- a/Modules/_sre.c Thu May 16 22:47:47 2013 +0100
-+++ b/Modules/_sre.c Fri May 17 21:02:48 2013 +0300
-@@ -1028,7 +1028,7 @@
- TRACE(("|%p|%p|REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr,
- ctx->pattern[1], ctx->pattern[2]));
-
-- if (ctx->pattern[1] > end - ctx->ptr)
-+ if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr)
- RETURN_FAILURE; /* cannot match */
-
- state->ptr = ctx->ptr;
-@@ -1111,7 +1111,7 @@
- TRACE(("|%p|%p|MIN_REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr,
- ctx->pattern[1], ctx->pattern[2]));
-
-- if (ctx->pattern[1] > end - ctx->ptr)
-+ if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr)
- RETURN_FAILURE; /* cannot match */
-
- state->ptr = ctx->ptr;
diff --git a/dev-lang/python/files/python-2.7.5-tls1.1-and-tls1.2.patch b/dev-lang/python/files/python-2.7.5-tls1.1-and-tls1.2.patch
deleted file mode 100644
index c3b6878..0000000
--- a/dev-lang/python/files/python-2.7.5-tls1.1-and-tls1.2.patch
+++ /dev/null
@@ -1,2246 +0,0 @@
-diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
-index 01072c4..0bf9972 100644
---- a/Doc/library/ssl.rst
-+++ b/Doc/library/ssl.rst
-@@ -28,7 +28,8 @@ probably additional platforms, as long as OpenSSL is installed on that platform.
-
- Some behavior may be platform dependent, since calls are made to the
- operating system socket APIs. The installed version of OpenSSL may also
-- cause variations in behavior.
-+ cause variations in behavior. For example, TLSv1.1 and TLSv1.2 come with
-+ openssl version 1.0.1.
-
- This section documents the objects and functions in the ``ssl`` module; for more
- general information about TLS, SSL, and certificates, the reader is referred to
-@@ -112,14 +113,16 @@ Functions, Constants, and Exceptions
-
- .. table::
-
-- ======================== ========= ========= ========== =========
-- *client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1**
-- ------------------------ --------- --------- ---------- ---------
-- *SSLv2* yes no yes no
-- *SSLv3* no yes yes no
-- *SSLv23* yes no yes no
-- *TLSv1* no no yes yes
-- ======================== ========= ========= ========== =========
-+ ======================== ========= ========= ========== ========= =========== ===========
-+ *client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1** **TLSv1.1** **TLSv1.2**
-+ ------------------------ --------- --------- ---------- --------- ----------- -----------
-+ *SSLv2* yes no yes no no no
-+ *SSLv3* no yes yes no no no
-+ *SSLv23* yes no yes no no no
-+ *TLSv1* no no yes yes no no
-+ *TLSv1.1* no no yes no yes no
-+ *TLSv1.2* no no yes no no yes
-+ ======================== ========= ========= ========== ========= =========== ===========
-
- .. note::
-
-@@ -260,9 +263,131 @@ Functions, Constants, and Exceptions
-
- .. data:: PROTOCOL_TLSv1
-
-- Selects TLS version 1 as the channel encryption protocol. This is the most
-+ Selects TLS version 1.0 as the channel encryption protocol.
-+
-+.. data:: PROTOCOL_TLSv1_1
-+
-+
-+ Selects TLS version 1.1 as the channel encryption protocol.
-+ Available only with openssl version 1.0.1+.
-+
-+ .. versionadded:: 3.4
-+
-+.. data:: PROTOCOL_TLSv1_2
-+
-+ Selects TLS version 1.2 as the channel encryption protocol. This is the most
- modern version, and probably the best choice for maximum protection, if both
- sides can speak it.
-+ Available only with openssl version 1.0.1+.
-+
-+ .. versionadded:: 3.4
-+
-+.. data:: OP_ALL
-+
-+ Enables workarounds for various bugs present in other SSL implementations.
-+ This option is set by default. It does not necessarily set the same
-+ flags as OpenSSL's ``SSL_OP_ALL`` constant.
-+
-+ .. versionadded:: 3.2
-+
-+.. data:: OP_NO_SSLv2
-+
-+ Prevents an SSLv2 connection. This option is only applicable in
-+ conjunction with :const:`PROTOCOL_SSLv23`. It prevents the peers from
-+ choosing SSLv2 as the protocol version.
-+
-+ .. versionadded:: 3.2
-+
-+.. data:: OP_NO_SSLv3
-+
-+ Prevents an SSLv3 connection. This option is only applicable in
-+ conjunction with :const:`PROTOCOL_SSLv23`. It prevents the peers from
-+ choosing SSLv3 as the protocol version.
-+
-+ .. versionadded:: 3.2
-+
-+.. data:: OP_NO_TLSv1
-+
-+ Prevents a TLSv1 connection. This option is only applicable in
-+ conjunction with :const:`PROTOCOL_SSLv23`. It prevents the peers from
-+ choosing TLSv1 as the protocol version.
-+
-+ .. versionadded:: 3.2
-+
-+.. data:: OP_NO_TLSv1_1
-+
-+ Prevents a TLSv1.1 connection. This option is only applicable in conjunction
-+ with :const:`PROTOCOL_SSLv23`. It prevents the peers from choosing TLSv1.1 as
-+ the protocol version. Available only with openssl version 1.0.1+.
-+
-+ .. versionadded:: 3.4
-+
-+.. data:: OP_NO_TLSv1_2
-+
-+ Prevents a TLSv1.2 connection. This option is only applicable in conjunction
-+ with :const:`PROTOCOL_SSLv23`. It prevents the peers from choosing TLSv1.2 as
-+ the protocol version. Available only with openssl version 1.0.1+.
-+
-+ .. versionadded:: 3.4
-+
-+.. data:: OP_CIPHER_SERVER_PREFERENCE
-+
-+ Use the server's cipher ordering preference, rather than the client's.
-+ This option has no effect on client sockets and SSLv2 server sockets.
-+
-+ .. versionadded:: 3.3
-+
-+.. data:: OP_SINGLE_DH_USE
-+
-+ Prevents re-use of the same DH key for distinct SSL sessions. This
-+ improves forward secrecy but requires more computational resources.
-+ This option only applies to server sockets.
-+
-+ .. versionadded:: 3.3
-+
-+.. data:: OP_SINGLE_ECDH_USE
-+
-+ Prevents re-use of the same ECDH key for distinct SSL sessions. This
-+ improves forward secrecy but requires more computational resources.
-+ This option only applies to server sockets.
-+
-+ .. versionadded:: 3.3
-+
-+.. data:: OP_NO_COMPRESSION
-+
-+ Disable compression on the SSL channel. This is useful if the application
-+ protocol supports its own compression scheme.
-+
-+ This option is only available with OpenSSL 1.0.0 and later.
-+
-+ .. versionadded:: 3.3
-+
-+.. data:: HAS_ECDH
-+
-+ Whether the OpenSSL library has built-in support for Elliptic Curve-based
-+ Diffie-Hellman key exchange. This should be true unless the feature was
-+ explicitly disabled by the distributor.
-+
-+ .. versionadded:: 3.3
-+
-+.. data:: HAS_SNI
-+
-+ Whether the OpenSSL library has built-in support for the *Server Name
-+ Indication* extension to the SSLv3 and TLSv1 protocols (as defined in
-+ :rfc:`4366`). When true, you can use the *server_hostname* argument to
-+ :meth:`SSLContext.wrap_socket`.
-+
-+ .. versionadded:: 3.2
-+
-+.. data:: HAS_NPN
-+
-+ Whether the OpenSSL library has built-in support for *Next Protocol
-+ Negotiation* as described in the `NPN draft specification
-+ <http://tools.ietf.org/html/draft-agl-tls-nextprotoneg>`_. When true,
-+ you can use the :meth:`SSLContext.set_npn_protocols` method to advertise
-+ which protocols you want to support.
-+
-+ .. versionadded:: 3.3
-
- .. data:: OPENSSL_VERSION
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
-index 7b4fdbc..22bf0cc 100644
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -53,6 +53,8 @@ PROTOCOL_SSLv2
- PROTOCOL_SSLv3
- PROTOCOL_SSLv23
- PROTOCOL_TLSv1
-+PROTOCOL_TLSv1_1
-+PROTOCOL_TLSv1_2
- """
-
- import textwrap
-@@ -73,6 +75,9 @@ from _ssl import \
- SSL_ERROR_WANT_CONNECT, \
- SSL_ERROR_EOF, \
- SSL_ERROR_INVALID_ERROR_CODE
-+
-+from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN
-+
- from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
- _PROTOCOL_NAMES = {
- PROTOCOL_TLSv1: "TLSv1",
-@@ -87,6 +92,14 @@ except ImportError:
- else:
- _PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2"
-
-+try:
-+ from _ssl import PROTOCOL_TLSv1_1, PROTOCOL_TLSv1_2
-+except ImportError:
-+ pass
-+else:
-+ _PROTOCOL_NAMES[PROTOCOL_TLSv1_1] = "TLSv1.1"
-+ _PROTOCOL_NAMES[PROTOCOL_TLSv1_2] = "TLSv1.2"
-+
- from socket import socket, _fileobject, _delegate_methods, error as socket_error
- from socket import getnameinfo as _getnameinfo
- import base64 # for DER-to-PEM translation
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index 09c741f..843eb3b 100644
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -35,6 +35,61 @@
-
- #endif
-
-+/* Include symbols from _socket module */
-+#include "socketmodule.h"
-+
-+static PySocketModule_APIObject PySocketModule;
-+
-+#if defined(HAVE_POLL_H)
-+#include <poll.h>
-+#elif defined(HAVE_SYS_POLL_H)
-+#include <sys/poll.h>
-+#endif
-+
-+/* Include OpenSSL header files */
-+#include "openssl/rsa.h"
-+#include "openssl/crypto.h"
-+#include "openssl/x509.h"
-+#include "openssl/x509v3.h"
-+#include "openssl/pem.h"
-+#include "openssl/ssl.h"
-+#include "openssl/err.h"
-+#include "openssl/rand.h"
-+
-+/* SSL error object */
-+static PyObject *PySSLErrorObject;
-+static PyObject *PySSLZeroReturnErrorObject;
-+static PyObject *PySSLWantReadErrorObject;
-+static PyObject *PySSLWantWriteErrorObject;
-+static PyObject *PySSLSyscallErrorObject;
-+static PyObject *PySSLEOFErrorObject;
-+
-+/* Error mappings */
-+static PyObject *err_codes_to_names;
-+static PyObject *err_names_to_codes;
-+static PyObject *lib_codes_to_names;
-+
-+struct py_ssl_error_code {
-+ const char *mnemonic;
-+ int library, reason;
-+};
-+struct py_ssl_library_code {
-+ const char *library;
-+ int code;
-+};
-+
-+/* Include generated data (error codes) */
-+#include "_ssl_data.h"
-+
-+/* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
-+ http://www.openssl.org/news/changelog.html
-+ */
-+#if OPENSSL_VERSION_NUMBER >= 0x10001000L
-+# define HAVE_TLSv1_2 1
-+#else
-+# define HAVE_TLSv1_2 0
-+#endif
-+
- enum py_ssl_error {
- /* these mirror ssl.h */
- PY_SSL_ERROR_NONE,
-@@ -67,30 +122,14 @@ enum py_ssl_version {
- #endif
- PY_SSL_VERSION_SSL3=1,
- PY_SSL_VERSION_SSL23,
-+#if HAVE_TLSv1_2
-+ PY_SSL_VERSION_TLS1,
-+ PY_SSL_VERSION_TLS1_1,
-+ PY_SSL_VERSION_TLS1_2
-+#else
- PY_SSL_VERSION_TLS1
--};
--
--/* Include symbols from _socket module */
--#include "socketmodule.h"
--
--#if defined(HAVE_POLL_H)
--#include <poll.h>
--#elif defined(HAVE_SYS_POLL_H)
--#include <sys/poll.h>
- #endif
--
--/* Include OpenSSL header files */
--#include "openssl/rsa.h"
--#include "openssl/crypto.h"
--#include "openssl/x509.h"
--#include "openssl/x509v3.h"
--#include "openssl/pem.h"
--#include "openssl/ssl.h"
--#include "openssl/err.h"
--#include "openssl/rand.h"
--
--/* SSL error object */
--static PyObject *PySSLErrorObject;
-+};
-
- #ifdef WITH_THREAD
-
-@@ -302,6 +341,12 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
- PySSL_BEGIN_ALLOW_THREADS
- if (proto_version == PY_SSL_VERSION_TLS1)
- self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */
-+#if HAVE_TLSv1_2
-+ else if (proto_version == PY_SSL_VERSION_TLS1_1)
-+ self->ctx = SSL_CTX_new(TLSv1_1_method());
-+ else if (proto_version == PY_SSL_VERSION_TLS1_2)
-+ self->ctx = SSL_CTX_new(TLSv1_2_method());
-+#endif
- else if (proto_version == PY_SSL_VERSION_SSL3)
- self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
- #ifndef OPENSSL_NO_SSL2
-@@ -1669,6 +1714,8 @@ init_ssl(void)
- PyObject *m, *d, *r;
- unsigned long libver;
- unsigned int major, minor, fix, patch, status;
-+ struct py_ssl_error_code *errcode;
-+ struct py_ssl_library_code *libcode;
-
- Py_TYPE(&PySSL_Type) = &PyType_Type;
-
-@@ -1741,6 +1788,109 @@ init_ssl(void)
- PY_SSL_VERSION_SSL23);
- PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",
- PY_SSL_VERSION_TLS1);
-+#if HAVE_TLSv1_2
-+ PyModule_AddIntConstant(m, "PROTOCOL_TLSv1_1",
-+ PY_SSL_VERSION_TLS1_1);
-+ PyModule_AddIntConstant(m, "PROTOCOL_TLSv1_2",
-+ PY_SSL_VERSION_TLS1_2);
-+#endif
-+
-+ /* protocol options */
-+ PyModule_AddIntConstant(m, "OP_ALL",
-+ SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS);
-+ PyModule_AddIntConstant(m, "OP_NO_SSLv2", SSL_OP_NO_SSLv2);
-+ PyModule_AddIntConstant(m, "OP_NO_SSLv3", SSL_OP_NO_SSLv3);
-+ PyModule_AddIntConstant(m, "OP_NO_TLSv1", SSL_OP_NO_TLSv1);
-+#if HAVE_TLSv1_2
-+ PyModule_AddIntConstant(m, "OP_NO_TLSv1_1", SSL_OP_NO_TLSv1_1);
-+ PyModule_AddIntConstant(m, "OP_NO_TLSv1_2", SSL_OP_NO_TLSv1_2);
-+#endif
-+ PyModule_AddIntConstant(m, "OP_CIPHER_SERVER_PREFERENCE",
-+ SSL_OP_CIPHER_SERVER_PREFERENCE);
-+ PyModule_AddIntConstant(m, "OP_SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE);
-+#ifdef SSL_OP_SINGLE_ECDH_USE
-+ PyModule_AddIntConstant(m, "OP_SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE);
-+#endif
-+#ifdef SSL_OP_NO_COMPRESSION
-+ PyModule_AddIntConstant(m, "OP_NO_COMPRESSION",
-+ SSL_OP_NO_COMPRESSION);
-+#endif
-+
-+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-+ r = Py_True;
-+#else
-+ r = Py_False;
-+#endif
-+ Py_INCREF(r);
-+ PyModule_AddObject(m, "HAS_SNI", r);
-+
-+#if HAVE_OPENSSL_FINISHED
-+ r = Py_True;
-+#else
-+ r = Py_False;
-+#endif
-+ Py_INCREF(r);
-+ PyModule_AddObject(m, "HAS_TLS_UNIQUE", r);
-+
-+#ifdef OPENSSL_NO_ECDH
-+ r = Py_False;
-+#else
-+ r = Py_True;
-+#endif
-+ Py_INCREF(r);
-+ PyModule_AddObject(m, "HAS_ECDH", r);
-+
-+#ifdef OPENSSL_NPN_NEGOTIATED
-+ r = Py_True;
-+#else
-+ r = Py_False;
-+#endif
-+ Py_INCREF(r);
-+ PyModule_AddObject(m, "HAS_NPN", r);
-+
-+ /* Mappings for error codes */
-+ err_codes_to_names = PyDict_New();
-+ err_names_to_codes = PyDict_New();
-+ if (err_codes_to_names == NULL || err_names_to_codes == NULL)
-+ return;
-+ errcode = error_codes;
-+ while (errcode->mnemonic != NULL) {
-+ PyObject *mnemo, *key;
-+ mnemo = PyUnicode_FromString(errcode->mnemonic);
-+ key = Py_BuildValue("ii", errcode->library, errcode->reason);
-+ if (mnemo == NULL || key == NULL)
-+ return;
-+ if (PyDict_SetItem(err_codes_to_names, key, mnemo))
-+ return;
-+ if (PyDict_SetItem(err_names_to_codes, mnemo, key))
-+ return;
-+ Py_DECREF(key);
-+ Py_DECREF(mnemo);
-+ errcode++;
-+ }
-+ if (PyModule_AddObject(m, "err_codes_to_names", err_codes_to_names))
-+ return;
-+ if (PyModule_AddObject(m, "err_names_to_codes", err_names_to_codes))
-+ return;
-+
-+ lib_codes_to_names = PyDict_New();
-+ if (lib_codes_to_names == NULL)
-+ return;
-+ libcode = library_codes;
-+ while (libcode->library != NULL) {
-+ PyObject *mnemo, *key;
-+ key = PyLong_FromLong(libcode->code);
-+ mnemo = PyUnicode_FromString(libcode->library);
-+ if (key == NULL || mnemo == NULL)
-+ return;
-+ if (PyDict_SetItem(lib_codes_to_names, key, mnemo))
-+ return;
-+ Py_DECREF(key);
-+ Py_DECREF(mnemo);
-+ libcode++;
-+ }
-+ if (PyModule_AddObject(m, "lib_codes_to_names", lib_codes_to_names))
-+ return;
-
- /* OpenSSL version */
- /* SSLeay() gives us the version of the library linked against,
-diff --git a/Modules/_ssl_data.h b/Modules/_ssl_data.h
-new file mode 100644
-index 0000000..bb37869
---- /dev/null
-+++ b/Modules/_ssl_data.h
-@@ -0,0 +1,1778 @@
-+/* File generated by Tools/ssl/make_ssl_data.py */
-+/* Generated on 2013-07-03T19:14:57.404342 */
-+
-+static struct py_ssl_library_code library_codes[] = {
-+ {"PEM", ERR_LIB_PEM},
-+ {"SSL", ERR_LIB_SSL},
-+ {"X509", ERR_LIB_X509},
-+ { NULL }
-+};
-+
-+static struct py_ssl_error_code error_codes[] = {
-+ #ifdef PEM_R_BAD_BASE64_DECODE
-+ {"BAD_BASE64_DECODE", ERR_LIB_PEM, PEM_R_BAD_BASE64_DECODE},
-+ #else
-+ {"BAD_BASE64_DECODE", ERR_LIB_PEM, 100},
-+ #endif
-+ #ifdef PEM_R_BAD_DECRYPT
-+ {"BAD_DECRYPT", ERR_LIB_PEM, PEM_R_BAD_DECRYPT},
-+ #else
-+ {"BAD_DECRYPT", ERR_LIB_PEM, 101},
-+ #endif
-+ #ifdef PEM_R_BAD_END_LINE
-+ {"BAD_END_LINE", ERR_LIB_PEM, PEM_R_BAD_END_LINE},
-+ #else
-+ {"BAD_END_LINE", ERR_LIB_PEM, 102},
-+ #endif
-+ #ifdef PEM_R_BAD_IV_CHARS
-+ {"BAD_IV_CHARS", ERR_LIB_PEM, PEM_R_BAD_IV_CHARS},
-+ #else
-+ {"BAD_IV_CHARS", ERR_LIB_PEM, 103},
-+ #endif
-+ #ifdef PEM_R_BAD_MAGIC_NUMBER
-+ {"BAD_MAGIC_NUMBER", ERR_LIB_PEM, PEM_R_BAD_MAGIC_NUMBER},
-+ #else
-+ {"BAD_MAGIC_NUMBER", ERR_LIB_PEM, 116},
-+ #endif
-+ #ifdef PEM_R_BAD_PASSWORD_READ
-+ {"BAD_PASSWORD_READ", ERR_LIB_PEM, PEM_R_BAD_PASSWORD_READ},
-+ #else
-+ {"BAD_PASSWORD_READ", ERR_LIB_PEM, 104},
-+ #endif
-+ #ifdef PEM_R_BAD_VERSION_NUMBER
-+ {"BAD_VERSION_NUMBER", ERR_LIB_PEM, PEM_R_BAD_VERSION_NUMBER},
-+ #else
-+ {"BAD_VERSION_NUMBER", ERR_LIB_PEM, 117},
-+ #endif
-+ #ifdef PEM_R_BIO_WRITE_FAILURE
-+ {"BIO_WRITE_FAILURE", ERR_LIB_PEM, PEM_R_BIO_WRITE_FAILURE},
-+ #else
-+ {"BIO_WRITE_FAILURE", ERR_LIB_PEM, 118},
-+ #endif
-+ #ifdef PEM_R_CIPHER_IS_NULL
-+ {"CIPHER_IS_NULL", ERR_LIB_PEM, PEM_R_CIPHER_IS_NULL},
-+ #else
-+ {"CIPHER_IS_NULL", ERR_LIB_PEM, 127},
-+ #endif
-+ #ifdef PEM_R_ERROR_CONVERTING_PRIVATE_KEY
-+ {"ERROR_CONVERTING_PRIVATE_KEY", ERR_LIB_PEM, PEM_R_ERROR_CONVERTING_PRIVATE_KEY},
-+ #else
-+ {"ERROR_CONVERTING_PRIVATE_KEY", ERR_LIB_PEM, 115},
-+ #endif
-+ #ifdef PEM_R_EXPECTING_PRIVATE_KEY_BLOB
-+ {"EXPECTING_PRIVATE_KEY_BLOB", ERR_LIB_PEM, PEM_R_EXPECTING_PRIVATE_KEY_BLOB},
-+ #else
-+ {"EXPECTING_PRIVATE_KEY_BLOB", ERR_LIB_PEM, 119},
-+ #endif
-+ #ifdef PEM_R_EXPECTING_PUBLIC_KEY_BLOB
-+ {"EXPECTING_PUBLIC_KEY_BLOB", ERR_LIB_PEM, PEM_R_EXPECTING_PUBLIC_KEY_BLOB},
-+ #else
-+ {"EXPECTING_PUBLIC_KEY_BLOB", ERR_LIB_PEM, 120},
-+ #endif
-+ #ifdef PEM_R_INCONSISTENT_HEADER
-+ {"INCONSISTENT_HEADER", ERR_LIB_PEM, PEM_R_INCONSISTENT_HEADER},
-+ #else
-+ {"INCONSISTENT_HEADER", ERR_LIB_PEM, 121},
-+ #endif
-+ #ifdef PEM_R_KEYBLOB_HEADER_PARSE_ERROR
-+ {"KEYBLOB_HEADER_PARSE_ERROR", ERR_LIB_PEM, PEM_R_KEYBLOB_HEADER_PARSE_ERROR},
-+ #else
-+ {"KEYBLOB_HEADER_PARSE_ERROR", ERR_LIB_PEM, 122},
-+ #endif
-+ #ifdef PEM_R_KEYBLOB_TOO_SHORT
-+ {"KEYBLOB_TOO_SHORT", ERR_LIB_PEM, PEM_R_KEYBLOB_TOO_SHORT},
-+ #else
-+ {"KEYBLOB_TOO_SHORT", ERR_LIB_PEM, 123},
-+ #endif
-+ #ifdef PEM_R_NOT_DEK_INFO
-+ {"NOT_DEK_INFO", ERR_LIB_PEM, PEM_R_NOT_DEK_INFO},
-+ #else
-+ {"NOT_DEK_INFO", ERR_LIB_PEM, 105},
-+ #endif
-+ #ifdef PEM_R_NOT_ENCRYPTED
-+ {"NOT_ENCRYPTED", ERR_LIB_PEM, PEM_R_NOT_ENCRYPTED},
-+ #else
-+ {"NOT_ENCRYPTED", ERR_LIB_PEM, 106},
-+ #endif
-+ #ifdef PEM_R_NOT_PROC_TYPE
-+ {"NOT_PROC_TYPE", ERR_LIB_PEM, PEM_R_NOT_PROC_TYPE},
-+ #else
-+ {"NOT_PROC_TYPE", ERR_LIB_PEM, 107},
-+ #endif
-+ #ifdef PEM_R_NO_START_LINE
-+ {"NO_START_LINE", ERR_LIB_PEM, PEM_R_NO_START_LINE},
-+ #else
-+ {"NO_START_LINE", ERR_LIB_PEM, 108},
-+ #endif
-+ #ifdef PEM_R_PROBLEMS_GETTING_PASSWORD
-+ {"PROBLEMS_GETTING_PASSWORD", ERR_LIB_PEM, PEM_R_PROBLEMS_GETTING_PASSWORD},
-+ #else
-+ {"PROBLEMS_GETTING_PASSWORD", ERR_LIB_PEM, 109},
-+ #endif
-+ #ifdef PEM_R_PUBLIC_KEY_NO_RSA
-+ {"PUBLIC_KEY_NO_RSA", ERR_LIB_PEM, PEM_R_PUBLIC_KEY_NO_RSA},
-+ #else
-+ {"PUBLIC_KEY_NO_RSA", ERR_LIB_PEM, 110},
-+ #endif
-+ #ifdef PEM_R_PVK_DATA_TOO_SHORT
-+ {"PVK_DATA_TOO_SHORT", ERR_LIB_PEM, PEM_R_PVK_DATA_TOO_SHORT},
-+ #else
-+ {"PVK_DATA_TOO_SHORT", ERR_LIB_PEM, 124},
-+ #endif
-+ #ifdef PEM_R_PVK_TOO_SHORT
-+ {"PVK_TOO_SHORT", ERR_LIB_PEM, PEM_R_PVK_TOO_SHORT},
-+ #else
-+ {"PVK_TOO_SHORT", ERR_LIB_PEM, 125},
-+ #endif
-+ #ifdef PEM_R_READ_KEY
-+ {"READ_KEY", ERR_LIB_PEM, PEM_R_READ_KEY},
-+ #else
-+ {"READ_KEY", ERR_LIB_PEM, 111},
-+ #endif
-+ #ifdef PEM_R_SHORT_HEADER
-+ {"SHORT_HEADER", ERR_LIB_PEM, PEM_R_SHORT_HEADER},
-+ #else
-+ {"SHORT_HEADER", ERR_LIB_PEM, 112},
-+ #endif
-+ #ifdef PEM_R_UNSUPPORTED_CIPHER
-+ {"UNSUPPORTED_CIPHER", ERR_LIB_PEM, PEM_R_UNSUPPORTED_CIPHER},
-+ #else
-+ {"UNSUPPORTED_CIPHER", ERR_LIB_PEM, 113},
-+ #endif
-+ #ifdef PEM_R_UNSUPPORTED_ENCRYPTION
-+ {"UNSUPPORTED_ENCRYPTION", ERR_LIB_PEM, PEM_R_UNSUPPORTED_ENCRYPTION},
-+ #else
-+ {"UNSUPPORTED_ENCRYPTION", ERR_LIB_PEM, 114},
-+ #endif
-+ #ifdef PEM_R_UNSUPPORTED_KEY_COMPONENTS
-+ {"UNSUPPORTED_KEY_COMPONENTS", ERR_LIB_PEM, PEM_R_UNSUPPORTED_KEY_COMPONENTS},
-+ #else
-+ {"UNSUPPORTED_KEY_COMPONENTS", ERR_LIB_PEM, 126},
-+ #endif
-+ #ifdef SSL_R_APP_DATA_IN_HANDSHAKE
-+ {"APP_DATA_IN_HANDSHAKE", ERR_LIB_SSL, SSL_R_APP_DATA_IN_HANDSHAKE},
-+ #else
-+ {"APP_DATA_IN_HANDSHAKE", ERR_LIB_SSL, 100},
-+ #endif
-+ #ifdef SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT
-+ {"ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT", ERR_LIB_SSL, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT},
-+ #else
-+ {"ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT", ERR_LIB_SSL, 272},
-+ #endif
-+ #ifdef SSL_R_BAD_ALERT_RECORD
-+ {"BAD_ALERT_RECORD", ERR_LIB_SSL, SSL_R_BAD_ALERT_RECORD},
-+ #else
-+ {"BAD_ALERT_RECORD", ERR_LIB_SSL, 101},
-+ #endif
-+ #ifdef SSL_R_BAD_AUTHENTICATION_TYPE
-+ {"BAD_AUTHENTICATION_TYPE", ERR_LIB_SSL, SSL_R_BAD_AUTHENTICATION_TYPE},
-+ #else
-+ {"BAD_AUTHENTICATION_TYPE", ERR_LIB_SSL, 102},
-+ #endif
-+ #ifdef SSL_R_BAD_CHANGE_CIPHER_SPEC
-+ {"BAD_CHANGE_CIPHER_SPEC", ERR_LIB_SSL, SSL_R_BAD_CHANGE_CIPHER_SPEC},
-+ #else
-+ {"BAD_CHANGE_CIPHER_SPEC", ERR_LIB_SSL, 103},
-+ #endif
-+ #ifdef SSL_R_BAD_CHECKSUM
-+ {"BAD_CHECKSUM", ERR_LIB_SSL, SSL_R_BAD_CHECKSUM},
-+ #else
-+ {"BAD_CHECKSUM", ERR_LIB_SSL, 104},
-+ #endif
-+ #ifdef SSL_R_BAD_DATA_RETURNED_BY_CALLBACK
-+ {"BAD_DATA_RETURNED_BY_CALLBACK", ERR_LIB_SSL, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK},
-+ #else
-+ {"BAD_DATA_RETURNED_BY_CALLBACK", ERR_LIB_SSL, 106},
-+ #endif
-+ #ifdef SSL_R_BAD_DECOMPRESSION
-+ {"BAD_DECOMPRESSION", ERR_LIB_SSL, SSL_R_BAD_DECOMPRESSION},
-+ #else
-+ {"BAD_DECOMPRESSION", ERR_LIB_SSL, 107},
-+ #endif
-+ #ifdef SSL_R_BAD_DH_G_LENGTH
-+ {"BAD_DH_G_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DH_G_LENGTH},
-+ #else
-+ {"BAD_DH_G_LENGTH", ERR_LIB_SSL, 108},
-+ #endif
-+ #ifdef SSL_R_BAD_DH_PUB_KEY_LENGTH
-+ {"BAD_DH_PUB_KEY_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DH_PUB_KEY_LENGTH},
-+ #else
-+ {"BAD_DH_PUB_KEY_LENGTH", ERR_LIB_SSL, 109},
-+ #endif
-+ #ifdef SSL_R_BAD_DH_P_LENGTH
-+ {"BAD_DH_P_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DH_P_LENGTH},
-+ #else
-+ {"BAD_DH_P_LENGTH", ERR_LIB_SSL, 110},
-+ #endif
-+ #ifdef SSL_R_BAD_DIGEST_LENGTH
-+ {"BAD_DIGEST_LENGTH", ERR_LIB_SSL, SSL_R_BAD_DIGEST_LENGTH},
-+ #else
-+ {"BAD_DIGEST_LENGTH", ERR_LIB_SSL, 111},
-+ #endif
-+ #ifdef SSL_R_BAD_DSA_SIGNATURE
-+ {"BAD_DSA_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_DSA_SIGNATURE},
-+ #else
-+ {"BAD_DSA_SIGNATURE", ERR_LIB_SSL, 112},
-+ #endif
-+ #ifdef SSL_R_BAD_ECC_CERT
-+ {"BAD_ECC_CERT", ERR_LIB_SSL, SSL_R_BAD_ECC_CERT},
-+ #else
-+ {"BAD_ECC_CERT", ERR_LIB_SSL, 304},
-+ #endif
-+ #ifdef SSL_R_BAD_ECDSA_SIGNATURE
-+ {"BAD_ECDSA_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_ECDSA_SIGNATURE},
-+ #else
-+ {"BAD_ECDSA_SIGNATURE", ERR_LIB_SSL, 305},
-+ #endif
-+ #ifdef SSL_R_BAD_ECPOINT
-+ {"BAD_ECPOINT", ERR_LIB_SSL, SSL_R_BAD_ECPOINT},
-+ #else
-+ {"BAD_ECPOINT", ERR_LIB_SSL, 306},
-+ #endif
-+ #ifdef SSL_R_BAD_HANDSHAKE_LENGTH
-+ {"BAD_HANDSHAKE_LENGTH", ERR_LIB_SSL, SSL_R_BAD_HANDSHAKE_LENGTH},
-+ #else
-+ {"BAD_HANDSHAKE_LENGTH", ERR_LIB_SSL, 332},
-+ #endif
-+ #ifdef SSL_R_BAD_HELLO_REQUEST
-+ {"BAD_HELLO_REQUEST", ERR_LIB_SSL, SSL_R_BAD_HELLO_REQUEST},
-+ #else
-+ {"BAD_HELLO_REQUEST", ERR_LIB_SSL, 105},
-+ #endif
-+ #ifdef SSL_R_BAD_LENGTH
-+ {"BAD_LENGTH", ERR_LIB_SSL, SSL_R_BAD_LENGTH},
-+ #else
-+ {"BAD_LENGTH", ERR_LIB_SSL, 271},
-+ #endif
-+ #ifdef SSL_R_BAD_MAC_DECODE
-+ {"BAD_MAC_DECODE", ERR_LIB_SSL, SSL_R_BAD_MAC_DECODE},
-+ #else
-+ {"BAD_MAC_DECODE", ERR_LIB_SSL, 113},
-+ #endif
-+ #ifdef SSL_R_BAD_MAC_LENGTH
-+ {"BAD_MAC_LENGTH", ERR_LIB_SSL, SSL_R_BAD_MAC_LENGTH},
-+ #else
-+ {"BAD_MAC_LENGTH", ERR_LIB_SSL, 333},
-+ #endif
-+ #ifdef SSL_R_BAD_MESSAGE_TYPE
-+ {"BAD_MESSAGE_TYPE", ERR_LIB_SSL, SSL_R_BAD_MESSAGE_TYPE},
-+ #else
-+ {"BAD_MESSAGE_TYPE", ERR_LIB_SSL, 114},
-+ #endif
-+ #ifdef SSL_R_BAD_PACKET_LENGTH
-+ {"BAD_PACKET_LENGTH", ERR_LIB_SSL, SSL_R_BAD_PACKET_LENGTH},
-+ #else
-+ {"BAD_PACKET_LENGTH", ERR_LIB_SSL, 115},
-+ #endif
-+ #ifdef SSL_R_BAD_PROTOCOL_VERSION_NUMBER
-+ {"BAD_PROTOCOL_VERSION_NUMBER", ERR_LIB_SSL, SSL_R_BAD_PROTOCOL_VERSION_NUMBER},
-+ #else
-+ {"BAD_PROTOCOL_VERSION_NUMBER", ERR_LIB_SSL, 116},
-+ #endif
-+ #ifdef SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH
-+ {"BAD_PSK_IDENTITY_HINT_LENGTH", ERR_LIB_SSL, SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH},
-+ #else
-+ {"BAD_PSK_IDENTITY_HINT_LENGTH", ERR_LIB_SSL, 316},
-+ #endif
-+ #ifdef SSL_R_BAD_RESPONSE_ARGUMENT
-+ {"BAD_RESPONSE_ARGUMENT", ERR_LIB_SSL, SSL_R_BAD_RESPONSE_ARGUMENT},
-+ #else
-+ {"BAD_RESPONSE_ARGUMENT", ERR_LIB_SSL, 117},
-+ #endif
-+ #ifdef SSL_R_BAD_RSA_DECRYPT
-+ {"BAD_RSA_DECRYPT", ERR_LIB_SSL, SSL_R_BAD_RSA_DECRYPT},
-+ #else
-+ {"BAD_RSA_DECRYPT", ERR_LIB_SSL, 118},
-+ #endif
-+ #ifdef SSL_R_BAD_RSA_ENCRYPT
-+ {"BAD_RSA_ENCRYPT", ERR_LIB_SSL, SSL_R_BAD_RSA_ENCRYPT},
-+ #else
-+ {"BAD_RSA_ENCRYPT", ERR_LIB_SSL, 119},
-+ #endif
-+ #ifdef SSL_R_BAD_RSA_E_LENGTH
-+ {"BAD_RSA_E_LENGTH", ERR_LIB_SSL, SSL_R_BAD_RSA_E_LENGTH},
-+ #else
-+ {"BAD_RSA_E_LENGTH", ERR_LIB_SSL, 120},
-+ #endif
-+ #ifdef SSL_R_BAD_RSA_MODULUS_LENGTH
-+ {"BAD_RSA_MODULUS_LENGTH", ERR_LIB_SSL, SSL_R_BAD_RSA_MODULUS_LENGTH},
-+ #else
-+ {"BAD_RSA_MODULUS_LENGTH", ERR_LIB_SSL, 121},
-+ #endif
-+ #ifdef SSL_R_BAD_RSA_SIGNATURE
-+ {"BAD_RSA_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_RSA_SIGNATURE},
-+ #else
-+ {"BAD_RSA_SIGNATURE", ERR_LIB_SSL, 122},
-+ #endif
-+ #ifdef SSL_R_BAD_SIGNATURE
-+ {"BAD_SIGNATURE", ERR_LIB_SSL, SSL_R_BAD_SIGNATURE},
-+ #else
-+ {"BAD_SIGNATURE", ERR_LIB_SSL, 123},
-+ #endif
-+ #ifdef SSL_R_BAD_SRP_A_LENGTH
-+ {"BAD_SRP_A_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SRP_A_LENGTH},
-+ #else
-+ {"BAD_SRP_A_LENGTH", ERR_LIB_SSL, 347},
-+ #endif
-+ #ifdef SSL_R_BAD_SRP_B_LENGTH
-+ {"BAD_SRP_B_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SRP_B_LENGTH},
-+ #else
-+ {"BAD_SRP_B_LENGTH", ERR_LIB_SSL, 348},
-+ #endif
-+ #ifdef SSL_R_BAD_SRP_G_LENGTH
-+ {"BAD_SRP_G_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SRP_G_LENGTH},
-+ #else
-+ {"BAD_SRP_G_LENGTH", ERR_LIB_SSL, 349},
-+ #endif
-+ #ifdef SSL_R_BAD_SRP_N_LENGTH
-+ {"BAD_SRP_N_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SRP_N_LENGTH},
-+ #else
-+ {"BAD_SRP_N_LENGTH", ERR_LIB_SSL, 350},
-+ #endif
-+ #ifdef SSL_R_BAD_SRP_S_LENGTH
-+ {"BAD_SRP_S_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SRP_S_LENGTH},
-+ #else
-+ {"BAD_SRP_S_LENGTH", ERR_LIB_SSL, 351},
-+ #endif
-+ #ifdef SSL_R_BAD_SRTP_MKI_VALUE
-+ {"BAD_SRTP_MKI_VALUE", ERR_LIB_SSL, SSL_R_BAD_SRTP_MKI_VALUE},
-+ #else
-+ {"BAD_SRTP_MKI_VALUE", ERR_LIB_SSL, 352},
-+ #endif
-+ #ifdef SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST
-+ {"BAD_SRTP_PROTECTION_PROFILE_LIST", ERR_LIB_SSL, SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST},
-+ #else
-+ {"BAD_SRTP_PROTECTION_PROFILE_LIST", ERR_LIB_SSL, 353},
-+ #endif
-+ #ifdef SSL_R_BAD_SSL_FILETYPE
-+ {"BAD_SSL_FILETYPE", ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE},
-+ #else
-+ {"BAD_SSL_FILETYPE", ERR_LIB_SSL, 124},
-+ #endif
-+ #ifdef SSL_R_BAD_SSL_SESSION_ID_LENGTH
-+ {"BAD_SSL_SESSION_ID_LENGTH", ERR_LIB_SSL, SSL_R_BAD_SSL_SESSION_ID_LENGTH},
-+ #else
-+ {"BAD_SSL_SESSION_ID_LENGTH", ERR_LIB_SSL, 125},
-+ #endif
-+ #ifdef SSL_R_BAD_STATE
-+ {"BAD_STATE", ERR_LIB_SSL, SSL_R_BAD_STATE},
-+ #else
-+ {"BAD_STATE", ERR_LIB_SSL, 126},
-+ #endif
-+ #ifdef SSL_R_BAD_WRITE_RETRY
-+ {"BAD_WRITE_RETRY", ERR_LIB_SSL, SSL_R_BAD_WRITE_RETRY},
-+ #else
-+ {"BAD_WRITE_RETRY", ERR_LIB_SSL, 127},
-+ #endif
-+ #ifdef SSL_R_BIO_NOT_SET
-+ {"BIO_NOT_SET", ERR_LIB_SSL, SSL_R_BIO_NOT_SET},
-+ #else
-+ {"BIO_NOT_SET", ERR_LIB_SSL, 128},
-+ #endif
-+ #ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
-+ {"BLOCK_CIPHER_PAD_IS_WRONG", ERR_LIB_SSL, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG},
-+ #else
-+ {"BLOCK_CIPHER_PAD_IS_WRONG", ERR_LIB_SSL, 129},
-+ #endif
-+ #ifdef SSL_R_BN_LIB
-+ {"BN_LIB", ERR_LIB_SSL, SSL_R_BN_LIB},
-+ #else
-+ {"BN_LIB", ERR_LIB_SSL, 130},
-+ #endif
-+ #ifdef SSL_R_CA_DN_LENGTH_MISMATCH
-+ {"CA_DN_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_CA_DN_LENGTH_MISMATCH},
-+ #else
-+ {"CA_DN_LENGTH_MISMATCH", ERR_LIB_SSL, 131},
-+ #endif
-+ #ifdef SSL_R_CA_DN_TOO_LONG
-+ {"CA_DN_TOO_LONG", ERR_LIB_SSL, SSL_R_CA_DN_TOO_LONG},
-+ #else
-+ {"CA_DN_TOO_LONG", ERR_LIB_SSL, 132},
-+ #endif
-+ #ifdef SSL_R_CCS_RECEIVED_EARLY
-+ {"CCS_RECEIVED_EARLY", ERR_LIB_SSL, SSL_R_CCS_RECEIVED_EARLY},
-+ #else
-+ {"CCS_RECEIVED_EARLY", ERR_LIB_SSL, 133},
-+ #endif
-+ #ifdef SSL_R_CERTIFICATE_VERIFY_FAILED
-+ {"CERTIFICATE_VERIFY_FAILED", ERR_LIB_SSL, SSL_R_CERTIFICATE_VERIFY_FAILED},
-+ #else
-+ {"CERTIFICATE_VERIFY_FAILED", ERR_LIB_SSL, 134},
-+ #endif
-+ #ifdef SSL_R_CERT_LENGTH_MISMATCH
-+ {"CERT_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_CERT_LENGTH_MISMATCH},
-+ #else
-+ {"CERT_LENGTH_MISMATCH", ERR_LIB_SSL, 135},
-+ #endif
-+ #ifdef SSL_R_CHALLENGE_IS_DIFFERENT
-+ {"CHALLENGE_IS_DIFFERENT", ERR_LIB_SSL, SSL_R_CHALLENGE_IS_DIFFERENT},
-+ #else
-+ {"CHALLENGE_IS_DIFFERENT", ERR_LIB_SSL, 136},
-+ #endif
-+ #ifdef SSL_R_CIPHER_CODE_WRONG_LENGTH
-+ {"CIPHER_CODE_WRONG_LENGTH", ERR_LIB_SSL, SSL_R_CIPHER_CODE_WRONG_LENGTH},
-+ #else
-+ {"CIPHER_CODE_WRONG_LENGTH", ERR_LIB_SSL, 137},
-+ #endif
-+ #ifdef SSL_R_CIPHER_OR_HASH_UNAVAILABLE
-+ {"CIPHER_OR_HASH_UNAVAILABLE", ERR_LIB_SSL, SSL_R_CIPHER_OR_HASH_UNAVAILABLE},
-+ #else
-+ {"CIPHER_OR_HASH_UNAVAILABLE", ERR_LIB_SSL, 138},
-+ #endif
-+ #ifdef SSL_R_CIPHER_TABLE_SRC_ERROR
-+ {"CIPHER_TABLE_SRC_ERROR", ERR_LIB_SSL, SSL_R_CIPHER_TABLE_SRC_ERROR},
-+ #else
-+ {"CIPHER_TABLE_SRC_ERROR", ERR_LIB_SSL, 139},
-+ #endif
-+ #ifdef SSL_R_CLIENTHELLO_TLSEXT
-+ {"CLIENTHELLO_TLSEXT", ERR_LIB_SSL, SSL_R_CLIENTHELLO_TLSEXT},
-+ #else
-+ {"CLIENTHELLO_TLSEXT", ERR_LIB_SSL, 226},
-+ #endif
-+ #ifdef SSL_R_COMPRESSED_LENGTH_TOO_LONG
-+ {"COMPRESSED_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_COMPRESSED_LENGTH_TOO_LONG},
-+ #else
-+ {"COMPRESSED_LENGTH_TOO_LONG", ERR_LIB_SSL, 140},
-+ #endif
-+ #ifdef SSL_R_COMPRESSION_DISABLED
-+ {"COMPRESSION_DISABLED", ERR_LIB_SSL, SSL_R_COMPRESSION_DISABLED},
-+ #else
-+ {"COMPRESSION_DISABLED", ERR_LIB_SSL, 343},
-+ #endif
-+ #ifdef SSL_R_COMPRESSION_FAILURE
-+ {"COMPRESSION_FAILURE", ERR_LIB_SSL, SSL_R_COMPRESSION_FAILURE},
-+ #else
-+ {"COMPRESSION_FAILURE", ERR_LIB_SSL, 141},
-+ #endif
-+ #ifdef SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE
-+ {"COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE", ERR_LIB_SSL, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE},
-+ #else
-+ {"COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE", ERR_LIB_SSL, 307},
-+ #endif
-+ #ifdef SSL_R_COMPRESSION_LIBRARY_ERROR
-+ {"COMPRESSION_LIBRARY_ERROR", ERR_LIB_SSL, SSL_R_COMPRESSION_LIBRARY_ERROR},
-+ #else
-+ {"COMPRESSION_LIBRARY_ERROR", ERR_LIB_SSL, 142},
-+ #endif
-+ #ifdef SSL_R_CONNECTION_ID_IS_DIFFERENT
-+ {"CONNECTION_ID_IS_DIFFERENT", ERR_LIB_SSL, SSL_R_CONNECTION_ID_IS_DIFFERENT},
-+ #else
-+ {"CONNECTION_ID_IS_DIFFERENT", ERR_LIB_SSL, 143},
-+ #endif
-+ #ifdef SSL_R_CONNECTION_TYPE_NOT_SET
-+ {"CONNECTION_TYPE_NOT_SET", ERR_LIB_SSL, SSL_R_CONNECTION_TYPE_NOT_SET},
-+ #else
-+ {"CONNECTION_TYPE_NOT_SET", ERR_LIB_SSL, 144},
-+ #endif
-+ #ifdef SSL_R_COOKIE_MISMATCH
-+ {"COOKIE_MISMATCH", ERR_LIB_SSL, SSL_R_COOKIE_MISMATCH},
-+ #else
-+ {"COOKIE_MISMATCH", ERR_LIB_SSL, 308},
-+ #endif
-+ #ifdef SSL_R_DATA_BETWEEN_CCS_AND_FINISHED
-+ {"DATA_BETWEEN_CCS_AND_FINISHED", ERR_LIB_SSL, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED},
-+ #else
-+ {"DATA_BETWEEN_CCS_AND_FINISHED", ERR_LIB_SSL, 145},
-+ #endif
-+ #ifdef SSL_R_DATA_LENGTH_TOO_LONG
-+ {"DATA_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_DATA_LENGTH_TOO_LONG},
-+ #else
-+ {"DATA_LENGTH_TOO_LONG", ERR_LIB_SSL, 146},
-+ #endif
-+ #ifdef SSL_R_DECRYPTION_FAILED
-+ {"DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_DECRYPTION_FAILED},
-+ #else
-+ {"DECRYPTION_FAILED", ERR_LIB_SSL, 147},
-+ #endif
-+ #ifdef SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC
-+ {"DECRYPTION_FAILED_OR_BAD_RECORD_MAC", ERR_LIB_SSL, SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC},
-+ #else
-+ {"DECRYPTION_FAILED_OR_BAD_RECORD_MAC", ERR_LIB_SSL, 281},
-+ #endif
-+ #ifdef SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG
-+ {"DH_PUBLIC_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG},
-+ #else
-+ {"DH_PUBLIC_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, 148},
-+ #endif
-+ #ifdef SSL_R_DIGEST_CHECK_FAILED
-+ {"DIGEST_CHECK_FAILED", ERR_LIB_SSL, SSL_R_DIGEST_CHECK_FAILED},
-+ #else
-+ {"DIGEST_CHECK_FAILED", ERR_LIB_SSL, 149},
-+ #endif
-+ #ifdef SSL_R_DTLS_MESSAGE_TOO_BIG
-+ {"DTLS_MESSAGE_TOO_BIG", ERR_LIB_SSL, SSL_R_DTLS_MESSAGE_TOO_BIG},
-+ #else
-+ {"DTLS_MESSAGE_TOO_BIG", ERR_LIB_SSL, 334},
-+ #endif
-+ #ifdef SSL_R_DUPLICATE_COMPRESSION_ID
-+ {"DUPLICATE_COMPRESSION_ID", ERR_LIB_SSL, SSL_R_DUPLICATE_COMPRESSION_ID},
-+ #else
-+ {"DUPLICATE_COMPRESSION_ID", ERR_LIB_SSL, 309},
-+ #endif
-+ #ifdef SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT
-+ {"ECC_CERT_NOT_FOR_KEY_AGREEMENT", ERR_LIB_SSL, SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT},
-+ #else
-+ {"ECC_CERT_NOT_FOR_KEY_AGREEMENT", ERR_LIB_SSL, 317},
-+ #endif
-+ #ifdef SSL_R_ECC_CERT_NOT_FOR_SIGNING
-+ {"ECC_CERT_NOT_FOR_SIGNING", ERR_LIB_SSL, SSL_R_ECC_CERT_NOT_FOR_SIGNING},
-+ #else
-+ {"ECC_CERT_NOT_FOR_SIGNING", ERR_LIB_SSL, 318},
-+ #endif
-+ #ifdef SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE
-+ {"ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE", ERR_LIB_SSL, SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE},
-+ #else
-+ {"ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE", ERR_LIB_SSL, 322},
-+ #endif
-+ #ifdef SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE
-+ {"ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE", ERR_LIB_SSL, SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE},
-+ #else
-+ {"ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE", ERR_LIB_SSL, 323},
-+ #endif
-+ #ifdef SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER
-+ {"ECGROUP_TOO_LARGE_FOR_CIPHER", ERR_LIB_SSL, SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER},
-+ #else
-+ {"ECGROUP_TOO_LARGE_FOR_CIPHER", ERR_LIB_SSL, 310},
-+ #endif
-+ #ifdef SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST
-+ {"EMPTY_SRTP_PROTECTION_PROFILE_LIST", ERR_LIB_SSL, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST},
-+ #else
-+ {"EMPTY_SRTP_PROTECTION_PROFILE_LIST", ERR_LIB_SSL, 354},
-+ #endif
-+ #ifdef SSL_R_ENCRYPTED_LENGTH_TOO_LONG
-+ {"ENCRYPTED_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_ENCRYPTED_LENGTH_TOO_LONG},
-+ #else
-+ {"ENCRYPTED_LENGTH_TOO_LONG", ERR_LIB_SSL, 150},
-+ #endif
-+ #ifdef SSL_R_ERROR_GENERATING_TMP_RSA_KEY
-+ {"ERROR_GENERATING_TMP_RSA_KEY", ERR_LIB_SSL, SSL_R_ERROR_GENERATING_TMP_RSA_KEY},
-+ #else
-+ {"ERROR_GENERATING_TMP_RSA_KEY", ERR_LIB_SSL, 282},
-+ #endif
-+ #ifdef SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST
-+ {"ERROR_IN_RECEIVED_CIPHER_LIST", ERR_LIB_SSL, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST},
-+ #else
-+ {"ERROR_IN_RECEIVED_CIPHER_LIST", ERR_LIB_SSL, 151},
-+ #endif
-+ #ifdef SSL_R_EXCESSIVE_MESSAGE_SIZE
-+ {"EXCESSIVE_MESSAGE_SIZE", ERR_LIB_SSL, SSL_R_EXCESSIVE_MESSAGE_SIZE},
-+ #else
-+ {"EXCESSIVE_MESSAGE_SIZE", ERR_LIB_SSL, 152},
-+ #endif
-+ #ifdef SSL_R_EXTRA_DATA_IN_MESSAGE
-+ {"EXTRA_DATA_IN_MESSAGE", ERR_LIB_SSL, SSL_R_EXTRA_DATA_IN_MESSAGE},
-+ #else
-+ {"EXTRA_DATA_IN_MESSAGE", ERR_LIB_SSL, 153},
-+ #endif
-+ #ifdef SSL_R_GOT_A_FIN_BEFORE_A_CCS
-+ {"GOT_A_FIN_BEFORE_A_CCS", ERR_LIB_SSL, SSL_R_GOT_A_FIN_BEFORE_A_CCS},
-+ #else
-+ {"GOT_A_FIN_BEFORE_A_CCS", ERR_LIB_SSL, 154},
-+ #endif
-+ #ifdef SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS
-+ {"GOT_NEXT_PROTO_BEFORE_A_CCS", ERR_LIB_SSL, SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS},
-+ #else
-+ {"GOT_NEXT_PROTO_BEFORE_A_CCS", ERR_LIB_SSL, 355},
-+ #endif
-+ #ifdef SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION
-+ {"GOT_NEXT_PROTO_WITHOUT_EXTENSION", ERR_LIB_SSL, SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION},
-+ #else
-+ {"GOT_NEXT_PROTO_WITHOUT_EXTENSION", ERR_LIB_SSL, 356},
-+ #endif
-+ #ifdef SSL_R_HTTPS_PROXY_REQUEST
-+ {"HTTPS_PROXY_REQUEST", ERR_LIB_SSL, SSL_R_HTTPS_PROXY_REQUEST},
-+ #else
-+ {"HTTPS_PROXY_REQUEST", ERR_LIB_SSL, 155},
-+ #endif
-+ #ifdef SSL_R_HTTP_REQUEST
-+ {"HTTP_REQUEST", ERR_LIB_SSL, SSL_R_HTTP_REQUEST},
-+ #else
-+ {"HTTP_REQUEST", ERR_LIB_SSL, 156},
-+ #endif
-+ #ifdef SSL_R_ILLEGAL_PADDING
-+ {"ILLEGAL_PADDING", ERR_LIB_SSL, SSL_R_ILLEGAL_PADDING},
-+ #else
-+ {"ILLEGAL_PADDING", ERR_LIB_SSL, 283},
-+ #endif
-+ #ifdef SSL_R_INCONSISTENT_COMPRESSION
-+ {"INCONSISTENT_COMPRESSION", ERR_LIB_SSL, SSL_R_INCONSISTENT_COMPRESSION},
-+ #else
-+ {"INCONSISTENT_COMPRESSION", ERR_LIB_SSL, 340},
-+ #endif
-+ #ifdef SSL_R_INVALID_CHALLENGE_LENGTH
-+ {"INVALID_CHALLENGE_LENGTH", ERR_LIB_SSL, SSL_R_INVALID_CHALLENGE_LENGTH},
-+ #else
-+ {"INVALID_CHALLENGE_LENGTH", ERR_LIB_SSL, 158},
-+ #endif
-+ #ifdef SSL_R_INVALID_COMMAND
-+ {"INVALID_COMMAND", ERR_LIB_SSL, SSL_R_INVALID_COMMAND},
-+ #else
-+ {"INVALID_COMMAND", ERR_LIB_SSL, 280},
-+ #endif
-+ #ifdef SSL_R_INVALID_COMPRESSION_ALGORITHM
-+ {"INVALID_COMPRESSION_ALGORITHM", ERR_LIB_SSL, SSL_R_INVALID_COMPRESSION_ALGORITHM},
-+ #else
-+ {"INVALID_COMPRESSION_ALGORITHM", ERR_LIB_SSL, 341},
-+ #endif
-+ #ifdef SSL_R_INVALID_PURPOSE
-+ {"INVALID_PURPOSE", ERR_LIB_SSL, SSL_R_INVALID_PURPOSE},
-+ #else
-+ {"INVALID_PURPOSE", ERR_LIB_SSL, 278},
-+ #endif
-+ #ifdef SSL_R_INVALID_SRP_USERNAME
-+ {"INVALID_SRP_USERNAME", ERR_LIB_SSL, SSL_R_INVALID_SRP_USERNAME},
-+ #else
-+ {"INVALID_SRP_USERNAME", ERR_LIB_SSL, 357},
-+ #endif
-+ #ifdef SSL_R_INVALID_STATUS_RESPONSE
-+ {"INVALID_STATUS_RESPONSE", ERR_LIB_SSL, SSL_R_INVALID_STATUS_RESPONSE},
-+ #else
-+ {"INVALID_STATUS_RESPONSE", ERR_LIB_SSL, 328},
-+ #endif
-+ #ifdef SSL_R_INVALID_TICKET_KEYS_LENGTH
-+ {"INVALID_TICKET_KEYS_LENGTH", ERR_LIB_SSL, SSL_R_INVALID_TICKET_KEYS_LENGTH},
-+ #else
-+ {"INVALID_TICKET_KEYS_LENGTH", ERR_LIB_SSL, 325},
-+ #endif
-+ #ifdef SSL_R_INVALID_TRUST
-+ {"INVALID_TRUST", ERR_LIB_SSL, SSL_R_INVALID_TRUST},
-+ #else
-+ {"INVALID_TRUST", ERR_LIB_SSL, 279},
-+ #endif
-+ #ifdef SSL_R_KEY_ARG_TOO_LONG
-+ {"KEY_ARG_TOO_LONG", ERR_LIB_SSL, SSL_R_KEY_ARG_TOO_LONG},
-+ #else
-+ {"KEY_ARG_TOO_LONG", ERR_LIB_SSL, 284},
-+ #endif
-+ #ifdef SSL_R_KRB5
-+ {"KRB5", ERR_LIB_SSL, SSL_R_KRB5},
-+ #else
-+ {"KRB5", ERR_LIB_SSL, 285},
-+ #endif
-+ #ifdef SSL_R_KRB5_C_CC_PRINC
-+ {"KRB5_C_CC_PRINC", ERR_LIB_SSL, SSL_R_KRB5_C_CC_PRINC},
-+ #else
-+ {"KRB5_C_CC_PRINC", ERR_LIB_SSL, 286},
-+ #endif
-+ #ifdef SSL_R_KRB5_C_GET_CRED
-+ {"KRB5_C_GET_CRED", ERR_LIB_SSL, SSL_R_KRB5_C_GET_CRED},
-+ #else
-+ {"KRB5_C_GET_CRED", ERR_LIB_SSL, 287},
-+ #endif
-+ #ifdef SSL_R_KRB5_C_INIT
-+ {"KRB5_C_INIT", ERR_LIB_SSL, SSL_R_KRB5_C_INIT},
-+ #else
-+ {"KRB5_C_INIT", ERR_LIB_SSL, 288},
-+ #endif
-+ #ifdef SSL_R_KRB5_C_MK_REQ
-+ {"KRB5_C_MK_REQ", ERR_LIB_SSL, SSL_R_KRB5_C_MK_REQ},
-+ #else
-+ {"KRB5_C_MK_REQ", ERR_LIB_SSL, 289},
-+ #endif
-+ #ifdef SSL_R_KRB5_S_BAD_TICKET
-+ {"KRB5_S_BAD_TICKET", ERR_LIB_SSL, SSL_R_KRB5_S_BAD_TICKET},
-+ #else
-+ {"KRB5_S_BAD_TICKET", ERR_LIB_SSL, 290},
-+ #endif
-+ #ifdef SSL_R_KRB5_S_INIT
-+ {"KRB5_S_INIT", ERR_LIB_SSL, SSL_R_KRB5_S_INIT},
-+ #else
-+ {"KRB5_S_INIT", ERR_LIB_SSL, 291},
-+ #endif
-+ #ifdef SSL_R_KRB5_S_RD_REQ
-+ {"KRB5_S_RD_REQ", ERR_LIB_SSL, SSL_R_KRB5_S_RD_REQ},
-+ #else
-+ {"KRB5_S_RD_REQ", ERR_LIB_SSL, 292},
-+ #endif
-+ #ifdef SSL_R_KRB5_S_TKT_EXPIRED
-+ {"KRB5_S_TKT_EXPIRED", ERR_LIB_SSL, SSL_R_KRB5_S_TKT_EXPIRED},
-+ #else
-+ {"KRB5_S_TKT_EXPIRED", ERR_LIB_SSL, 293},
-+ #endif
-+ #ifdef SSL_R_KRB5_S_TKT_NYV
-+ {"KRB5_S_TKT_NYV", ERR_LIB_SSL, SSL_R_KRB5_S_TKT_NYV},
-+ #else
-+ {"KRB5_S_TKT_NYV", ERR_LIB_SSL, 294},
-+ #endif
-+ #ifdef SSL_R_KRB5_S_TKT_SKEW
-+ {"KRB5_S_TKT_SKEW", ERR_LIB_SSL, SSL_R_KRB5_S_TKT_SKEW},
-+ #else
-+ {"KRB5_S_TKT_SKEW", ERR_LIB_SSL, 295},
-+ #endif
-+ #ifdef SSL_R_LENGTH_MISMATCH
-+ {"LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_LENGTH_MISMATCH},
-+ #else
-+ {"LENGTH_MISMATCH", ERR_LIB_SSL, 159},
-+ #endif
-+ #ifdef SSL_R_LENGTH_TOO_SHORT
-+ {"LENGTH_TOO_SHORT", ERR_LIB_SSL, SSL_R_LENGTH_TOO_SHORT},
-+ #else
-+ {"LENGTH_TOO_SHORT", ERR_LIB_SSL, 160},
-+ #endif
-+ #ifdef SSL_R_LIBRARY_BUG
-+ {"LIBRARY_BUG", ERR_LIB_SSL, SSL_R_LIBRARY_BUG},
-+ #else
-+ {"LIBRARY_BUG", ERR_LIB_SSL, 274},
-+ #endif
-+ #ifdef SSL_R_LIBRARY_HAS_NO_CIPHERS
-+ {"LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, SSL_R_LIBRARY_HAS_NO_CIPHERS},
-+ #else
-+ {"LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, 161},
-+ #endif
-+ #ifdef SSL_R_MESSAGE_TOO_LONG
-+ {"MESSAGE_TOO_LONG", ERR_LIB_SSL, SSL_R_MESSAGE_TOO_LONG},
-+ #else
-+ {"MESSAGE_TOO_LONG", ERR_LIB_SSL, 296},
-+ #endif
-+ #ifdef SSL_R_MISSING_DH_DSA_CERT
-+ {"MISSING_DH_DSA_CERT", ERR_LIB_SSL, SSL_R_MISSING_DH_DSA_CERT},
-+ #else
-+ {"MISSING_DH_DSA_CERT", ERR_LIB_SSL, 162},
-+ #endif
-+ #ifdef SSL_R_MISSING_DH_KEY
-+ {"MISSING_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_DH_KEY},
-+ #else
-+ {"MISSING_DH_KEY", ERR_LIB_SSL, 163},
-+ #endif
-+ #ifdef SSL_R_MISSING_DH_RSA_CERT
-+ {"MISSING_DH_RSA_CERT", ERR_LIB_SSL, SSL_R_MISSING_DH_RSA_CERT},
-+ #else
-+ {"MISSING_DH_RSA_CERT", ERR_LIB_SSL, 164},
-+ #endif
-+ #ifdef SSL_R_MISSING_DSA_SIGNING_CERT
-+ {"MISSING_DSA_SIGNING_CERT", ERR_LIB_SSL, SSL_R_MISSING_DSA_SIGNING_CERT},
-+ #else
-+ {"MISSING_DSA_SIGNING_CERT", ERR_LIB_SSL, 165},
-+ #endif
-+ #ifdef SSL_R_MISSING_EXPORT_TMP_DH_KEY
-+ {"MISSING_EXPORT_TMP_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_EXPORT_TMP_DH_KEY},
-+ #else
-+ {"MISSING_EXPORT_TMP_DH_KEY", ERR_LIB_SSL, 166},
-+ #endif
-+ #ifdef SSL_R_MISSING_EXPORT_TMP_RSA_KEY
-+ {"MISSING_EXPORT_TMP_RSA_KEY", ERR_LIB_SSL, SSL_R_MISSING_EXPORT_TMP_RSA_KEY},
-+ #else
-+ {"MISSING_EXPORT_TMP_RSA_KEY", ERR_LIB_SSL, 167},
-+ #endif
-+ #ifdef SSL_R_MISSING_RSA_CERTIFICATE
-+ {"MISSING_RSA_CERTIFICATE", ERR_LIB_SSL, SSL_R_MISSING_RSA_CERTIFICATE},
-+ #else
-+ {"MISSING_RSA_CERTIFICATE", ERR_LIB_SSL, 168},
-+ #endif
-+ #ifdef SSL_R_MISSING_RSA_ENCRYPTING_CERT
-+ {"MISSING_RSA_ENCRYPTING_CERT", ERR_LIB_SSL, SSL_R_MISSING_RSA_ENCRYPTING_CERT},
-+ #else
-+ {"MISSING_RSA_ENCRYPTING_CERT", ERR_LIB_SSL, 169},
-+ #endif
-+ #ifdef SSL_R_MISSING_RSA_SIGNING_CERT
-+ {"MISSING_RSA_SIGNING_CERT", ERR_LIB_SSL, SSL_R_MISSING_RSA_SIGNING_CERT},
-+ #else
-+ {"MISSING_RSA_SIGNING_CERT", ERR_LIB_SSL, 170},
-+ #endif
-+ #ifdef SSL_R_MISSING_SRP_PARAM
-+ {"MISSING_SRP_PARAM", ERR_LIB_SSL, SSL_R_MISSING_SRP_PARAM},
-+ #else
-+ {"MISSING_SRP_PARAM", ERR_LIB_SSL, 358},
-+ #endif
-+ #ifdef SSL_R_MISSING_TMP_DH_KEY
-+ {"MISSING_TMP_DH_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_DH_KEY},
-+ #else
-+ {"MISSING_TMP_DH_KEY", ERR_LIB_SSL, 171},
-+ #endif
-+ #ifdef SSL_R_MISSING_TMP_ECDH_KEY
-+ {"MISSING_TMP_ECDH_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_ECDH_KEY},
-+ #else
-+ {"MISSING_TMP_ECDH_KEY", ERR_LIB_SSL, 311},
-+ #endif
-+ #ifdef SSL_R_MISSING_TMP_RSA_KEY
-+ {"MISSING_TMP_RSA_KEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_RSA_KEY},
-+ #else
-+ {"MISSING_TMP_RSA_KEY", ERR_LIB_SSL, 172},
-+ #endif
-+ #ifdef SSL_R_MISSING_TMP_RSA_PKEY
-+ {"MISSING_TMP_RSA_PKEY", ERR_LIB_SSL, SSL_R_MISSING_TMP_RSA_PKEY},
-+ #else
-+ {"MISSING_TMP_RSA_PKEY", ERR_LIB_SSL, 173},
-+ #endif
-+ #ifdef SSL_R_MISSING_VERIFY_MESSAGE
-+ {"MISSING_VERIFY_MESSAGE", ERR_LIB_SSL, SSL_R_MISSING_VERIFY_MESSAGE},
-+ #else
-+ {"MISSING_VERIFY_MESSAGE", ERR_LIB_SSL, 174},
-+ #endif
-+ #ifdef SSL_R_MULTIPLE_SGC_RESTARTS
-+ {"MULTIPLE_SGC_RESTARTS", ERR_LIB_SSL, SSL_R_MULTIPLE_SGC_RESTARTS},
-+ #else
-+ {"MULTIPLE_SGC_RESTARTS", ERR_LIB_SSL, 346},
-+ #endif
-+ #ifdef SSL_R_NON_SSLV2_INITIAL_PACKET
-+ {"NON_SSLV2_INITIAL_PACKET", ERR_LIB_SSL, SSL_R_NON_SSLV2_INITIAL_PACKET},
-+ #else
-+ {"NON_SSLV2_INITIAL_PACKET", ERR_LIB_SSL, 175},
-+ #endif
-+ #ifdef SSL_R_NO_CERTIFICATES_RETURNED
-+ {"NO_CERTIFICATES_RETURNED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATES_RETURNED},
-+ #else
-+ {"NO_CERTIFICATES_RETURNED", ERR_LIB_SSL, 176},
-+ #endif
-+ #ifdef SSL_R_NO_CERTIFICATE_ASSIGNED
-+ {"NO_CERTIFICATE_ASSIGNED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_ASSIGNED},
-+ #else
-+ {"NO_CERTIFICATE_ASSIGNED", ERR_LIB_SSL, 177},
-+ #endif
-+ #ifdef SSL_R_NO_CERTIFICATE_RETURNED
-+ {"NO_CERTIFICATE_RETURNED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_RETURNED},
-+ #else
-+ {"NO_CERTIFICATE_RETURNED", ERR_LIB_SSL, 178},
-+ #endif
-+ #ifdef SSL_R_NO_CERTIFICATE_SET
-+ {"NO_CERTIFICATE_SET", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_SET},
-+ #else
-+ {"NO_CERTIFICATE_SET", ERR_LIB_SSL, 179},
-+ #endif
-+ #ifdef SSL_R_NO_CERTIFICATE_SPECIFIED
-+ {"NO_CERTIFICATE_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_SPECIFIED},
-+ #else
-+ {"NO_CERTIFICATE_SPECIFIED", ERR_LIB_SSL, 180},
-+ #endif
-+ #ifdef SSL_R_NO_CIPHERS_AVAILABLE
-+ {"NO_CIPHERS_AVAILABLE", ERR_LIB_SSL, SSL_R_NO_CIPHERS_AVAILABLE},
-+ #else
-+ {"NO_CIPHERS_AVAILABLE", ERR_LIB_SSL, 181},
-+ #endif
-+ #ifdef SSL_R_NO_CIPHERS_PASSED
-+ {"NO_CIPHERS_PASSED", ERR_LIB_SSL, SSL_R_NO_CIPHERS_PASSED},
-+ #else
-+ {"NO_CIPHERS_PASSED", ERR_LIB_SSL, 182},
-+ #endif
-+ #ifdef SSL_R_NO_CIPHERS_SPECIFIED
-+ {"NO_CIPHERS_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_CIPHERS_SPECIFIED},
-+ #else
-+ {"NO_CIPHERS_SPECIFIED", ERR_LIB_SSL, 183},
-+ #endif
-+ #ifdef SSL_R_NO_CIPHER_LIST
-+ {"NO_CIPHER_LIST", ERR_LIB_SSL, SSL_R_NO_CIPHER_LIST},
-+ #else
-+ {"NO_CIPHER_LIST", ERR_LIB_SSL, 184},
-+ #endif
-+ #ifdef SSL_R_NO_CIPHER_MATCH
-+ {"NO_CIPHER_MATCH", ERR_LIB_SSL, SSL_R_NO_CIPHER_MATCH},
-+ #else
-+ {"NO_CIPHER_MATCH", ERR_LIB_SSL, 185},
-+ #endif
-+ #ifdef SSL_R_NO_CLIENT_CERT_METHOD
-+ {"NO_CLIENT_CERT_METHOD", ERR_LIB_SSL, SSL_R_NO_CLIENT_CERT_METHOD},
-+ #else
-+ {"NO_CLIENT_CERT_METHOD", ERR_LIB_SSL, 331},
-+ #endif
-+ #ifdef SSL_R_NO_CLIENT_CERT_RECEIVED
-+ {"NO_CLIENT_CERT_RECEIVED", ERR_LIB_SSL, SSL_R_NO_CLIENT_CERT_RECEIVED},
-+ #else
-+ {"NO_CLIENT_CERT_RECEIVED", ERR_LIB_SSL, 186},
-+ #endif
-+ #ifdef SSL_R_NO_COMPRESSION_SPECIFIED
-+ {"NO_COMPRESSION_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_COMPRESSION_SPECIFIED},
-+ #else
-+ {"NO_COMPRESSION_SPECIFIED", ERR_LIB_SSL, 187},
-+ #endif
-+ #ifdef SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER
-+ {"NO_GOST_CERTIFICATE_SENT_BY_PEER", ERR_LIB_SSL, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER},
-+ #else
-+ {"NO_GOST_CERTIFICATE_SENT_BY_PEER", ERR_LIB_SSL, 330},
-+ #endif
-+ #ifdef SSL_R_NO_METHOD_SPECIFIED
-+ {"NO_METHOD_SPECIFIED", ERR_LIB_SSL, SSL_R_NO_METHOD_SPECIFIED},
-+ #else
-+ {"NO_METHOD_SPECIFIED", ERR_LIB_SSL, 188},
-+ #endif
-+ #ifdef SSL_R_NO_PRIVATEKEY
-+ {"NO_PRIVATEKEY", ERR_LIB_SSL, SSL_R_NO_PRIVATEKEY},
-+ #else
-+ {"NO_PRIVATEKEY", ERR_LIB_SSL, 189},
-+ #endif
-+ #ifdef SSL_R_NO_PRIVATE_KEY_ASSIGNED
-+ {"NO_PRIVATE_KEY_ASSIGNED", ERR_LIB_SSL, SSL_R_NO_PRIVATE_KEY_ASSIGNED},
-+ #else
-+ {"NO_PRIVATE_KEY_ASSIGNED", ERR_LIB_SSL, 190},
-+ #endif
-+ #ifdef SSL_R_NO_PROTOCOLS_AVAILABLE
-+ {"NO_PROTOCOLS_AVAILABLE", ERR_LIB_SSL, SSL_R_NO_PROTOCOLS_AVAILABLE},
-+ #else
-+ {"NO_PROTOCOLS_AVAILABLE", ERR_LIB_SSL, 191},
-+ #endif
-+ #ifdef SSL_R_NO_PUBLICKEY
-+ {"NO_PUBLICKEY", ERR_LIB_SSL, SSL_R_NO_PUBLICKEY},
-+ #else
-+ {"NO_PUBLICKEY", ERR_LIB_SSL, 192},
-+ #endif
-+ #ifdef SSL_R_NO_RENEGOTIATION
-+ {"NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_NO_RENEGOTIATION},
-+ #else
-+ {"NO_RENEGOTIATION", ERR_LIB_SSL, 339},
-+ #endif
-+ #ifdef SSL_R_NO_REQUIRED_DIGEST
-+ {"NO_REQUIRED_DIGEST", ERR_LIB_SSL, SSL_R_NO_REQUIRED_DIGEST},
-+ #else
-+ {"NO_REQUIRED_DIGEST", ERR_LIB_SSL, 324},
-+ #endif
-+ #ifdef SSL_R_NO_SHARED_CIPHER
-+ {"NO_SHARED_CIPHER", ERR_LIB_SSL, SSL_R_NO_SHARED_CIPHER},
-+ #else
-+ {"NO_SHARED_CIPHER", ERR_LIB_SSL, 193},
-+ #endif
-+ #ifdef SSL_R_NO_SRTP_PROFILES
-+ {"NO_SRTP_PROFILES", ERR_LIB_SSL, SSL_R_NO_SRTP_PROFILES},
-+ #else
-+ {"NO_SRTP_PROFILES", ERR_LIB_SSL, 359},
-+ #endif
-+ #ifdef SSL_R_NO_VERIFY_CALLBACK
-+ {"NO_VERIFY_CALLBACK", ERR_LIB_SSL, SSL_R_NO_VERIFY_CALLBACK},
-+ #else
-+ {"NO_VERIFY_CALLBACK", ERR_LIB_SSL, 194},
-+ #endif
-+ #ifdef SSL_R_NULL_SSL_CTX
-+ {"NULL_SSL_CTX", ERR_LIB_SSL, SSL_R_NULL_SSL_CTX},
-+ #else
-+ {"NULL_SSL_CTX", ERR_LIB_SSL, 195},
-+ #endif
-+ #ifdef SSL_R_NULL_SSL_METHOD_PASSED
-+ {"NULL_SSL_METHOD_PASSED", ERR_LIB_SSL, SSL_R_NULL_SSL_METHOD_PASSED},
-+ #else
-+ {"NULL_SSL_METHOD_PASSED", ERR_LIB_SSL, 196},
-+ #endif
-+ #ifdef SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED
-+ {"OLD_SESSION_CIPHER_NOT_RETURNED", ERR_LIB_SSL, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED},
-+ #else
-+ {"OLD_SESSION_CIPHER_NOT_RETURNED", ERR_LIB_SSL, 197},
-+ #endif
-+ #ifdef SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED
-+ {"OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED", ERR_LIB_SSL, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED},
-+ #else
-+ {"OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED", ERR_LIB_SSL, 344},
-+ #endif
-+ #ifdef SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE
-+ {"ONLY_TLS_ALLOWED_IN_FIPS_MODE", ERR_LIB_SSL, SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE},
-+ #else
-+ {"ONLY_TLS_ALLOWED_IN_FIPS_MODE", ERR_LIB_SSL, 297},
-+ #endif
-+ #ifdef SSL_R_OPAQUE_PRF_INPUT_TOO_LONG
-+ {"OPAQUE_PRF_INPUT_TOO_LONG", ERR_LIB_SSL, SSL_R_OPAQUE_PRF_INPUT_TOO_LONG},
-+ #else
-+ {"OPAQUE_PRF_INPUT_TOO_LONG", ERR_LIB_SSL, 327},
-+ #endif
-+ #ifdef SSL_R_PACKET_LENGTH_TOO_LONG
-+ {"PACKET_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_PACKET_LENGTH_TOO_LONG},
-+ #else
-+ {"PACKET_LENGTH_TOO_LONG", ERR_LIB_SSL, 198},
-+ #endif
-+ #ifdef SSL_R_PARSE_TLSEXT
-+ {"PARSE_TLSEXT", ERR_LIB_SSL, SSL_R_PARSE_TLSEXT},
-+ #else
-+ {"PARSE_TLSEXT", ERR_LIB_SSL, 227},
-+ #endif
-+ #ifdef SSL_R_PATH_TOO_LONG
-+ {"PATH_TOO_LONG", ERR_LIB_SSL, SSL_R_PATH_TOO_LONG},
-+ #else
-+ {"PATH_TOO_LONG", ERR_LIB_SSL, 270},
-+ #endif
-+ #ifdef SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE
-+ {"PEER_DID_NOT_RETURN_A_CERTIFICATE", ERR_LIB_SSL, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE},
-+ #else
-+ {"PEER_DID_NOT_RETURN_A_CERTIFICATE", ERR_LIB_SSL, 199},
-+ #endif
-+ #ifdef SSL_R_PEER_ERROR
-+ {"PEER_ERROR", ERR_LIB_SSL, SSL_R_PEER_ERROR},
-+ #else
-+ {"PEER_ERROR", ERR_LIB_SSL, 200},
-+ #endif
-+ #ifdef SSL_R_PEER_ERROR_CERTIFICATE
-+ {"PEER_ERROR_CERTIFICATE", ERR_LIB_SSL, SSL_R_PEER_ERROR_CERTIFICATE},
-+ #else
-+ {"PEER_ERROR_CERTIFICATE", ERR_LIB_SSL, 201},
-+ #endif
-+ #ifdef SSL_R_PEER_ERROR_NO_CERTIFICATE
-+ {"PEER_ERROR_NO_CERTIFICATE", ERR_LIB_SSL, SSL_R_PEER_ERROR_NO_CERTIFICATE},
-+ #else
-+ {"PEER_ERROR_NO_CERTIFICATE", ERR_LIB_SSL, 202},
-+ #endif
-+ #ifdef SSL_R_PEER_ERROR_NO_CIPHER
-+ {"PEER_ERROR_NO_CIPHER", ERR_LIB_SSL, SSL_R_PEER_ERROR_NO_CIPHER},
-+ #else
-+ {"PEER_ERROR_NO_CIPHER", ERR_LIB_SSL, 203},
-+ #endif
-+ #ifdef SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE
-+ {"PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE", ERR_LIB_SSL, SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE},
-+ #else
-+ {"PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE", ERR_LIB_SSL, 204},
-+ #endif
-+ #ifdef SSL_R_PRE_MAC_LENGTH_TOO_LONG
-+ {"PRE_MAC_LENGTH_TOO_LONG", ERR_LIB_SSL, SSL_R_PRE_MAC_LENGTH_TOO_LONG},
-+ #else
-+ {"PRE_MAC_LENGTH_TOO_LONG", ERR_LIB_SSL, 205},
-+ #endif
-+ #ifdef SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS
-+ {"PROBLEMS_MAPPING_CIPHER_FUNCTIONS", ERR_LIB_SSL, SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS},
-+ #else
-+ {"PROBLEMS_MAPPING_CIPHER_FUNCTIONS", ERR_LIB_SSL, 206},
-+ #endif
-+ #ifdef SSL_R_PROTOCOL_IS_SHUTDOWN
-+ {"PROTOCOL_IS_SHUTDOWN", ERR_LIB_SSL, SSL_R_PROTOCOL_IS_SHUTDOWN},
-+ #else
-+ {"PROTOCOL_IS_SHUTDOWN", ERR_LIB_SSL, 207},
-+ #endif
-+ #ifdef SSL_R_PSK_IDENTITY_NOT_FOUND
-+ {"PSK_IDENTITY_NOT_FOUND", ERR_LIB_SSL, SSL_R_PSK_IDENTITY_NOT_FOUND},
-+ #else
-+ {"PSK_IDENTITY_NOT_FOUND", ERR_LIB_SSL, 223},
-+ #endif
-+ #ifdef SSL_R_PSK_NO_CLIENT_CB
-+ {"PSK_NO_CLIENT_CB", ERR_LIB_SSL, SSL_R_PSK_NO_CLIENT_CB},
-+ #else
-+ {"PSK_NO_CLIENT_CB", ERR_LIB_SSL, 224},
-+ #endif
-+ #ifdef SSL_R_PSK_NO_SERVER_CB
-+ {"PSK_NO_SERVER_CB", ERR_LIB_SSL, SSL_R_PSK_NO_SERVER_CB},
-+ #else
-+ {"PSK_NO_SERVER_CB", ERR_LIB_SSL, 225},
-+ #endif
-+ #ifdef SSL_R_PUBLIC_KEY_ENCRYPT_ERROR
-+ {"PUBLIC_KEY_ENCRYPT_ERROR", ERR_LIB_SSL, SSL_R_PUBLIC_KEY_ENCRYPT_ERROR},
-+ #else
-+ {"PUBLIC_KEY_ENCRYPT_ERROR", ERR_LIB_SSL, 208},
-+ #endif
-+ #ifdef SSL_R_PUBLIC_KEY_IS_NOT_RSA
-+ {"PUBLIC_KEY_IS_NOT_RSA", ERR_LIB_SSL, SSL_R_PUBLIC_KEY_IS_NOT_RSA},
-+ #else
-+ {"PUBLIC_KEY_IS_NOT_RSA", ERR_LIB_SSL, 209},
-+ #endif
-+ #ifdef SSL_R_PUBLIC_KEY_NOT_RSA
-+ {"PUBLIC_KEY_NOT_RSA", ERR_LIB_SSL, SSL_R_PUBLIC_KEY_NOT_RSA},
-+ #else
-+ {"PUBLIC_KEY_NOT_RSA", ERR_LIB_SSL, 210},
-+ #endif
-+ #ifdef SSL_R_READ_BIO_NOT_SET
-+ {"READ_BIO_NOT_SET", ERR_LIB_SSL, SSL_R_READ_BIO_NOT_SET},
-+ #else
-+ {"READ_BIO_NOT_SET", ERR_LIB_SSL, 211},
-+ #endif
-+ #ifdef SSL_R_READ_TIMEOUT_EXPIRED
-+ {"READ_TIMEOUT_EXPIRED", ERR_LIB_SSL, SSL_R_READ_TIMEOUT_EXPIRED},
-+ #else
-+ {"READ_TIMEOUT_EXPIRED", ERR_LIB_SSL, 312},
-+ #endif
-+ #ifdef SSL_R_READ_WRONG_PACKET_TYPE
-+ {"READ_WRONG_PACKET_TYPE", ERR_LIB_SSL, SSL_R_READ_WRONG_PACKET_TYPE},
-+ #else
-+ {"READ_WRONG_PACKET_TYPE", ERR_LIB_SSL, 212},
-+ #endif
-+ #ifdef SSL_R_RECORD_LENGTH_MISMATCH
-+ {"RECORD_LENGTH_MISMATCH", ERR_LIB_SSL, SSL_R_RECORD_LENGTH_MISMATCH},
-+ #else
-+ {"RECORD_LENGTH_MISMATCH", ERR_LIB_SSL, 213},
-+ #endif
-+ #ifdef SSL_R_RECORD_TOO_LARGE
-+ {"RECORD_TOO_LARGE", ERR_LIB_SSL, SSL_R_RECORD_TOO_LARGE},
-+ #else
-+ {"RECORD_TOO_LARGE", ERR_LIB_SSL, 214},
-+ #endif
-+ #ifdef SSL_R_RECORD_TOO_SMALL
-+ {"RECORD_TOO_SMALL", ERR_LIB_SSL, SSL_R_RECORD_TOO_SMALL},
-+ #else
-+ {"RECORD_TOO_SMALL", ERR_LIB_SSL, 298},
-+ #endif
-+ #ifdef SSL_R_RENEGOTIATE_EXT_TOO_LONG
-+ {"RENEGOTIATE_EXT_TOO_LONG", ERR_LIB_SSL, SSL_R_RENEGOTIATE_EXT_TOO_LONG},
-+ #else
-+ {"RENEGOTIATE_EXT_TOO_LONG", ERR_LIB_SSL, 335},
-+ #endif
-+ #ifdef SSL_R_RENEGOTIATION_ENCODING_ERR
-+ {"RENEGOTIATION_ENCODING_ERR", ERR_LIB_SSL, SSL_R_RENEGOTIATION_ENCODING_ERR},
-+ #else
-+ {"RENEGOTIATION_ENCODING_ERR", ERR_LIB_SSL, 336},
-+ #endif
-+ #ifdef SSL_R_RENEGOTIATION_MISMATCH
-+ {"RENEGOTIATION_MISMATCH", ERR_LIB_SSL, SSL_R_RENEGOTIATION_MISMATCH},
-+ #else
-+ {"RENEGOTIATION_MISMATCH", ERR_LIB_SSL, 337},
-+ #endif
-+ #ifdef SSL_R_REQUIRED_CIPHER_MISSING
-+ {"REQUIRED_CIPHER_MISSING", ERR_LIB_SSL, SSL_R_REQUIRED_CIPHER_MISSING},
-+ #else
-+ {"REQUIRED_CIPHER_MISSING", ERR_LIB_SSL, 215},
-+ #endif
-+ #ifdef SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING
-+ {"REQUIRED_COMPRESSSION_ALGORITHM_MISSING", ERR_LIB_SSL, SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING},
-+ #else
-+ {"REQUIRED_COMPRESSSION_ALGORITHM_MISSING", ERR_LIB_SSL, 342},
-+ #endif
-+ #ifdef SSL_R_REUSE_CERT_LENGTH_NOT_ZERO
-+ {"REUSE_CERT_LENGTH_NOT_ZERO", ERR_LIB_SSL, SSL_R_REUSE_CERT_LENGTH_NOT_ZERO},
-+ #else
-+ {"REUSE_CERT_LENGTH_NOT_ZERO", ERR_LIB_SSL, 216},
-+ #endif
-+ #ifdef SSL_R_REUSE_CERT_TYPE_NOT_ZERO
-+ {"REUSE_CERT_TYPE_NOT_ZERO", ERR_LIB_SSL, SSL_R_REUSE_CERT_TYPE_NOT_ZERO},
-+ #else
-+ {"REUSE_CERT_TYPE_NOT_ZERO", ERR_LIB_SSL, 217},
-+ #endif
-+ #ifdef SSL_R_REUSE_CIPHER_LIST_NOT_ZERO
-+ {"REUSE_CIPHER_LIST_NOT_ZERO", ERR_LIB_SSL, SSL_R_REUSE_CIPHER_LIST_NOT_ZERO},
-+ #else
-+ {"REUSE_CIPHER_LIST_NOT_ZERO", ERR_LIB_SSL, 218},
-+ #endif
-+ #ifdef SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING
-+ {"SCSV_RECEIVED_WHEN_RENEGOTIATING", ERR_LIB_SSL, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING},
-+ #else
-+ {"SCSV_RECEIVED_WHEN_RENEGOTIATING", ERR_LIB_SSL, 345},
-+ #endif
-+ #ifdef SSL_R_SERVERHELLO_TLSEXT
-+ {"SERVERHELLO_TLSEXT", ERR_LIB_SSL, SSL_R_SERVERHELLO_TLSEXT},
-+ #else
-+ {"SERVERHELLO_TLSEXT", ERR_LIB_SSL, 275},
-+ #endif
-+ #ifdef SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED
-+ {"SESSION_ID_CONTEXT_UNINITIALIZED", ERR_LIB_SSL, SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED},
-+ #else
-+ {"SESSION_ID_CONTEXT_UNINITIALIZED", ERR_LIB_SSL, 277},
-+ #endif
-+ #ifdef SSL_R_SHORT_READ
-+ {"SHORT_READ", ERR_LIB_SSL, SSL_R_SHORT_READ},
-+ #else
-+ {"SHORT_READ", ERR_LIB_SSL, 219},
-+ #endif
-+ #ifdef SSL_R_SIGNATURE_ALGORITHMS_ERROR
-+ {"SIGNATURE_ALGORITHMS_ERROR", ERR_LIB_SSL, SSL_R_SIGNATURE_ALGORITHMS_ERROR},
-+ #else
-+ {"SIGNATURE_ALGORITHMS_ERROR", ERR_LIB_SSL, 360},
-+ #endif
-+ #ifdef SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE
-+ {"SIGNATURE_FOR_NON_SIGNING_CERTIFICATE", ERR_LIB_SSL, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE},
-+ #else
-+ {"SIGNATURE_FOR_NON_SIGNING_CERTIFICATE", ERR_LIB_SSL, 220},
-+ #endif
-+ #ifdef SSL_R_SRP_A_CALC
-+ {"SRP_A_CALC", ERR_LIB_SSL, SSL_R_SRP_A_CALC},
-+ #else
-+ {"SRP_A_CALC", ERR_LIB_SSL, 361},
-+ #endif
-+ #ifdef SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES
-+ {"SRTP_COULD_NOT_ALLOCATE_PROFILES", ERR_LIB_SSL, SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES},
-+ #else
-+ {"SRTP_COULD_NOT_ALLOCATE_PROFILES", ERR_LIB_SSL, 362},
-+ #endif
-+ #ifdef SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG
-+ {"SRTP_PROTECTION_PROFILE_LIST_TOO_LONG", ERR_LIB_SSL, SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG},
-+ #else
-+ {"SRTP_PROTECTION_PROFILE_LIST_TOO_LONG", ERR_LIB_SSL, 363},
-+ #endif
-+ #ifdef SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE
-+ {"SRTP_UNKNOWN_PROTECTION_PROFILE", ERR_LIB_SSL, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE},
-+ #else
-+ {"SRTP_UNKNOWN_PROTECTION_PROFILE", ERR_LIB_SSL, 364},
-+ #endif
-+ #ifdef SSL_R_SSL23_DOING_SESSION_ID_REUSE
-+ {"SSL23_DOING_SESSION_ID_REUSE", ERR_LIB_SSL, SSL_R_SSL23_DOING_SESSION_ID_REUSE},
-+ #else
-+ {"SSL23_DOING_SESSION_ID_REUSE", ERR_LIB_SSL, 221},
-+ #endif
-+ #ifdef SSL_R_SSL2_CONNECTION_ID_TOO_LONG
-+ {"SSL2_CONNECTION_ID_TOO_LONG", ERR_LIB_SSL, SSL_R_SSL2_CONNECTION_ID_TOO_LONG},
-+ #else
-+ {"SSL2_CONNECTION_ID_TOO_LONG", ERR_LIB_SSL, 299},
-+ #endif
-+ #ifdef SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT
-+ {"SSL3_EXT_INVALID_ECPOINTFORMAT", ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT},
-+ #else
-+ {"SSL3_EXT_INVALID_ECPOINTFORMAT", ERR_LIB_SSL, 321},
-+ #endif
-+ #ifdef SSL_R_SSL3_EXT_INVALID_SERVERNAME
-+ {"SSL3_EXT_INVALID_SERVERNAME", ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_SERVERNAME},
-+ #else
-+ {"SSL3_EXT_INVALID_SERVERNAME", ERR_LIB_SSL, 319},
-+ #endif
-+ #ifdef SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE
-+ {"SSL3_EXT_INVALID_SERVERNAME_TYPE", ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE},
-+ #else
-+ {"SSL3_EXT_INVALID_SERVERNAME_TYPE", ERR_LIB_SSL, 320},
-+ #endif
-+ #ifdef SSL_R_SSL3_SESSION_ID_TOO_LONG
-+ {"SSL3_SESSION_ID_TOO_LONG", ERR_LIB_SSL, SSL_R_SSL3_SESSION_ID_TOO_LONG},
-+ #else
-+ {"SSL3_SESSION_ID_TOO_LONG", ERR_LIB_SSL, 300},
-+ #endif
-+ #ifdef SSL_R_SSL3_SESSION_ID_TOO_SHORT
-+ {"SSL3_SESSION_ID_TOO_SHORT", ERR_LIB_SSL, SSL_R_SSL3_SESSION_ID_TOO_SHORT},
-+ #else
-+ {"SSL3_SESSION_ID_TOO_SHORT", ERR_LIB_SSL, 222},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_BAD_CERTIFICATE
-+ {"SSLV3_ALERT_BAD_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE},
-+ #else
-+ {"SSLV3_ALERT_BAD_CERTIFICATE", ERR_LIB_SSL, 1042},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_BAD_RECORD_MAC
-+ {"SSLV3_ALERT_BAD_RECORD_MAC", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC},
-+ #else
-+ {"SSLV3_ALERT_BAD_RECORD_MAC", ERR_LIB_SSL, 1020},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED
-+ {"SSLV3_ALERT_CERTIFICATE_EXPIRED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED},
-+ #else
-+ {"SSLV3_ALERT_CERTIFICATE_EXPIRED", ERR_LIB_SSL, 1045},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED
-+ {"SSLV3_ALERT_CERTIFICATE_REVOKED", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED},
-+ #else
-+ {"SSLV3_ALERT_CERTIFICATE_REVOKED", ERR_LIB_SSL, 1044},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN
-+ {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN},
-+ #else
-+ {"SSLV3_ALERT_CERTIFICATE_UNKNOWN", ERR_LIB_SSL, 1046},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE
-+ {"SSLV3_ALERT_DECOMPRESSION_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE},
-+ #else
-+ {"SSLV3_ALERT_DECOMPRESSION_FAILURE", ERR_LIB_SSL, 1030},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE
-+ {"SSLV3_ALERT_HANDSHAKE_FAILURE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE},
-+ #else
-+ {"SSLV3_ALERT_HANDSHAKE_FAILURE", ERR_LIB_SSL, 1040},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER
-+ {"SSLV3_ALERT_ILLEGAL_PARAMETER", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER},
-+ #else
-+ {"SSLV3_ALERT_ILLEGAL_PARAMETER", ERR_LIB_SSL, 1047},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_NO_CERTIFICATE
-+ {"SSLV3_ALERT_NO_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_NO_CERTIFICATE},
-+ #else
-+ {"SSLV3_ALERT_NO_CERTIFICATE", ERR_LIB_SSL, 1041},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
-+ {"SSLV3_ALERT_UNEXPECTED_MESSAGE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE},
-+ #else
-+ {"SSLV3_ALERT_UNEXPECTED_MESSAGE", ERR_LIB_SSL, 1010},
-+ #endif
-+ #ifdef SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE
-+ {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", ERR_LIB_SSL, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE},
-+ #else
-+ {"SSLV3_ALERT_UNSUPPORTED_CERTIFICATE", ERR_LIB_SSL, 1043},
-+ #endif
-+ #ifdef SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION
-+ {"SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION", ERR_LIB_SSL, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION},
-+ #else
-+ {"SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION", ERR_LIB_SSL, 228},
-+ #endif
-+ #ifdef SSL_R_SSL_HANDSHAKE_FAILURE
-+ {"SSL_HANDSHAKE_FAILURE", ERR_LIB_SSL, SSL_R_SSL_HANDSHAKE_FAILURE},
-+ #else
-+ {"SSL_HANDSHAKE_FAILURE", ERR_LIB_SSL, 229},
-+ #endif
-+ #ifdef SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS
-+ {"SSL_LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS},
-+ #else
-+ {"SSL_LIBRARY_HAS_NO_CIPHERS", ERR_LIB_SSL, 230},
-+ #endif
-+ #ifdef SSL_R_SSL_SESSION_ID_CALLBACK_FAILED
-+ {"SSL_SESSION_ID_CALLBACK_FAILED", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CALLBACK_FAILED},
-+ #else
-+ {"SSL_SESSION_ID_CALLBACK_FAILED", ERR_LIB_SSL, 301},
-+ #endif
-+ #ifdef SSL_R_SSL_SESSION_ID_CONFLICT
-+ {"SSL_SESSION_ID_CONFLICT", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONFLICT},
-+ #else
-+ {"SSL_SESSION_ID_CONFLICT", ERR_LIB_SSL, 302},
-+ #endif
-+ #ifdef SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG
-+ {"SSL_SESSION_ID_CONTEXT_TOO_LONG", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG},
-+ #else
-+ {"SSL_SESSION_ID_CONTEXT_TOO_LONG", ERR_LIB_SSL, 273},
-+ #endif
-+ #ifdef SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH
-+ {"SSL_SESSION_ID_HAS_BAD_LENGTH", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH},
-+ #else
-+ {"SSL_SESSION_ID_HAS_BAD_LENGTH", ERR_LIB_SSL, 303},
-+ #endif
-+ #ifdef SSL_R_SSL_SESSION_ID_IS_DIFFERENT
-+ {"SSL_SESSION_ID_IS_DIFFERENT", ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_IS_DIFFERENT},
-+ #else
-+ {"SSL_SESSION_ID_IS_DIFFERENT", ERR_LIB_SSL, 231},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_ACCESS_DENIED
-+ {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_ACCESS_DENIED},
-+ #else
-+ {"TLSV1_ALERT_ACCESS_DENIED", ERR_LIB_SSL, 1049},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_DECODE_ERROR
-+ {"TLSV1_ALERT_DECODE_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECODE_ERROR},
-+ #else
-+ {"TLSV1_ALERT_DECODE_ERROR", ERR_LIB_SSL, 1050},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_DECRYPTION_FAILED
-+ {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED},
-+ #else
-+ {"TLSV1_ALERT_DECRYPTION_FAILED", ERR_LIB_SSL, 1021},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_DECRYPT_ERROR
-+ {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_DECRYPT_ERROR},
-+ #else
-+ {"TLSV1_ALERT_DECRYPT_ERROR", ERR_LIB_SSL, 1051},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION
-+ {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION},
-+ #else
-+ {"TLSV1_ALERT_EXPORT_RESTRICTION", ERR_LIB_SSL, 1060},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY
-+ {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY},
-+ #else
-+ {"TLSV1_ALERT_INSUFFICIENT_SECURITY", ERR_LIB_SSL, 1071},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_INTERNAL_ERROR
-+ {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_INTERNAL_ERROR},
-+ #else
-+ {"TLSV1_ALERT_INTERNAL_ERROR", ERR_LIB_SSL, 1080},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_NO_RENEGOTIATION
-+ {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION},
-+ #else
-+ {"TLSV1_ALERT_NO_RENEGOTIATION", ERR_LIB_SSL, 1100},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_PROTOCOL_VERSION
-+ {"TLSV1_ALERT_PROTOCOL_VERSION", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION},
-+ #else
-+ {"TLSV1_ALERT_PROTOCOL_VERSION", ERR_LIB_SSL, 1070},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_RECORD_OVERFLOW
-+ {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW},
-+ #else
-+ {"TLSV1_ALERT_RECORD_OVERFLOW", ERR_LIB_SSL, 1022},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_UNKNOWN_CA
-+ {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_UNKNOWN_CA},
-+ #else
-+ {"TLSV1_ALERT_UNKNOWN_CA", ERR_LIB_SSL, 1048},
-+ #endif
-+ #ifdef SSL_R_TLSV1_ALERT_USER_CANCELLED
-+ {"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, SSL_R_TLSV1_ALERT_USER_CANCELLED},
-+ #else
-+ {"TLSV1_ALERT_USER_CANCELLED", ERR_LIB_SSL, 1090},
-+ #endif
-+ #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE
-+ {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE},
-+ #else
-+ {"TLSV1_BAD_CERTIFICATE_HASH_VALUE", ERR_LIB_SSL, 1114},
-+ #endif
-+ #ifdef SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE
-+ {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", ERR_LIB_SSL, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE},
-+ #else
-+ {"TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE", ERR_LIB_SSL, 1113},
-+ #endif
-+ #ifdef SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE
-+ {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE},
-+ #else
-+ {"TLSV1_CERTIFICATE_UNOBTAINABLE", ERR_LIB_SSL, 1111},
-+ #endif
-+ #ifdef SSL_R_TLSV1_UNRECOGNIZED_NAME
-+ {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, SSL_R_TLSV1_UNRECOGNIZED_NAME},
-+ #else
-+ {"TLSV1_UNRECOGNIZED_NAME", ERR_LIB_SSL, 1112},
-+ #endif
-+ #ifdef SSL_R_TLSV1_UNSUPPORTED_EXTENSION
-+ {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, SSL_R_TLSV1_UNSUPPORTED_EXTENSION},
-+ #else
-+ {"TLSV1_UNSUPPORTED_EXTENSION", ERR_LIB_SSL, 1110},
-+ #endif
-+ #ifdef SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER
-+ {"TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER", ERR_LIB_SSL, SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER},
-+ #else
-+ {"TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER", ERR_LIB_SSL, 232},
-+ #endif
-+ #ifdef SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT
-+ {"TLS_HEARTBEAT_PEER_DOESNT_ACCEPT", ERR_LIB_SSL, SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT},
-+ #else
-+ {"TLS_HEARTBEAT_PEER_DOESNT_ACCEPT", ERR_LIB_SSL, 365},
-+ #endif
-+ #ifdef SSL_R_TLS_HEARTBEAT_PENDING
-+ {"TLS_HEARTBEAT_PENDING", ERR_LIB_SSL, SSL_R_TLS_HEARTBEAT_PENDING},
-+ #else
-+ {"TLS_HEARTBEAT_PENDING", ERR_LIB_SSL, 366},
-+ #endif
-+ #ifdef SSL_R_TLS_ILLEGAL_EXPORTER_LABEL
-+ {"TLS_ILLEGAL_EXPORTER_LABEL", ERR_LIB_SSL, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL},
-+ #else
-+ {"TLS_ILLEGAL_EXPORTER_LABEL", ERR_LIB_SSL, 367},
-+ #endif
-+ #ifdef SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST
-+ {"TLS_INVALID_ECPOINTFORMAT_LIST", ERR_LIB_SSL, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST},
-+ #else
-+ {"TLS_INVALID_ECPOINTFORMAT_LIST", ERR_LIB_SSL, 157},
-+ #endif
-+ #ifdef SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST
-+ {"TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST", ERR_LIB_SSL, SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST},
-+ #else
-+ {"TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST", ERR_LIB_SSL, 233},
-+ #endif
-+ #ifdef SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG
-+ {"TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG},
-+ #else
-+ {"TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG", ERR_LIB_SSL, 234},
-+ #endif
-+ #ifdef SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER
-+ {"TRIED_TO_USE_UNSUPPORTED_CIPHER", ERR_LIB_SSL, SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER},
-+ #else
-+ {"TRIED_TO_USE_UNSUPPORTED_CIPHER", ERR_LIB_SSL, 235},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_DECODE_DH_CERTS
-+ {"UNABLE_TO_DECODE_DH_CERTS", ERR_LIB_SSL, SSL_R_UNABLE_TO_DECODE_DH_CERTS},
-+ #else
-+ {"UNABLE_TO_DECODE_DH_CERTS", ERR_LIB_SSL, 236},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_DECODE_ECDH_CERTS
-+ {"UNABLE_TO_DECODE_ECDH_CERTS", ERR_LIB_SSL, SSL_R_UNABLE_TO_DECODE_ECDH_CERTS},
-+ #else
-+ {"UNABLE_TO_DECODE_ECDH_CERTS", ERR_LIB_SSL, 313},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY
-+ {"UNABLE_TO_EXTRACT_PUBLIC_KEY", ERR_LIB_SSL, SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY},
-+ #else
-+ {"UNABLE_TO_EXTRACT_PUBLIC_KEY", ERR_LIB_SSL, 237},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_FIND_DH_PARAMETERS
-+ {"UNABLE_TO_FIND_DH_PARAMETERS", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_DH_PARAMETERS},
-+ #else
-+ {"UNABLE_TO_FIND_DH_PARAMETERS", ERR_LIB_SSL, 238},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS
-+ {"UNABLE_TO_FIND_ECDH_PARAMETERS", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS},
-+ #else
-+ {"UNABLE_TO_FIND_ECDH_PARAMETERS", ERR_LIB_SSL, 314},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS
-+ {"UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS},
-+ #else
-+ {"UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS", ERR_LIB_SSL, 239},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_FIND_SSL_METHOD
-+ {"UNABLE_TO_FIND_SSL_METHOD", ERR_LIB_SSL, SSL_R_UNABLE_TO_FIND_SSL_METHOD},
-+ #else
-+ {"UNABLE_TO_FIND_SSL_METHOD", ERR_LIB_SSL, 240},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES
-+ {"UNABLE_TO_LOAD_SSL2_MD5_ROUTINES", ERR_LIB_SSL, SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES},
-+ #else
-+ {"UNABLE_TO_LOAD_SSL2_MD5_ROUTINES", ERR_LIB_SSL, 241},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES
-+ {"UNABLE_TO_LOAD_SSL3_MD5_ROUTINES", ERR_LIB_SSL, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES},
-+ #else
-+ {"UNABLE_TO_LOAD_SSL3_MD5_ROUTINES", ERR_LIB_SSL, 242},
-+ #endif
-+ #ifdef SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES
-+ {"UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES", ERR_LIB_SSL, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES},
-+ #else
-+ {"UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES", ERR_LIB_SSL, 243},
-+ #endif
-+ #ifdef SSL_R_UNEXPECTED_MESSAGE
-+ {"UNEXPECTED_MESSAGE", ERR_LIB_SSL, SSL_R_UNEXPECTED_MESSAGE},
-+ #else
-+ {"UNEXPECTED_MESSAGE", ERR_LIB_SSL, 244},
-+ #endif
-+ #ifdef SSL_R_UNEXPECTED_RECORD
-+ {"UNEXPECTED_RECORD", ERR_LIB_SSL, SSL_R_UNEXPECTED_RECORD},
-+ #else
-+ {"UNEXPECTED_RECORD", ERR_LIB_SSL, 245},
-+ #endif
-+ #ifdef SSL_R_UNINITIALIZED
-+ {"UNINITIALIZED", ERR_LIB_SSL, SSL_R_UNINITIALIZED},
-+ #else
-+ {"UNINITIALIZED", ERR_LIB_SSL, 276},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_ALERT_TYPE
-+ {"UNKNOWN_ALERT_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_ALERT_TYPE},
-+ #else
-+ {"UNKNOWN_ALERT_TYPE", ERR_LIB_SSL, 246},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_CERTIFICATE_TYPE
-+ {"UNKNOWN_CERTIFICATE_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_CERTIFICATE_TYPE},
-+ #else
-+ {"UNKNOWN_CERTIFICATE_TYPE", ERR_LIB_SSL, 247},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_CIPHER_RETURNED
-+ {"UNKNOWN_CIPHER_RETURNED", ERR_LIB_SSL, SSL_R_UNKNOWN_CIPHER_RETURNED},
-+ #else
-+ {"UNKNOWN_CIPHER_RETURNED", ERR_LIB_SSL, 248},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_CIPHER_TYPE
-+ {"UNKNOWN_CIPHER_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_CIPHER_TYPE},
-+ #else
-+ {"UNKNOWN_CIPHER_TYPE", ERR_LIB_SSL, 249},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_DIGEST
-+ {"UNKNOWN_DIGEST", ERR_LIB_SSL, SSL_R_UNKNOWN_DIGEST},
-+ #else
-+ {"UNKNOWN_DIGEST", ERR_LIB_SSL, 368},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE
-+ {"UNKNOWN_KEY_EXCHANGE_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE},
-+ #else
-+ {"UNKNOWN_KEY_EXCHANGE_TYPE", ERR_LIB_SSL, 250},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_PKEY_TYPE
-+ {"UNKNOWN_PKEY_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_PKEY_TYPE},
-+ #else
-+ {"UNKNOWN_PKEY_TYPE", ERR_LIB_SSL, 251},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_PROTOCOL
-+ {"UNKNOWN_PROTOCOL", ERR_LIB_SSL, SSL_R_UNKNOWN_PROTOCOL},
-+ #else
-+ {"UNKNOWN_PROTOCOL", ERR_LIB_SSL, 252},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_REMOTE_ERROR_TYPE
-+ {"UNKNOWN_REMOTE_ERROR_TYPE", ERR_LIB_SSL, SSL_R_UNKNOWN_REMOTE_ERROR_TYPE},
-+ #else
-+ {"UNKNOWN_REMOTE_ERROR_TYPE", ERR_LIB_SSL, 253},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_SSL_VERSION
-+ {"UNKNOWN_SSL_VERSION", ERR_LIB_SSL, SSL_R_UNKNOWN_SSL_VERSION},
-+ #else
-+ {"UNKNOWN_SSL_VERSION", ERR_LIB_SSL, 254},
-+ #endif
-+ #ifdef SSL_R_UNKNOWN_STATE
-+ {"UNKNOWN_STATE", ERR_LIB_SSL, SSL_R_UNKNOWN_STATE},
-+ #else
-+ {"UNKNOWN_STATE", ERR_LIB_SSL, 255},
-+ #endif
-+ #ifdef SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED
-+ {"UNSAFE_LEGACY_RENEGOTIATION_DISABLED", ERR_LIB_SSL, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED},
-+ #else
-+ {"UNSAFE_LEGACY_RENEGOTIATION_DISABLED", ERR_LIB_SSL, 338},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_CIPHER
-+ {"UNSUPPORTED_CIPHER", ERR_LIB_SSL, SSL_R_UNSUPPORTED_CIPHER},
-+ #else
-+ {"UNSUPPORTED_CIPHER", ERR_LIB_SSL, 256},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM
-+ {"UNSUPPORTED_COMPRESSION_ALGORITHM", ERR_LIB_SSL, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM},
-+ #else
-+ {"UNSUPPORTED_COMPRESSION_ALGORITHM", ERR_LIB_SSL, 257},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_DIGEST_TYPE
-+ {"UNSUPPORTED_DIGEST_TYPE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_DIGEST_TYPE},
-+ #else
-+ {"UNSUPPORTED_DIGEST_TYPE", ERR_LIB_SSL, 326},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_ELLIPTIC_CURVE
-+ {"UNSUPPORTED_ELLIPTIC_CURVE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE},
-+ #else
-+ {"UNSUPPORTED_ELLIPTIC_CURVE", ERR_LIB_SSL, 315},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_PROTOCOL
-+ {"UNSUPPORTED_PROTOCOL", ERR_LIB_SSL, SSL_R_UNSUPPORTED_PROTOCOL},
-+ #else
-+ {"UNSUPPORTED_PROTOCOL", ERR_LIB_SSL, 258},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_SSL_VERSION
-+ {"UNSUPPORTED_SSL_VERSION", ERR_LIB_SSL, SSL_R_UNSUPPORTED_SSL_VERSION},
-+ #else
-+ {"UNSUPPORTED_SSL_VERSION", ERR_LIB_SSL, 259},
-+ #endif
-+ #ifdef SSL_R_UNSUPPORTED_STATUS_TYPE
-+ {"UNSUPPORTED_STATUS_TYPE", ERR_LIB_SSL, SSL_R_UNSUPPORTED_STATUS_TYPE},
-+ #else
-+ {"UNSUPPORTED_STATUS_TYPE", ERR_LIB_SSL, 329},
-+ #endif
-+ #ifdef SSL_R_USE_SRTP_NOT_NEGOTIATED
-+ {"USE_SRTP_NOT_NEGOTIATED", ERR_LIB_SSL, SSL_R_USE_SRTP_NOT_NEGOTIATED},
-+ #else
-+ {"USE_SRTP_NOT_NEGOTIATED", ERR_LIB_SSL, 369},
-+ #endif
-+ #ifdef SSL_R_WRITE_BIO_NOT_SET
-+ {"WRITE_BIO_NOT_SET", ERR_LIB_SSL, SSL_R_WRITE_BIO_NOT_SET},
-+ #else
-+ {"WRITE_BIO_NOT_SET", ERR_LIB_SSL, 260},
-+ #endif
-+ #ifdef SSL_R_WRONG_CIPHER_RETURNED
-+ {"WRONG_CIPHER_RETURNED", ERR_LIB_SSL, SSL_R_WRONG_CIPHER_RETURNED},
-+ #else
-+ {"WRONG_CIPHER_RETURNED", ERR_LIB_SSL, 261},
-+ #endif
-+ #ifdef SSL_R_WRONG_MESSAGE_TYPE
-+ {"WRONG_MESSAGE_TYPE", ERR_LIB_SSL, SSL_R_WRONG_MESSAGE_TYPE},
-+ #else
-+ {"WRONG_MESSAGE_TYPE", ERR_LIB_SSL, 262},
-+ #endif
-+ #ifdef SSL_R_WRONG_NUMBER_OF_KEY_BITS
-+ {"WRONG_NUMBER_OF_KEY_BITS", ERR_LIB_SSL, SSL_R_WRONG_NUMBER_OF_KEY_BITS},
-+ #else
-+ {"WRONG_NUMBER_OF_KEY_BITS", ERR_LIB_SSL, 263},
-+ #endif
-+ #ifdef SSL_R_WRONG_SIGNATURE_LENGTH
-+ {"WRONG_SIGNATURE_LENGTH", ERR_LIB_SSL, SSL_R_WRONG_SIGNATURE_LENGTH},
-+ #else
-+ {"WRONG_SIGNATURE_LENGTH", ERR_LIB_SSL, 264},
-+ #endif
-+ #ifdef SSL_R_WRONG_SIGNATURE_SIZE
-+ {"WRONG_SIGNATURE_SIZE", ERR_LIB_SSL, SSL_R_WRONG_SIGNATURE_SIZE},
-+ #else
-+ {"WRONG_SIGNATURE_SIZE", ERR_LIB_SSL, 265},
-+ #endif
-+ #ifdef SSL_R_WRONG_SIGNATURE_TYPE
-+ {"WRONG_SIGNATURE_TYPE", ERR_LIB_SSL, SSL_R_WRONG_SIGNATURE_TYPE},
-+ #else
-+ {"WRONG_SIGNATURE_TYPE", ERR_LIB_SSL, 370},
-+ #endif
-+ #ifdef SSL_R_WRONG_SSL_VERSION
-+ {"WRONG_SSL_VERSION", ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION},
-+ #else
-+ {"WRONG_SSL_VERSION", ERR_LIB_SSL, 266},
-+ #endif
-+ #ifdef SSL_R_WRONG_VERSION_NUMBER
-+ {"WRONG_VERSION_NUMBER", ERR_LIB_SSL, SSL_R_WRONG_VERSION_NUMBER},
-+ #else
-+ {"WRONG_VERSION_NUMBER", ERR_LIB_SSL, 267},
-+ #endif
-+ #ifdef SSL_R_X509_LIB
-+ {"X509_LIB", ERR_LIB_SSL, SSL_R_X509_LIB},
-+ #else
-+ {"X509_LIB", ERR_LIB_SSL, 268},
-+ #endif
-+ #ifdef SSL_R_X509_VERIFICATION_SETUP_PROBLEMS
-+ {"X509_VERIFICATION_SETUP_PROBLEMS", ERR_LIB_SSL, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS},
-+ #else
-+ {"X509_VERIFICATION_SETUP_PROBLEMS", ERR_LIB_SSL, 269},
-+ #endif
-+ #ifdef X509_R_BAD_X509_FILETYPE
-+ {"BAD_X509_FILETYPE", ERR_LIB_X509, X509_R_BAD_X509_FILETYPE},
-+ #else
-+ {"BAD_X509_FILETYPE", ERR_LIB_X509, 100},
-+ #endif
-+ #ifdef X509_R_BASE64_DECODE_ERROR
-+ {"BASE64_DECODE_ERROR", ERR_LIB_X509, X509_R_BASE64_DECODE_ERROR},
-+ #else
-+ {"BASE64_DECODE_ERROR", ERR_LIB_X509, 118},
-+ #endif
-+ #ifdef X509_R_CANT_CHECK_DH_KEY
-+ {"CANT_CHECK_DH_KEY", ERR_LIB_X509, X509_R_CANT_CHECK_DH_KEY},
-+ #else
-+ {"CANT_CHECK_DH_KEY", ERR_LIB_X509, 114},
-+ #endif
-+ #ifdef X509_R_CERT_ALREADY_IN_HASH_TABLE
-+ {"CERT_ALREADY_IN_HASH_TABLE", ERR_LIB_X509, X509_R_CERT_ALREADY_IN_HASH_TABLE},
-+ #else
-+ {"CERT_ALREADY_IN_HASH_TABLE", ERR_LIB_X509, 101},
-+ #endif
-+ #ifdef X509_R_ERR_ASN1_LIB
-+ {"ERR_ASN1_LIB", ERR_LIB_X509, X509_R_ERR_ASN1_LIB},
-+ #else
-+ {"ERR_ASN1_LIB", ERR_LIB_X509, 102},
-+ #endif
-+ #ifdef X509_R_INVALID_DIRECTORY
-+ {"INVALID_DIRECTORY", ERR_LIB_X509, X509_R_INVALID_DIRECTORY},
-+ #else
-+ {"INVALID_DIRECTORY", ERR_LIB_X509, 113},
-+ #endif
-+ #ifdef X509_R_INVALID_FIELD_NAME
-+ {"INVALID_FIELD_NAME", ERR_LIB_X509, X509_R_INVALID_FIELD_NAME},
-+ #else
-+ {"INVALID_FIELD_NAME", ERR_LIB_X509, 119},
-+ #endif
-+ #ifdef X509_R_INVALID_TRUST
-+ {"INVALID_TRUST", ERR_LIB_X509, X509_R_INVALID_TRUST},
-+ #else
-+ {"INVALID_TRUST", ERR_LIB_X509, 123},
-+ #endif
-+ #ifdef X509_R_KEY_TYPE_MISMATCH
-+ {"KEY_TYPE_MISMATCH", ERR_LIB_X509, X509_R_KEY_TYPE_MISMATCH},
-+ #else
-+ {"KEY_TYPE_MISMATCH", ERR_LIB_X509, 115},
-+ #endif
-+ #ifdef X509_R_KEY_VALUES_MISMATCH
-+ {"KEY_VALUES_MISMATCH", ERR_LIB_X509, X509_R_KEY_VALUES_MISMATCH},
-+ #else
-+ {"KEY_VALUES_MISMATCH", ERR_LIB_X509, 116},
-+ #endif
-+ #ifdef X509_R_LOADING_CERT_DIR
-+ {"LOADING_CERT_DIR", ERR_LIB_X509, X509_R_LOADING_CERT_DIR},
-+ #else
-+ {"LOADING_CERT_DIR", ERR_LIB_X509, 103},
-+ #endif
-+ #ifdef X509_R_LOADING_DEFAULTS
-+ {"LOADING_DEFAULTS", ERR_LIB_X509, X509_R_LOADING_DEFAULTS},
-+ #else
-+ {"LOADING_DEFAULTS", ERR_LIB_X509, 104},
-+ #endif
-+ #ifdef X509_R_METHOD_NOT_SUPPORTED
-+ {"METHOD_NOT_SUPPORTED", ERR_LIB_X509, X509_R_METHOD_NOT_SUPPORTED},
-+ #else
-+ {"METHOD_NOT_SUPPORTED", ERR_LIB_X509, 124},
-+ #endif
-+ #ifdef X509_R_NO_CERT_SET_FOR_US_TO_VERIFY
-+ {"NO_CERT_SET_FOR_US_TO_VERIFY", ERR_LIB_X509, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY},
-+ #else
-+ {"NO_CERT_SET_FOR_US_TO_VERIFY", ERR_LIB_X509, 105},
-+ #endif
-+ #ifdef X509_R_PUBLIC_KEY_DECODE_ERROR
-+ {"PUBLIC_KEY_DECODE_ERROR", ERR_LIB_X509, X509_R_PUBLIC_KEY_DECODE_ERROR},
-+ #else
-+ {"PUBLIC_KEY_DECODE_ERROR", ERR_LIB_X509, 125},
-+ #endif
-+ #ifdef X509_R_PUBLIC_KEY_ENCODE_ERROR
-+ {"PUBLIC_KEY_ENCODE_ERROR", ERR_LIB_X509, X509_R_PUBLIC_KEY_ENCODE_ERROR},
-+ #else
-+ {"PUBLIC_KEY_ENCODE_ERROR", ERR_LIB_X509, 126},
-+ #endif
-+ #ifdef X509_R_SHOULD_RETRY
-+ {"SHOULD_RETRY", ERR_LIB_X509, X509_R_SHOULD_RETRY},
-+ #else
-+ {"SHOULD_RETRY", ERR_LIB_X509, 106},
-+ #endif
-+ #ifdef X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN
-+ {"UNABLE_TO_FIND_PARAMETERS_IN_CHAIN", ERR_LIB_X509, X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN},
-+ #else
-+ {"UNABLE_TO_FIND_PARAMETERS_IN_CHAIN", ERR_LIB_X509, 107},
-+ #endif
-+ #ifdef X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY
-+ {"UNABLE_TO_GET_CERTS_PUBLIC_KEY", ERR_LIB_X509, X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY},
-+ #else
-+ {"UNABLE_TO_GET_CERTS_PUBLIC_KEY", ERR_LIB_X509, 108},
-+ #endif
-+ #ifdef X509_R_UNKNOWN_KEY_TYPE
-+ {"UNKNOWN_KEY_TYPE", ERR_LIB_X509, X509_R_UNKNOWN_KEY_TYPE},
-+ #else
-+ {"UNKNOWN_KEY_TYPE", ERR_LIB_X509, 117},
-+ #endif
-+ #ifdef X509_R_UNKNOWN_NID
-+ {"UNKNOWN_NID", ERR_LIB_X509, X509_R_UNKNOWN_NID},
-+ #else
-+ {"UNKNOWN_NID", ERR_LIB_X509, 109},
-+ #endif
-+ #ifdef X509_R_UNKNOWN_PURPOSE_ID
-+ {"UNKNOWN_PURPOSE_ID", ERR_LIB_X509, X509_R_UNKNOWN_PURPOSE_ID},
-+ #else
-+ {"UNKNOWN_PURPOSE_ID", ERR_LIB_X509, 121},
-+ #endif
-+ #ifdef X509_R_UNKNOWN_TRUST_ID
-+ {"UNKNOWN_TRUST_ID", ERR_LIB_X509, X509_R_UNKNOWN_TRUST_ID},
-+ #else
-+ {"UNKNOWN_TRUST_ID", ERR_LIB_X509, 120},
-+ #endif
-+ #ifdef X509_R_UNSUPPORTED_ALGORITHM
-+ {"UNSUPPORTED_ALGORITHM", ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM},
-+ #else
-+ {"UNSUPPORTED_ALGORITHM", ERR_LIB_X509, 111},
-+ #endif
-+ #ifdef X509_R_WRONG_LOOKUP_TYPE
-+ {"WRONG_LOOKUP_TYPE", ERR_LIB_X509, X509_R_WRONG_LOOKUP_TYPE},
-+ #else
-+ {"WRONG_LOOKUP_TYPE", ERR_LIB_X509, 112},
-+ #endif
-+ #ifdef X509_R_WRONG_TYPE
-+ {"WRONG_TYPE", ERR_LIB_X509, X509_R_WRONG_TYPE},
-+ #else
-+ {"WRONG_TYPE", ERR_LIB_X509, 122},
-+ #endif
-+ { NULL }
-+};
-diff --git a/setup.py b/setup.py
-index 716f08e..3485694 100644
---- a/setup.py
-+++ b/setup.py
-@@ -826,10 +826,10 @@ class PyBuildExt(build_ext):
- for line in incfile:
- m = openssl_ver_re.match(line)
- if m:
-- openssl_ver = eval(m.group(1))
-+ openssl_ver = int(m.group(1), 16)
-+ break
- except IOError, msg:
- print "IOError while reading opensshv.h:", msg
-- pass
-
- min_openssl_ver = 0x00907000
- have_any_openssl = ssl_incs is not None and ssl_libs is not None
diff --git a/dev-lang/python/files/python-2.7.5-tlssni.patch b/dev-lang/python/files/python-2.7.5-tlssni.patch
deleted file mode 100644
index cbd23ef..0000000
--- a/dev-lang/python/files/python-2.7.5-tlssni.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From 2c31c42616ef2f8606a49d4912b2e68f821d8367 Mon Sep 17 00:00:00 2001
-From: W-Mark Kubacki <[email protected]>
-Date: Wed, 23 Apr 2014 14:15:23 +0200
-Subject: [PATCH 1/5] TLS SNI support
-
----
- Lib/ftplib.py | 8 ++++++--
- Lib/httplib.py | 4 +++-
- Lib/poplib.py | 4 +++-
- Lib/smtplib.py | 8 ++++++--
- Lib/ssl.py | 10 ++++++++--
- Modules/_ssl.c | 19 ++++++++++++++-----
- 6 files changed, 40 insertions(+), 13 deletions(-)
-
-diff --git a/Lib/ftplib.py b/Lib/ftplib.py
-index c98290c..5b1c963 100644
---- a/Lib/ftplib.py
-+++ b/Lib/ftplib.py
-@@ -660,8 +660,10 @@ else:
- resp = self.voidcmd('AUTH TLS')
- else:
- resp = self.voidcmd('AUTH SSL')
-+ server_hostname = self.host if ssl.HAS_SNI else None
- self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile,
-- ssl_version=self.ssl_version)
-+ ssl_version=self.ssl_version,
-+ server_hostname=server_hostname)
- self.file = self.sock.makefile(mode='rb')
- return resp
-
-@@ -692,8 +694,10 @@ else:
- def ntransfercmd(self, cmd, rest=None):
- conn, size = FTP.ntransfercmd(self, cmd, rest)
- if self._prot_p:
-+ server_hostname = self.host if ssl.HAS_SNI else None
- conn = ssl.wrap_socket(conn, self.keyfile, self.certfile,
-- ssl_version=self.ssl_version)
-+ ssl_version=self.ssl_version,
-+ server_hostname=server_hostname)
- return conn, size
-
- def retrbinary(self, cmd, callback, blocksize=8192, rest=None):
-diff --git a/Lib/httplib.py b/Lib/httplib.py
-index 5c919d2..c51d4af 100644
---- a/Lib/httplib.py
-+++ b/Lib/httplib.py
-@@ -1173,7 +1173,9 @@ else:
- if self._tunnel_host:
- self.sock = sock
- self._tunnel()
-- self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)
-+ server_hostname = self.host if ssl.HAS_SNI else None
-+ self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-+ server_hostname=server_hostname)
-
- __all__.append("HTTPSConnection")
-
-diff --git a/Lib/poplib.py b/Lib/poplib.py
-index dc7cbdf..8031834 100644
---- a/Lib/poplib.py
-+++ b/Lib/poplib.py
-@@ -349,7 +349,9 @@ else:
- if not self.sock:
- raise socket.error, msg
- self.file = self.sock.makefile('rb')
-- self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
-+ server_hostname = self.host if ssl.HAS_SNI else None
-+ self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile,
-+ server_hostname=server_hostname)
- self._debugging = 0
- self.welcome = self._getresp()
-
-diff --git a/Lib/smtplib.py b/Lib/smtplib.py
-index 7f07840..a780bc1 100755
---- a/Lib/smtplib.py
-+++ b/Lib/smtplib.py
-@@ -639,7 +639,9 @@ class SMTP:
- if resp == 220:
- if not _have_ssl:
- raise RuntimeError("No SSL support included in this Python")
-- self.sock = ssl.wrap_socket(self.sock, keyfile, certfile)
-+ server_hostname = self.host if ssl.HAS_SNI else None
-+ self.sock = ssl.wrap_socket(self.sock, keyfile, certfile,
-+ server_hostname=server_hostname)
- self.file = SSLFakeFile(self.sock)
- # RFC 3207:
- # The client MUST discard any knowledge obtained from
-@@ -784,7 +786,9 @@ if _have_ssl:
- if self.debuglevel > 0:
- print>>stderr, 'connect:', (host, port)
- new_socket = socket.create_connection((host, port), timeout)
-- new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile)
-+ server_hostname = self.host if (ssl.HAS_SNI and self.host) else None
-+ new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile,
-+ server_hostname=server_hostname)
- self.file = SSLFakeFile(new_socket)
- return new_socket
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
-index 329b9d1..16d0ce6 100644
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -106,6 +106,7 @@ class SSLSocket(socket):
- def __init__(self, sock, keyfile=None, certfile=None,
- server_side=False, cert_reqs=CERT_NONE,
- ssl_version=PROTOCOL_SSLv23, ca_certs=None,
-+ server_hostname=None,
- do_handshake_on_connect=True,
- suppress_ragged_eofs=True, ciphers=None):
- socket.__init__(self, _sock=sock._sock)
-@@ -138,6 +139,7 @@ class SSLSocket(socket):
- self._sslobj = _ssl.sslwrap(self._sock, server_side,
- keyfile, certfile,
- cert_reqs, ssl_version, ca_certs,
-+ server_hostname,
- ciphers)
- if do_handshake_on_connect:
- self.do_handshake()
-@@ -146,6 +148,7 @@ class SSLSocket(socket):
- self.cert_reqs = cert_reqs
- self.ssl_version = ssl_version
- self.ca_certs = ca_certs
-+ self.server_hostname = server_hostname
- self.ciphers = ciphers
- self.do_handshake_on_connect = do_handshake_on_connect
- self.suppress_ragged_eofs = suppress_ragged_eofs
-@@ -311,7 +314,7 @@ class SSLSocket(socket):
- raise ValueError("attempt to connect already-connected SSLSocket!")
- self._sslobj = _ssl.sslwrap(self._sock, False, self.keyfile, self.certfile,
- self.cert_reqs, self.ssl_version,
-- self.ca_certs, self.ciphers)
-+ self.ca_certs, self.server_hostname, self.ciphers)
- try:
- if return_errno:
- rc = socket.connect_ex(self, addr)
-@@ -352,6 +355,7 @@ class SSLSocket(socket):
- cert_reqs=self.cert_reqs,
- ssl_version=self.ssl_version,
- ca_certs=self.ca_certs,
-+ server_hostname=None,
- ciphers=self.ciphers,
- do_handshake_on_connect=self.do_handshake_on_connect,
- suppress_ragged_eofs=self.suppress_ragged_eofs),
-@@ -376,6 +380,7 @@ class SSLSocket(socket):
- def wrap_socket(sock, keyfile=None, certfile=None,
- server_side=False, cert_reqs=CERT_NONE,
- ssl_version=PROTOCOL_SSLv23, ca_certs=None,
-+ server_hostname=None,
- do_handshake_on_connect=True,
- suppress_ragged_eofs=True, ciphers=None):
-
-@@ -384,6 +389,7 @@ def wrap_socket(sock, keyfile=None, certfile=None,
- ssl_version=ssl_version, ca_certs=ca_certs,
- do_handshake_on_connect=do_handshake_on_connect,
- suppress_ragged_eofs=suppress_ragged_eofs,
-+ server_hostname=server_hostname,
- ciphers=ciphers)
-
-
-@@ -466,7 +472,7 @@ def sslwrap_simple(sock, keyfile=None, certfile=None):
- sock = sock._sock
-
- ssl_sock = _ssl.sslwrap(sock, 0, keyfile, certfile, CERT_NONE,
-- PROTOCOL_SSLv23, None)
-+ PROTOCOL_SSLv23, None, None, None)
- try:
- sock.getpeername()
- except socket_error:
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index ba64555..cd417d0 100644
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -267,7 +267,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
- enum py_ssl_server_or_client socket_type,
- enum py_ssl_cert_requirements certreq,
- enum py_ssl_version proto_version,
-- char *cacerts_file, char *ciphers)
-+ char *cacerts_file, char *server_hostname, char *ciphers)
- {
- PySSLObject *self;
- char *errstr = NULL;
-@@ -386,6 +386,14 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
-
- PySSL_BEGIN_ALLOW_THREADS
- self->ssl = SSL_new(self->ctx); /* New ssl struct */
-+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
-+ /* If SNI isn't supported, we just don't call it and fail silently,
-+ * as there's not much else we can do.
-+ */
-+ if ((socket_type == PY_SSL_CLIENT) &&
-+ (proto_version != PY_SSL_VERSION_SSL2) && server_hostname)
-+ SSL_set_tlsext_host_name(self->ssl, server_hostname);
-+#endif
- PySSL_END_ALLOW_THREADS
- SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */
- #ifdef SSL_MODE_AUTO_RETRY
-@@ -428,15 +436,16 @@ PySSL_sslwrap(PyObject *self, PyObject *args)
- char *key_file = NULL;
- char *cert_file = NULL;
- char *cacerts_file = NULL;
-+ char *server_hostname = NULL;
- char *ciphers = NULL;
-
-- if (!PyArg_ParseTuple(args, "O!i|zziizz:sslwrap",
-+ if (!PyArg_ParseTuple(args, "O!i|zziizzz:sslwrap",
- PySocketModule.Sock_Type,
- &Sock,
- &server_side,
- &key_file, &cert_file,
- &verification_mode, &protocol,
-- &cacerts_file, &ciphers))
-+ &cacerts_file, &server_hostname, &ciphers))
- return NULL;
-
- /*
-@@ -449,13 +458,13 @@ PySSL_sslwrap(PyObject *self, PyObject *args)
-
- return (PyObject *) newPySSLObject(Sock, key_file, cert_file,
- server_side, verification_mode,
-- protocol, cacerts_file,
-+ protocol, cacerts_file, server_hostname,
- ciphers);
- }
-
- PyDoc_STRVAR(ssl_doc,
- "sslwrap(socket, server_side, [keyfile, certfile, certs_mode, protocol,\n"
--" cacertsfile, ciphers]) -> sslobject");
-+" cacertsfile, ciphers, server_hostname]) -> sslobject");
-
- /* SSL object methods */
-
---
-1.9.2
-
diff --git a/dev-lang/python/python-2.6.5-r3.ebuild b/dev-lang/python/python-2.6.5-r3.ebuild
deleted file mode 100644
index efa6787..0000000
--- a/dev-lang/python/python-2.6.5-r3.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 2011 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
-
-MY_P="Python-${PV}"
-
-PATCHSET_REVISION="5"
-
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
- !stackless? ( mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2 )
- stackless? (
- http://binhost.ossdl.de/distfiles/python-${PV}-to-stackless.diff.bz2
- http://binhost.ossdl.de/distfiles/python-stackless-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.lzma
- )"
-
-LICENSE="PSF-2.2"
-SLOT="2.6"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl stackless +threads tk +wide-unicode wininst +xml"
-
-RDEPEND=">=app-admin/eselect-python-20091230
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3 )
- ssl? ( dev-libs/openssl )
- tk? ( >=dev-lang/tk-8.0 )
- xml? ( >=dev-libs/expat-2 )
- )
- doc? ( dev-python/python-docs:${SLOT} )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-admin/python-updater"
-
-PROVIDE="virtual/python"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python_pkg_setup
-
- if use berkdb; then
- ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"
- ewarn "been additionally removed in Python 3. You should use external, still maintained \"bsddb3\""
- ewarn "module provided by dev-python/bsddb3 which supports both Python 2 and Python 3."
- fi
-}
-
-src_prepare() {
- # Stackless
- use stackless && epatch "${WORKDIR}/python-${PV}-to-stackless.diff"
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- if ! tc-is-cross-compiler; then
- test -e "${WORKDIR}/${PV}"/*_all_crosscompile.patch \
- && rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-
- # Avoid regeneration, which would not change contents of files.
- touch Include/Python-ast.h Python/Python-ast.c
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- # Fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
- # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
- [[ "${ARCH}" == "hppa" ]] && sed -e "s/utimes //" -i "${S}/configure"
-
- if ! use wininst; then
- # Remove Microsoft Windows executables.
- rm Lib/distutils/command/wininst-*.exe
- fi
-
- # Fix OtherFileTests.testStdin() not to assume
- # that stdin is a tty for bug #248081.
- sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- # Disable extraneous modules with extra dependencies.
- if use build; then
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- if tc-is-cross-compiler; then
- OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
- ./configure --{build,host}=${CBUILD} || die "cross-configure failed"
- emake python Parser/pgen || die "cross-make failed"
- mv python hostpython
- mv Parser/pgen Parser/hostpgen
- make distclean
- sed -i \
- -e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
- -e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
- Makefile.pre.in || die "sed failed"
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython2.6 correctly.
- # Needed on FreeBSD unless Python 2.6 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- OPT="" econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- $(use stackless && echo "--enable-stacklessfewerregisters") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-libc="" \
- --with-system-ffi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Byte compiling should be enabled here.
- # Otherwise test_import fails.
- python_enable_pyc
-
- # Skip failing tests.
- local skip_tests="distutils httpservers minidom pyexpat sax tcl"
-
- # test_ctypes fails with PAX kernel (bug #234498).
- host-is-pax && skip_tests+=" ctypes"
-
- for test in ${skip_tests}; do
- mv "${S}/Lib/test/test_${test}.py" "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- EXTRATESTOPTS="-w" emake test
- local result="$?"
-
- for test in ${skip_tests}; do
- mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
- done
-
- elog "The following tests have been skipped:"
- for test in ${skip_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}$(python_get_libdir)/test'"
- elog "and run the tests separately."
-
- python_disable_pyc
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
- emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
- python_clean_installation_image -q
-
- mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
- else
- use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
- use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
- use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
- fi
-
- use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
-
- prep_ml_includes $(python_get_includedir)
-
- dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}/Tools" || die "doins failed"
- fi
-
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
-
- # Do not install empty directory.
- rmdir "${ED}$(python_get_libdir)/lib-old"
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- local eselect_python_options
- [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
-
- # Create python2 symlink.
- eselect python update --python2 > /dev/null
-
- eselect python update ${eselect_python_options}
-}
-
-pkg_postinst() {
- eselect_python_update
-
- python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn
- ewarn "\e[1;31m************************************************************************\e[0m"
- ewarn
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should run 'python-updater \${options}' to rebuild Python modules."
- ewarn
- ewarn "\e[1;31m************************************************************************\e[0m"
- ewarn
- ebeep 12
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-
- python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python/python-2.6.6-r1.ebuild b/dev-lang/python/python-2.6.6-r1.ebuild
deleted file mode 100644
index 93b64f8..0000000
--- a/dev-lang/python/python-2.6.6-r1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 2011 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
-
-MY_P="Python-${PV}"
-
-PATCHSET_REVISION="1"
-
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
- mirror://gentoo/python-gentoo-patches-${PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2
- stackless? (
- http://binhost.ossdl.de/distfiles/python-${PV}-to-stackless.diff.lzma
- )"
-
-LICENSE="PSF-2.2"
-SLOT="2.6"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl stackless +threads tk +wide-unicode wininst +xml"
-
-RDEPEND="!!<sys-apps/portage-2.1.9
- >=app-admin/eselect-python-20091230
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3 )
- ssl? ( dev-libs/openssl )
- tk? ( >=dev-lang/tk-8.0 )
- xml? ( >=dev-libs/expat-2 )
- )
- doc? ( dev-python/python-docs:${SLOT} )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-admin/python-updater"
-
-PROVIDE="virtual/python"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python_pkg_setup
-
- if use berkdb; then
- ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"
- ewarn "been additionally removed in Python 3. You should use external, still maintained \"bsddb3\""
- ewarn "module provided by dev-python/bsddb3 which supports both Python 2 and Python 3."
- fi
-}
-
-src_prepare() {
- # Stackless
- use stackless && epatch "${WORKDIR}/python-${PV}-to-stackless.diff"
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- if ! tc-is-cross-compiler; then
- test -e "${WORKDIR}/${PV}"/*_all_crosscompile.patch \
- && rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
-
- # Avoid regeneration, which would not change contents of files.
- touch Include/Python-ast.h Python/Python-ast.c
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- # Fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
- # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
- [[ "${ARCH}" == "hppa" ]] && sed -e "s/utimes //" -i "${S}/configure"
-
- if ! use wininst; then
- # Remove Microsoft Windows executables.
- rm Lib/distutils/command/wininst-*.exe
- fi
-
- # Fix OtherFileTests.testStdin() not to assume
- # that stdin is a tty for bug #248081.
- sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- # Disable extraneous modules with extra dependencies.
- if use build; then
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="__all__ ${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- if tc-is-cross-compiler; then
- OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
- ./configure --{build,host}=${CBUILD} || die "cross-configure failed"
- emake python Parser/pgen || die "cross-make failed"
- mv python hostpython
- mv Parser/pgen Parser/hostpgen
- make distclean
- sed -i \
- -e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
- -e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
- Makefile.pre.in || die "sed failed"
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython2.6 correctly.
- # Needed on FreeBSD unless Python 2.6 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- OPT="" econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- $(use stackless && echo "--enable-stacklessfewerregisters") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-libc="" \
- --with-system-ffi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Byte compiling should be enabled here.
- # Otherwise test_import fails.
- python_enable_pyc
-
- # Skip failing tests.
- local skip_tests="distutils httpservers minidom pyexpat sax tcl __all__"
-
- # test_ctypes fails with PAX kernel (bug #234498).
- host-is-pax && skip_tests+=" ctypes"
-
- for test in ${skip_tests}; do
- mv "${S}/Lib/test/test_${test}.py" "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- EXTRATESTOPTS="-w" emake test
- local result="$?"
-
- for test in ${skip_tests}; do
- mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
- done
-
- elog "The following tests have been skipped:"
- for test in ${skip_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}$(python_get_libdir)/test'"
- elog "and run the tests separately."
-
- python_disable_pyc
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
- emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
- python_clean_installation_image -q
-
- mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
- else
- use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
- use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
- use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
- fi
-
- use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
-
- prep_ml_includes $(python_get_includedir)
-
- dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}/Tools" || die "doins failed"
- fi
-
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
-
- # Do not install empty directory.
- rmdir "${ED}$(python_get_libdir)/lib-old"
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- local eselect_python_options
- [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
-
- # Create python2 symlink.
- eselect python update --python2 > /dev/null
-
- eselect python update ${eselect_python_options}
-}
-
-pkg_postinst() {
- eselect_python_update
-
- python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn
- ewarn "\e[1;31m************************************************************************\e[0m"
- ewarn
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should run 'python-updater \${options}' to rebuild Python modules."
- ewarn
- ewarn "\e[1;31m************************************************************************\e[0m"
- ewarn
- ebeep 12
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-
- python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python/python-2.7.1.ebuild b/dev-lang/python/python-2.7.1.ebuild
deleted file mode 100644
index 3834b1e..0000000
--- a/dev-lang/python/python-2.7.1.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 2011 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
-
-if [[ "${PV}" == *_pre* ]]; then
- inherit subversion
-
- ESVN_PROJECT="python"
- ESVN_REPO_URI="http://svn.python.org/projects/python/branches/release27-maint"
- ESVN_REVISION=""
-else
- MY_PV="${PV%_p*}"
- MY_P="Python-${MY_PV}"
-fi
-
-PATCHSET_REVISION="0"
-
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-if [[ "${PV}" == *_pre* ]]; then
- SRC_URI=""
-else
- SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
- mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
-fi
-SRC_URI="${SRC_URI}
- stackless? (
- http://binhost.ossdl.de/distfiles/python-${PV%_p*}-to-stackless.diff.lzma
- )"
-
-LICENSE="PSF-2.2"
-SLOT="2.7"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl stackless +threads tk +wide-unicode wininst +xml"
-
-RDEPEND=">=app-admin/eselect-python-20091230
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
- ssl? ( dev-libs/openssl )
- tk? ( >=dev-lang/tk-8.0 )
- xml? ( >=dev-libs/expat-2 )
- )
- !!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
- $([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
- dev-util/pkgconfig
- $([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )")
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
- $([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
-PDEPEND="app-admin/python-updater"
-
-PROVIDE="virtual/python"
-
-if [[ "${PV}" != *_pre* ]]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-pkg_setup() {
- python_pkg_setup
-
- if use berkdb; then
- ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python. It has"
- ewarn "been additionally removed in Python 3. You should use external, still maintained \"bsddb3\""
- ewarn "module provided by dev-python/bsddb3 which supports both Python 2 and Python 3."
- fi
-}
-
-src_prepare() {
- # Stackless
- use stackless && epatch "${WORKDIR}/python-${PV}-to-stackless.diff"
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
- if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
- # Update micro version, release level and version string.
- local micro_version="${PV%_pre*}"
- micro_version="${micro_version##*.}"
- local version_string="${PV%.*}.$((${micro_version} - 1))+"
- sed \
- -e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
- -e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
- -e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
- -i Include/patchlevel.h || die "sed failed"
- fi
- fi
-
- local excluded_patches
- if ! tc-is-cross-compiler; then
- test -e "${WORKDIR}/${PV}"/*_all_crosscompile.patch \
- && excluded_patches="*_all_crosscompile.patch"
- fi
-
- local patchset_dir
- if [[ "${PV}" == *_pre* ]]; then
- patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
- else
- patchset_dir="${WORKDIR}/${MY_PV}"
- fi
-
- EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- if ! use wininst; then
- # Remove Microsoft Windows executables.
- rm Lib/distutils/command/wininst-*.exe
- fi
-
- # Fix OtherFileTests.testStdin() not to assume
- # that stdin is a tty for bug #248081.
- sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
-
- # Support versions of Autoconf other than 2.65.
- sed -e "/version_required(2\.65)/d" -i configure.in || die "sed failed"
-
- if [[ "${PV}" == *_pre* ]]; then
- sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed"
- fi
-
- eautoreconf
-}
-
-src_configure() {
- if use build; then
- # Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- if tc-is-cross-compiler; then
- OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
- ./configure --{build,host}=${CBUILD} || die "cross-configure failed"
- emake python Parser/pgen || die "cross-make failed"
- mv python hostpython
- mv Parser/pgen Parser/hostpgen
- make distclean
- sed -i \
- -e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
- -e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
- Makefile.pre.in || die "sed failed"
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython2.7 correctly.
- # Needed on FreeBSD unless Python 2.7 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
- if use berkdb; then
- dbmliborder+="${dbmliborder:+:}bdb"
- fi
-
- OPT="" econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- $(use stackless && echo "--enable-stacklessfewerregisters") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-dbmliborder="${dbmliborder}" \
- --with-libc="" \
- --enable-loadable-sqlite-extensions \
- --with-system-expat \
- --with-system-ffi
-}
-
-src_compile() {
- emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Byte compiling should be enabled here.
- # Otherwise test_import fails.
- python_enable_pyc
-
- # Skip failing tests.
- local skip_tests="distutils gdb minidom pyexpat sax"
-
- # test_ctypes fails with PAX kernel (bug #234498).
- host-is-pax && skip_tests+=" ctypes"
-
- for test in ${skip_tests}; do
- mv "${S}/Lib/test/test_${test}.py" "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- EXTRATESTOPTS="-w" emake test
- local result="$?"
-
- for test in ${skip_tests}; do
- mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
- done
-
- elog "The following tests have been skipped:"
- for test in ${skip_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}$(python_get_libdir)/test'"
- elog "and run the tests separately."
-
- python_disable_pyc
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
- emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
- python_clean_installation_image -q
-
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${ED}$(python_get_libdir)/config/Makefile" || die "sed failed"
-
- mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,idlelib,lib-tk,sqlite3,test}
- else
- use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
- use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,test/test_bsddb*}
- use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
- fi
-
- use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
-
- prep_ml_includes $(python_get_includedir)
-
- dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}/Tools" || die "doins failed"
- fi
-
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
-
- # Do not install empty directories.
- rmdir "${ED}$(python_get_libdir)/lib-old"
- rmdir "${ED}$(python_get_libdir)/test/data"
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show --python${PV%%.*})" ]]; then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn
- ewarn "\e[1;31m************************************************************************\e[0m"
- ewarn
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should run 'python-updater \${options}' to rebuild Python modules."
- ewarn
- ewarn "\e[1;31m************************************************************************\e[0m"
- ewarn
- ebeep 12
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-
- python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python/python-2.7.3-r2.ebuild b/dev-lang/python/python-2.7.3-r2.ebuild
deleted file mode 100644
index 0aa7d14..0000000
--- a/dev-lang/python/python-2.7.3-r2.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Copyright 2012 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
-
-MY_P="Python-${PV}"
-PATCHSET_REVISION="1"
-
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
- stackless? ( http://binhost.ossdl.de/distfiles/python-${PV%_p*}-to-stackless.patch.lzma )
- mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml stackless"
-
-RDEPEND="app-arch/bzip2
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
- ssl? ( dev-libs/openssl )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- )
- xml? ( >=dev-libs/expat-2.1 )
- )
- !!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.65
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
- doc? ( dev-python/python-docs:${SLOT} )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python_pkg_setup
-
- if use berkdb; then
- ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python."
- ewarn "\"bsddb\" and \"dbhash\" modules have been additionally removed in Python 3."
- ewarn "You should use external, still maintained \"bsddb3\" module provided by dev-python/bsddb3,"
- ewarn "which supports both Python 2 and Python 3."
- else
- if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
- ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb] to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
- ewarn "You might need to migrate your databases."
- fi
- fi
-}
-
-src_prepare() {
- # Stackless
- if use stackless; then
- epatch "${WORKDIR}/python-${PV}-to-stackless.patch"
- fi
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- local excluded_patches
- if ! tc-is-cross-compiler; then
- excluded_patches="*_all_crosscompile.patch"
- fi
-
- EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use build; then
- # Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- if tc-is-cross-compiler; then
- OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
- ./configure --{build,host}=${CBUILD} || die "cross-configure failed"
- emake python Parser/pgen || die "cross-make failed"
- mv python hostpython
- mv Parser/pgen Parser/hostpgen
- make distclean
- sed -i \
- -e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
- -e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
- Makefile.pre.in || die "sed failed"
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython2.7 correctly.
- # Needed on FreeBSD unless Python 2.7 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
- if use berkdb; then
- dbmliborder+="${dbmliborder:+:}bdb"
- fi
-
- OPT="" econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-dbmliborder="${dbmliborder}" \
- --with-libc="" \
- --enable-loadable-sqlite-extensions \
- --with-system-expat \
- --with-system-ffi
-}
-
-src_compile() {
- emake EPYTHON="python${PV%%.*}" || die "emake failed"
-
- # Work around bug 329499. See also bug 413751.
- pax-mark m python
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Byte compiling should be enabled here.
- # Otherwise test_import fails.
- python_enable_pyc
-
- # Skip failing tests.
- local skipped_tests="distutils gdb"
-
- for test in ${skipped_tests}; do
- mv Lib/test/test_${test}.py "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- emake test EXTRATESTOPTS="-w" < /dev/tty
- local result="$?"
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}$(python_get_libdir)/test'"
- elog "and run the tests separately."
-
- python_disable_pyc
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
- emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
- python_clean_installation_image -q
-
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${ED}$(python_get_libdir)/config/Makefile" || die "sed failed"
-
- mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
- else
- use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
- use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,test/test_bsddb*}
- use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
- fi
-
- use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
- use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
-
- dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r Tools || die "doins failed"
- fi
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${SLOT}:" \
- -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- [[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/"
-
- if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should switch active version of Python ${PV%%.*} and run"
- ewarn "'python-updater [options]' to rebuild Python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-
- python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python/python-2.7.5-r1.ebuild b/dev-lang/python/python-2.7.5-r1.ebuild
deleted file mode 100644
index 60ae850..0000000
--- a/dev-lang/python/python-2.7.5-r1.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Copyright 2013 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_REVISION="0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- stackless? ( http://binhost.ossdl.de/distfiles/python-${PV%_p*}-to-stackless.patch.xz )
- mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml stackless"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:5.3
- sys-libs/db:5.2
- sys-libs/db:5.1
- sys-libs/db:5.0
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
- ssl? ( dev-libs/openssl )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- )
- xml? ( >=dev-libs/expat-2.1 )
- )
- !!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.65
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
- doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-admin/eselect-python
- app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use berkdb; then
- ewarn "'bsddb' module is out-of-date and no longer maintained inside"
- ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
- ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
- ewarn "is provided by dev-python/bsddb3."
- else
- if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
- ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
- ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
- ewarn "You might need to migrate your databases."
- fi
- fi
-}
-
-src_prepare() {
- if use stackless; then
- epatch "${WORKDIR}/python-${PV}-to-stackless.patch"
- fi
- epatch "${FILESDIR}/${P}-tlssni.patch" # Python issue 5639
- epatch "${FILESDIR}/${P}-tls1.1-and-tls1.2.patch" # Python issue 16692
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat || die
- rm -r Modules/_ctypes/libffi* || die
- rm -r Modules/zlib || die
-
- local excluded_patches
- if ! tc-is-cross-compiler; then
- excluded_patches="*_all_crosscompile.patch"
- fi
-
- EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
-
- epatch "${FILESDIR}/${P}-library-path.patch" #474882
- epatch "${FILESDIR}/${P}-re_unsigned_ptrdiff.patch" #476426
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- epatch_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use build; then
- # Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # Run the configure scripts in parallel.
- multijob_init
-
- mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
-
- if tc-is-cross-compiler; then
- (
- multijob_child_init
- cd "${WORKDIR}"/${CBUILD} >/dev/null
- OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
- "${S}"/configure \
- --{build,host}=${CBUILD} \
- || die "cross-configure failed"
- ) &
- multijob_post_fork
-
- # The configure script assumes it's buggy when cross-compiling.
- export ac_cv_buggy_getaddrinfo=no
- export ac_cv_have_long_long_format=yes
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
- # The configure script fails to use pkg-config correctly.
- # http://bugs.python.org/issue15506
- export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
- # Set LDFLAGS so we link modules with -lpython2.7 correctly.
- # Needed on FreeBSD unless Python 2.7 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
- if use berkdb; then
- dbmliborder+="${dbmliborder:+:}bdb"
- fi
-
- cd "${WORKDIR}"/${CHOST}
- ECONF_SOURCE="${S}" OPT="" \
- econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-dbmliborder="${dbmliborder}" \
- --with-libc="" \
- --enable-loadable-sqlite-extensions \
- --with-system-expat \
- --with-system-ffi
-
- if tc-is-cross-compiler; then
- # Modify the Makefile.pre so we don't regen for the host/ one.
- # We need to link the host python programs into $PWD and run
- # them from here because the distutils sysconfig module will
- # parse Makefile/etc... from argv[0], and we need it to pick
- # up the target settings, not the host ones.
- sed -i \
- -e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
- -e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
- -e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
- Makefile{.pre,} || die "sed failed"
- fi
-
- multijob_finish
-}
-
-src_compile() {
- if tc-is-cross-compiler; then
- cd "${WORKDIR}"/${CBUILD}
- # Disable as many modules as possible -- but we need a few to install.
- PYTHON_DISABLE_MODULES=$(
- sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
- egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
- ) \
- PTHON_DISABLE_SSL="1" \
- SYSROOT= \
- emake
- # See comment in src_configure about these.
- ln python ../${CHOST}/hostpython || die
- ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
- ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
- fi
-
- cd "${WORKDIR}"/${CHOST}
- default
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- cd "${WORKDIR}"/${CHOST}
-
- # Skip failing tests.
- local skipped_tests="distutils gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- emake test EXTRATESTOPTS="-w" < /dev/tty
- local result="$?"
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
- elog "and run the tests separately."
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
- cd "${WORKDIR}"/${CHOST}
- emake DESTDIR="${D}" altinstall
-
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
- # Backwards compat with Gentoo divergence.
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
- else
- use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
- use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
- fi
-
- use threads || rm -r "${libdir}/multiprocessing" || die
- use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}"/Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${SLOT}:" \
- -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
- # for python-exec
- python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local PYTHON=./python \
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
- export LD_LIBRARY_PATH
- fi
-
- echo "EPYTHON='${EPYTHON}'" > epython.py
- python_domodule epython.py
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should switch active version of Python ${PV%%.*} and run"
- ewarn "'python-updater [options]' to rebuild Python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.5-r3.ebuild b/dev-lang/python/python-2.7.5-r3.ebuild
deleted file mode 100644
index 704dbb8..0000000
--- a/dev-lang/python/python-2.7.5-r3.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Copyright 2013 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_REVISION="0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- stackless? ( http://binhost.ossdl.de/distfiles/python-${PV%_p*}-to-stackless.patch.xz )
- mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml stackless"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:5.3
- sys-libs/db:5.2
- sys-libs/db:5.1
- sys-libs/db:5.0
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
- ssl? ( dev-libs/openssl )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- )
- xml? ( >=dev-libs/expat-2.1 )
- )
- !!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.65
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
- doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-admin/eselect-python
- app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use berkdb; then
- ewarn "'bsddb' module is out-of-date and no longer maintained inside"
- ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
- ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
- ewarn "is provided by dev-python/bsddb3."
- else
- if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
- ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
- ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
- ewarn "You might need to migrate your databases."
- fi
- fi
-}
-
-src_prepare() {
- if use stackless; then
- epatch "${WORKDIR}/python-${PV}-to-stackless.patch"
- fi
- epatch "${FILESDIR}/${P}-tlssni.patch" # Python issue 5639
- epatch "${FILESDIR}/${P}-tls1.1-and-tls1.2.patch" # Python issue 16692
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat || die
- rm -r Modules/_ctypes/libffi* || die
- rm -r Modules/zlib || die
-
- if tc-is-cross-compiler; then
- local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
-
- epatch "${FILESDIR}/${P}-library-path.patch" #474882
- epatch "${FILESDIR}/${P}-re_unsigned_ptrdiff.patch" #476426
- epatch "${FILESDIR}/CVE-2013-4238_py27.patch"
- epatch "${FILESDIR}/python-2.7-issue16248.patch"
-
- # Fix for cross-compiling.
- epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- epatch_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use build; then
- # Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
- # The configure script fails to use pkg-config correctly.
- # http://bugs.python.org/issue15506
- export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
- # Set LDFLAGS so we link modules with -lpython2.7 correctly.
- # Needed on FreeBSD unless Python 2.7 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
- if use berkdb; then
- dbmliborder+="${dbmliborder:+:}bdb"
- fi
-
- BUILD_DIR="${WORKDIR}/${CHOST}"
- mkdir -p "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- ECONF_SOURCE="${S}" OPT="" \
- econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-dbmliborder="${dbmliborder}" \
- --with-libc="" \
- --enable-loadable-sqlite-extensions \
- --with-system-expat \
- --with-system-ffi
-}
-
-src_compile() {
- # Avoid invoking pgen for cross-compiles.
- touch Include/graminit.h Python/graminit.c
-
- cd "${BUILD_DIR}" || die
- emake
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- cd "${BUILD_DIR}" || die
-
- # Skip failing tests.
- local skipped_tests="distutils gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- emake test EXTRATESTOPTS="-w" < /dev/tty
- local result="$?"
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
- elog "and run the tests separately."
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
- cd "${BUILD_DIR}" || die
- emake DESTDIR="${D}" altinstall
-
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
- # Backwards compat with Gentoo divergence.
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
- else
- use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
- use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
- fi
-
- use threads || rm -r "${libdir}/multiprocessing" || die
- use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}"/Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${SLOT}:" \
- -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
- # for python-exec
- python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local PYTHON=./python
- local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
- fi
-
- echo "EPYTHON='${EPYTHON}'" > epython.py
- python_domodule epython.py
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should switch active version of Python ${PV%%.*} and run"
- ewarn "'python-updater [options]' to rebuild Python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.5.ebuild b/dev-lang/python/python-2.7.5.ebuild
deleted file mode 100644
index 9ddec7f..0000000
--- a/dev-lang/python/python-2.7.5.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Copyright 2013 W-Mark Kubacki
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_REVISION="0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- stackless? ( http://binhost.ossdl.de/distfiles/python-${PV%_p*}-to-stackless.patch.xz )
- mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml stackless"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- berkdb? ( || (
- sys-libs/db:5.3
- sys-libs/db:5.2
- sys-libs/db:5.1
- sys-libs/db:5.0
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
- ssl? ( dev-libs/openssl )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- )
- xml? ( >=dev-libs/expat-2.1 )
- )
- !!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.65
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
- doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-admin/eselect-python
- app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use berkdb; then
- ewarn "'bsddb' module is out-of-date and no longer maintained inside"
- ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
- ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
- ewarn "is provided by dev-python/bsddb3."
- else
- if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
- ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
- ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
- ewarn "You might need to migrate your databases."
- fi
- fi
-}
-
-src_prepare() {
- if use stackless; then
- epatch "${WORKDIR}/python-${PV}-to-stackless.patch"
- fi
- epatch "${FILESDIR}/${P}-tlssni.patch" # Python issue 5639
- epatch "${FILESDIR}/${P}-tls1.1-and-tls1.2.patch" # Python issue 16692
-
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat || die
- rm -r Modules/_ctypes/libffi* || die
- rm -r Modules/zlib || die
-
- local excluded_patches
- if ! tc-is-cross-compiler; then
- excluded_patches="*_all_crosscompile.patch"
- fi
-
- EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
-
- epatch "${FILESDIR}/${P}-library-path.patch" #474882
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- epatch_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use build; then
- # Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # Run the configure scripts in parallel.
- multijob_init
-
- mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
-
- if tc-is-cross-compiler; then
- (
- multijob_child_init
- cd "${WORKDIR}"/${CBUILD} >/dev/null
- OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
- "${S}"/configure \
- --{build,host}=${CBUILD} \
- || die "cross-configure failed"
- ) &
- multijob_post_fork
-
- # The configure script assumes it's buggy when cross-compiling.
- export ac_cv_buggy_getaddrinfo=no
- export ac_cv_have_long_long_format=yes
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
- # The configure script fails to use pkg-config correctly.
- # http://bugs.python.org/issue15506
- export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
- # Set LDFLAGS so we link modules with -lpython2.7 correctly.
- # Needed on FreeBSD unless Python 2.7 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
- if use berkdb; then
- dbmliborder+="${dbmliborder:+:}bdb"
- fi
-
- cd "${WORKDIR}"/${CHOST}
- ECONF_SOURCE="${S}" OPT="" \
- econf \
- --with-fpectl \
- --enable-shared \
- $(use_enable ipv6) \
- $(use_with threads) \
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
- --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --with-dbmliborder="${dbmliborder}" \
- --with-libc="" \
- --enable-loadable-sqlite-extensions \
- --with-system-expat \
- --with-system-ffi
-
- if tc-is-cross-compiler; then
- # Modify the Makefile.pre so we don't regen for the host/ one.
- # We need to link the host python programs into $PWD and run
- # them from here because the distutils sysconfig module will
- # parse Makefile/etc... from argv[0], and we need it to pick
- # up the target settings, not the host ones.
- sed -i \
- -e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
- -e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
- -e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
- Makefile{.pre,} || die "sed failed"
- fi
-
- multijob_finish
-}
-
-src_compile() {
- if tc-is-cross-compiler; then
- cd "${WORKDIR}"/${CBUILD}
- # Disable as many modules as possible -- but we need a few to install.
- PYTHON_DISABLE_MODULES=$(
- sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
- egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
- ) \
- PTHON_DISABLE_SSL="1" \
- SYSROOT= \
- emake
- # See comment in src_configure about these.
- ln python ../${CHOST}/hostpython || die
- ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
- ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
- fi
-
- cd "${WORKDIR}"/${CHOST}
- default
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- cd "${WORKDIR}"/${CHOST}
-
- # Skip failing tests.
- local skipped_tests="distutils gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # Rerun failed tests in verbose mode (regrtest -w).
- emake test EXTRATESTOPTS="-w" < /dev/tty
- local result="$?"
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
- elog "and run the tests separately."
-
- if [[ "${result}" -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
- cd "${WORKDIR}"/${CHOST}
- emake DESTDIR="${D}" altinstall
-
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
- # Backwards compat with Gentoo divergence.
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
- # Fix collisions between different slots of Python.
- mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
- mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
- mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
- rm -f "${ED}usr/bin/smtpd.py"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
- else
- use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
- use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
- fi
-
- use threads || rm -r "${libdir}/multiprocessing" || die
- use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}"/Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${SLOT}:" \
- -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
- # for python-exec
- python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local PYTHON=./python \
- LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
- export LD_LIBRARY_PATH
- fi
-
- echo "EPYTHON='${EPYTHON}'" > epython.py
- python_domodule epython.py
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn "You should switch active version of Python ${PV%%.*} and run"
- ewarn "'python-updater [options]' to rebuild Python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.6.ebuild b/dev-lang/python/python-2.7.9.ebuild
similarity index 91%
rename from dev-lang/python/python-2.7.6.ebuild
rename to dev-lang/python/python-2.7.9.ebuild
index c39fe1a..e72d6dd 100644
--- a/dev-lang/python/python-2.7.6.ebuild
+++ b/dev-lang/python/python-2.7.9.ebuild
@@ -1,368 +1,360 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Copyright 2013 W-Mark Kubacki
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
WANT_AUTOMAKE="none"
WANT_LIBTOOL="none"
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
MY_P="Python-${PV}"
-PATCHSET_REVISION="1"
+PATCHSET_VERSION="2.7.9-0"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="http://www.python.org/"
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- stackless? ( http://binhost.ossdl.de/distfiles/python-2.7.5-to-stackless.patch.xz )
- mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz
- http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz"
+ http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml stackless"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
# run the bootstrap code on your dev box and include the results in the
# patchset. See bug 447752.
RDEPEND="app-arch/bzip2
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
!build? (
berkdb? ( || (
sys-libs/db:5.3
sys-libs/db:5.2
sys-libs/db:5.1
sys-libs/db:5.0
sys-libs/db:4.8
sys-libs/db:4.7
sys-libs/db:4.6
sys-libs/db:4.5
sys-libs/db:4.4
sys-libs/db:4.3
sys-libs/db:4.2
) )
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
>=sys-libs/ncurses-5.2
readline? ( >=sys-libs/readline-4.1 )
)
sqlite? ( >=dev-db/sqlite-3.3.8:3 )
ssl? ( dev-libs/openssl )
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
+ dev-tcltk/tix
)
xml? ( >=dev-libs/expat-2.1 )
)
!!<sys-apps/portage-2.1.9"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/autoconf-2.65
!sys-devel/gcc[libffi]"
RDEPEND+=" !build? ( app-misc/mime-types )
doc? ( dev-python/python-docs:${SLOT} )"
PDEPEND="app-admin/eselect-python
app-admin/python-updater"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
if use berkdb; then
ewarn "'bsddb' module is out-of-date and no longer maintained inside"
ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
ewarn "is provided by dev-python/bsddb3."
else
if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
ewarn "You might need to migrate your databases."
fi
fi
}
src_prepare() {
- if use stackless; then
- epatch "${WORKDIR}/python-2.7.5-to-stackless.patch"
- fi
- epatch "${FILESDIR}/${PN}-2.7.5-tlssni.patch" # Python issue 5639
- epatch "${FILESDIR}/${PN}-2.7.5-tls1.1-and-tls1.2.patch" # Python issue 16692
-
- epatch "${FILESDIR}/${PN}-2.7-01-Always-disable-SSLv2-except-when-PROTOCOL_SSLv2-is-e.patch"
- epatch "${FILESDIR}/${PN}-2.7-02-Use-stronger-ciphers-by-default.patch"
- epatch "${FILESDIR}/${PN}-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch"
+ epatch "${FILESDIR}/${PN}-2.7-02-Use-stronger-ciphers-by-default.patch"
+ epatch "${FILESDIR}/${PN}-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch"
# Ensure that internal copies of expat, libffi and zlib are not used.
rm -r Modules/expat || die
rm -r Modules/_ctypes/libffi* || die
rm -r Modules/zlib || die
if tc-is-cross-compiler; then
local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
fi
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
# Fix for cross-compiling.
epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \
Lib/distutils/sysconfig.py \
Lib/site.py \
Lib/sysconfig.py \
Lib/test/test_site.py \
Makefile.pre.in \
Modules/Setup.dist \
Modules/getpath.c \
setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
epatch_user
eautoconf
eautoheader
}
src_configure() {
if use build; then
# Disable extraneous modules with extra dependencies.
export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
export PYTHON_DISABLE_SSL="1"
else
# dbm module can be linked against berkdb or gdbm.
# Defaults to gdbm when both are enabled, #204343.
local disable
use berkdb || use gdbm || disable+=" dbm"
use berkdb || disable+=" _bsddb"
use gdbm || disable+=" gdbm"
use ncurses || disable+=" _curses _curses_panel"
use readline || disable+=" readline"
use sqlite || disable+=" _sqlite3"
use ssl || export PYTHON_DISABLE_SSL="1"
use tk || disable+=" _tkinter"
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
export PYTHON_DISABLE_MODULES="${disable}"
if ! use xml; then
ewarn "You have configured Python without XML support."
ewarn "This is NOT a recommended configuration as you"
ewarn "may face problems parsing any XML documents."
fi
fi
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
filter-flags -malign-double
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
# https://bugs.gentoo.org/show_bug.cgi?id=50309
if is-flagq -O3; then
is-flagq -fstack-protector-all && replace-flags -O3 -O2
use hardened && replace-flags -O3 -O2
fi
if tc-is-cross-compiler; then
# Force some tests that try to poke fs paths.
export ac_cv_file__dev_ptc=no
export ac_cv_file__dev_ptmx=yes
fi
# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
tc-export CXX
# The configure script fails to use pkg-config correctly.
# http://bugs.python.org/issue15506
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
# Set LDFLAGS so we link modules with -lpython2.7 correctly.
# Needed on FreeBSD unless Python 2.7 is already installed.
# Please query BSD team before removing this!
append-ldflags "-L."
local dbmliborder
if use gdbm; then
dbmliborder+="${dbmliborder:+:}gdbm"
fi
if use berkdb; then
dbmliborder+="${dbmliborder:+:}bdb"
fi
BUILD_DIR="${WORKDIR}/${CHOST}"
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
ECONF_SOURCE="${S}" OPT="" \
econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
+ --with-pip \
$(use_with threads) \
$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
--with-dbmliborder="${dbmliborder}" \
--with-libc="" \
--enable-loadable-sqlite-extensions \
--with-system-expat \
--with-system-ffi
if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
eerror "configure has detected that the sem_open function is broken."
eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
die "Broken sem_open function (bug 496328)"
fi
}
src_compile() {
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c
cd "${BUILD_DIR}" || die
emake
# Work around bug 329499. See also bug 413751 and 457194.
if has_version dev-libs/libffi[pax_kernel]; then
pax-mark E python
else
pax-mark m python
fi
}
src_test() {
# Tests will not work when cross compiling.
if tc-is-cross-compiler; then
elog "Disabling tests due to crosscompiling."
return
fi
cd "${BUILD_DIR}" || die
# Skip failing tests.
local skipped_tests="distutils gdb"
for test in ${skipped_tests}; do
mv "${S}"/Lib/test/test_${test}.py "${T}"
done
# Rerun failed tests in verbose mode (regrtest -w).
emake test EXTRATESTOPTS="-w" < /dev/tty
local result="$?"
for test in ${skipped_tests}; do
mv "${T}/test_${test}.py" "${S}"/Lib/test
done
elog "The following tests have been skipped:"
for test in ${skipped_tests}; do
elog "test_${test}.py"
done
elog "If you would like to run them, you may:"
elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
elog "and run the tests separately."
if [[ "${result}" -ne 0 ]]; then
die "emake test failed"
fi
}
src_install() {
local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
cd "${BUILD_DIR}" || die
emake DESTDIR="${D}" altinstall
sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
# Backwards compat with Gentoo divergence.
dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
# Fix collisions between different slots of Python.
mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
rm -f "${ED}usr/bin/smtpd.py"
if use build; then
rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
else
use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
fi
use threads || rm -r "${libdir}/multiprocessing" || die
use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r "${S}"/Tools
fi
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
emake --no-print-directory -s -f - 2>/dev/null)
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
sed \
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-e "s:@PYDOC@:pydoc${SLOT}:" \
-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
# for python-exec
python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
local PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
fi
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
}
pkg_preinst() {
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
python_updater_warning="1"
fi
}
eselect_python_update() {
if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
eselect python update
fi
if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
eselect python update --python${PV%%.*}
fi
}
pkg_postinst() {
eselect_python_update
if [[ "${python_updater_warning}" == "1" ]]; then
ewarn "You have just upgraded from an older version of Python."
ewarn "You should switch active version of Python ${PV%%.*} and run"
ewarn "'python-updater [options]' to rebuild Python modules."
fi
}
pkg_postrm() {
eselect_python_update
}
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.