Merged this. I assume the previous few debian patches you sent out are redundant?
On 07/23/2014 08:54 AM, Paul Wise wrote: > --- > src/chrome/content/rules/Debian-self-signed.xml | 4 ++-- > src/chrome/content/rules/Debian.xml | 4 +--- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/src/chrome/content/rules/Debian-self-signed.xml > b/src/chrome/content/rules/Debian-self-signed.xml > index ccfc283..b39b00c 100644 > --- a/src/chrome/content/rules/Debian-self-signed.xml > +++ b/src/chrome/content/rules/Debian-self-signed.xml > @@ -15,11 +15,11 @@ > <!-- > Nonfunctional: > --> > - <!--exclusion > pattern="^http://(ca|incoming|people|popcon|qa|packages.qa|search)\.debian\.org/" > /--> > + <!--exclusion > pattern="^http://(ca|incoming|people|popcon|search)\.debian\.org/" /--> > <!-- > Handled in Debian.xml: > --> > - <!--exclusion > pattern="^http://(anonscm|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lists|munin|nagios|nm|openstack.bm|packages|piuparts|puppet-dashboard|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|udd|vote|wiki|www)\.debian\.org/" > /--> > + <!--exclusion > pattern="^http://(anonscm|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lintian|lists|munin|nagios|nm|openstack.bm|packages|piuparts|puppet-dashboard|(?:-packages\.)?qa|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|tracker,udd|vote|wiki|www)\.debian\.org/" > /--> > > > <rule from="^http://(mentors|paste)\.debian\.net/" > diff --git a/src/chrome/content/rules/Debian.xml > b/src/chrome/content/rules/Debian.xml > index 1844f21..e675fe9 100644 > --- a/src/chrome/content/rules/Debian.xml > +++ b/src/chrome/content/rules/Debian.xml > @@ -16,8 +16,6 @@ > - people (reset; people.debian.org/~joerg/ is > displayed > after fetching gpg.ganneff.de over > http...) > - popcon ¹ > - - qa ¹ > - - packages.qa ¹ > - search (shows www; mismatched, CN: debian.org) > > ¹ Refused > @@ -81,7 +79,7 @@ > <securecookie host="^nm\.debian\.org$" name=".+" /> > > > - <rule > from="^http://((?:anonscm|(?:[^/:@]+\.)?alioth|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lists|munin|nagios|nm|openstack\.bm|packages|piuparts|puppet-dashboard|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|udd|vote|wiki|www)\.)?debian\.org/" > + <rule > from="^http://((?:anonscm|(?:[^/:@]+\.)?alioth|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lintian|lists|munin|nagios|nm|openstack\.bm|packages|piuparts|puppet-dashboard|(?:packages\.)?qa|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|tracker|udd|vote|wiki|www)\.)?debian\.org/" > to="https://$1debian.org/"; /> > > <rule from="^http://(france|screenshots)\.debian\.net/" > -- Yan Zhu <[email protected]>, <[email protected]> Staff Technologist Electronic Frontier Foundation https://www.eff.org 815 Eddy Street, San Francisco, CA 94109 +1 415 436 9333 x134
signature.asc
Description: OpenPGP digital signature
