Add bits and people to the list of https domains.
Add debian-ports.org to the list of Debian zones.
Add buildd to the list of debian-ports.org https domains.
Sync the exclusion patterns in Debian-self-signed.xml with Debian.xml
---
src/chrome/content/rules/Debian-self-signed.xml | 4 ++--
src/chrome/content/rules/Debian.xml | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/chrome/content/rules/Debian-self-signed.xml
b/src/chrome/content/rules/Debian-self-signed.xml
index 8800764..8698c5f 100644
--- a/src/chrome/content/rules/Debian-self-signed.xml
+++ b/src/chrome/content/rules/Debian-self-signed.xml
@@ -13,11 +13,11 @@
<!--
Nonfunctional:
-->
- <!--exclusion
pattern="^http://(ca|incoming|people|popcon|search)\.debian\.org/" /-->
+ <!--exclusion
pattern="^http://(ca|incoming|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|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/"
/-->
+ <!--exclusion
pattern="^http://((?:anonscm|(?:[^/:@]+\.)?alioth|arch|bits|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lintian|lists|munin|nagios|nm|openstack\.bm|packages|people|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\.debian\.net/";
diff --git a/src/chrome/content/rules/Debian.xml
b/src/chrome/content/rules/Debian.xml
index 9a86b44..746f696 100644
--- a/src/chrome/content/rules/Debian.xml
+++ b/src/chrome/content/rules/Debian.xml
@@ -20,8 +20,6 @@
- ftp.de ¹
- incoming (shows ftp-master; mismatched, CN:
ftp-master.debian.org)
- manpages ¹
- - people (reset; people.debian.org/~joerg/ is
displayed
- after fetching gpg.ganneff.de over
http...)
- popcon ¹
- search (shows www; mismatched, CN: debian.org)
- snapshot ¹
@@ -87,12 +85,13 @@
<target host="debian.org" />
<target host="*.debian.org" />
<target host="*.debian.net" />
+ <target host="*.debian-ports.org" />
<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|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://((?:anonscm|(?:[^/:@]+\.)?alioth|arch|bits|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lintian|lists|munin|nagios|nm|openstack\.bm|packages|people|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://security\.debian\.org/+(?=$|\?)"
@@ -100,4 +99,7 @@
<rule from="^http://(france|paste|screenshots)\.debian\.net/"
to="https://$1.debian.net/"; />
+
+ <rule from="^http://(buildd)\.debian-ports\.org/"
+ to="https://$1.debian-ports.org/"; />
</ruleset>
--
2.1.1
