Author: Seth Schoen <[email protected]> Date: Sun, 31 Oct 2010 01:30:22 -0700 Subject: convert DOS-style \r\n line terminators to Unix-style \n Commit: cff2213c096558465f0b42ad470447ad7538b9e1
--- pending-rules/Adobe.xml | 6 +++--- pending-rules/BinSearch.xml | 6 +++--- pending-rules/CaceTech.xml | 6 +++--- pending-rules/DVDFab.xml | 6 +++--- pending-rules/EZTV.xml | 8 ++++---- pending-rules/EzineArticles.xml | 8 ++++---- pending-rules/FFMPEG.xml | 6 +++--- pending-rules/GetFirebug.xml | 6 +++--- pending-rules/GoDaddy.xml | 10 +++++----- pending-rules/MapQuest.xml | 12 ++++++------ pending-rules/Match.xml | 6 +++--- pending-rules/MyPoints.xml | 6 +++--- pending-rules/Open-Mesh.xml | 8 ++++---- pending-rules/OzBargain.xml | 6 +++--- pending-rules/PCCaseGear.xml | 6 +++--- pending-rules/Pandora.xml | 6 +++--- pending-rules/PirateBay.xml | 8 ++++---- pending-rules/PlentyOfFish.xml | 6 +++--- pending-rules/Pogo.xml | 8 ++++---- pending-rules/Proxify.xml | 6 +++--- pending-rules/RoadRunner.xml | 8 ++++---- pending-rules/SixApart.xml | 10 +++++----- pending-rules/SlySoft.xml | 8 ++++---- pending-rules/SpamGourmet.xml | 8 ++++---- pending-rules/Target.xml | 8 ++++---- pending-rules/Torrentz.xml | 6 +++--- pending-rules/Typepad.xml | 6 +++--- pending-rules/WinPcap.xml | 8 ++++---- pending-rules/Wireshark.xml | 8 ++++---- pending-rules/btjunkie.xml | 8 ++++---- pending-rules/eHow.xml | 6 +++--- pending-rules/uTorrent.xml | 8 ++++---- 32 files changed, 116 insertions(+), 116 deletions(-) diff --git a/pending-rules/Adobe.xml b/pending-rules/Adobe.xml index 8437c43..b6840f3 100644 --- a/pending-rules/Adobe.xml +++ b/pending-rules/Adobe.xml @@ -1,3 +1,3 @@ -<ruleset name="Adobe"> - <rule from="^http://(www\.)?adobe\.com/" to="https://www.adobe.com/"/> -</ruleset> +<ruleset name="Adobe"> + <rule from="^http://(www\.)?adobe\.com/" to="https://www.adobe.com/"/> +</ruleset> diff --git a/pending-rules/BinSearch.xml b/pending-rules/BinSearch.xml index 9630d1f..98f943f 100644 --- a/pending-rules/BinSearch.xml +++ b/pending-rules/BinSearch.xml @@ -1,3 +1,3 @@ -<ruleset name="BinSearch"> - <rule from="^http://(www\.)?binsearch\.info/" to="https://www.binsearch.info/"/> -</ruleset> +<ruleset name="BinSearch"> + <rule from="^http://(www\.)?binsearch\.info/" to="https://www.binsearch.info/"/> +</ruleset> diff --git a/pending-rules/CaceTech.xml b/pending-rules/CaceTech.xml index 16c3e2b..515cd68 100644 --- a/pending-rules/CaceTech.xml +++ b/pending-rules/CaceTech.xml @@ -1,3 +1,3 @@ -<ruleset name="CaceTech"> - <rule from="^http://(www\.)?cacetech\.com/" to="https://www.cacetech.com/"/> -</ruleset> +<ruleset name="CaceTech"> + <rule from="^http://(www\.)?cacetech\.com/" to="https://www.cacetech.com/"/> +</ruleset> diff --git a/pending-rules/DVDFab.xml b/pending-rules/DVDFab.xml index 00fbb39..ab90a89 100644 --- a/pending-rules/DVDFab.xml +++ b/pending-rules/DVDFab.xml @@ -1,3 +1,3 @@ -<ruleset name="DVDFab"> - <rule from="^https?://(www\.)?dvdfab\.(com|net)/" to="https://www.dvdfab.$2/"/> -</ruleset> +<ruleset name="DVDFab"> + <rule from="^https?://(www\.)?dvdfab\.(com|net)/" to="https://www.dvdfab.$2/"/> +</ruleset> diff --git a/pending-rules/EZTV.xml b/pending-rules/EZTV.xml index ae6a79a..7e28d0e 100644 --- a/pending-rules/EZTV.xml +++ b/pending-rules/EZTV.xml @@ -1,4 +1,4 @@ -<ruleset name="EZTV"> - <rule from="^(http|https)://(www\.)?(ezrss\.it|eztv\.it|zoink\.it|ezimages\.eu)/" to="https://$3/"/> - <rule from="^http://torrent\.zoink\.it/"; to="https://torrent.zoink.it/"/> -</ruleset> +<ruleset name="EZTV"> + <rule from="^(http|https)://(www\.)?(ezrss\.it|eztv\.it|zoink\.it|ezimages\.eu)/" to="https://$3/"/> + <rule from="^http://torrent\.zoink\.it/"; to="https://torrent.zoink.it/"/> +</ruleset> diff --git a/pending-rules/EzineArticles.xml b/pending-rules/EzineArticles.xml index ec317f4..0acc9cc 100644 --- a/pending-rules/EzineArticles.xml +++ b/pending-rules/EzineArticles.xml @@ -1,4 +1,4 @@ -<ruleset name="EzineArticles"> - <rule from="^http://(www\.)?ezinearticles\.com/" to="https://www.ezinearticles.com/"/> - <rule from="^http://(blog|shop|subscriptions)\.ezinearticles\.com/" to="https://$1.ezinearticles.com/"/> -</ruleset> +<ruleset name="EzineArticles"> + <rule from="^http://(www\.)?ezinearticles\.com/" to="https://www.ezinearticles.com/"/> + <rule from="^http://(blog|shop|subscriptions)\.ezinearticles\.com/" to="https://$1.ezinearticles.com/"/> +</ruleset> diff --git a/pending-rules/FFMPEG.xml b/pending-rules/FFMPEG.xml index d2b821f..b6f5683 100644 --- a/pending-rules/FFMPEG.xml +++ b/pending-rules/FFMPEG.xml @@ -1,3 +1,3 @@ -<ruleset name="FFMPEG"> - <rule from="^(http|https)://(www\.)?ffmpeg\.org/" to="https://ffmpeg.org/"/> -</ruleset> +<ruleset name="FFMPEG"> + <rule from="^(http|https)://(www\.)?ffmpeg\.org/" to="https://ffmpeg.org/"/> +</ruleset> diff --git a/pending-rules/GetFirebug.xml b/pending-rules/GetFirebug.xml index fbfe828..22483e3 100644 --- a/pending-rules/GetFirebug.xml +++ b/pending-rules/GetFirebug.xml @@ -1,3 +1,3 @@ -<ruleset name="GetFirebug"> - <rule from="^http://(www\.)?getfirebug\.com/" to="https://getfirebug.com/"/> -</ruleset> +<ruleset name="GetFirebug"> + <rule from="^http://(www\.)?getfirebug\.com/" to="https://getfirebug.com/"/> +</ruleset> diff --git a/pending-rules/GoDaddy.xml b/pending-rules/GoDaddy.xml index 5de38c4..f2cc8ca 100644 --- a/pending-rules/GoDaddy.xml +++ b/pending-rules/GoDaddy.xml @@ -1,5 +1,5 @@ -<ruleset name="GoDaddy"> - <rule from="^http://(www\.)?godaddy\.com/" to="https://www.godaddy.com/"/> - <rule from="^http://(www\.)?godaddymobile\.com/" to="https://www.godaddymobile.com/"/> - <rule from="^http://(community|shops|who)\.godaddy\.com/" to="https://$1.godaddy.com/"/> -</ruleset> +<ruleset name="GoDaddy"> + <rule from="^http://(www\.)?godaddy\.com/" to="https://www.godaddy.com/"/> + <rule from="^http://(www\.)?godaddymobile\.com/" to="https://www.godaddymobile.com/"/> + <rule from="^http://(community|shops|who)\.godaddy\.com/" to="https://$1.godaddy.com/"/> +</ruleset> diff --git a/pending-rules/MapQuest.xml b/pending-rules/MapQuest.xml index 8d160cb..8781a86 100644 --- a/pending-rules/MapQuest.xml +++ b/pending-rules/MapQuest.xml @@ -1,6 +1,6 @@ -<ruleset name="MapQuest"> - <rule from="^http://(www\.)?mapquest\.com/" to="https://www.mapquest.com/"/> - <rule from="^http://developer\.mapquest\.com/"; to="https://developer.mapquest.com/"/> - <rule from="^http://(www\.)?mapquestapi\.com/" to="https://www.mapquestapi.com/"/> - <rule from="^http://(www\.)?mapquesthelp\.com/" to="https://www.mapquesthelp.com/"/> -</ruleset> +<ruleset name="MapQuest"> + <rule from="^http://(www\.)?mapquest\.com/" to="https://www.mapquest.com/"/> + <rule from="^http://developer\.mapquest\.com/"; to="https://developer.mapquest.com/"/> + <rule from="^http://(www\.)?mapquestapi\.com/" to="https://www.mapquestapi.com/"/> + <rule from="^http://(www\.)?mapquesthelp\.com/" to="https://www.mapquesthelp.com/"/> +</ruleset> diff --git a/pending-rules/Match.xml b/pending-rules/Match.xml index 6fc232b..95080d7 100644 --- a/pending-rules/Match.xml +++ b/pending-rules/Match.xml @@ -1,3 +1,3 @@ -<ruleset name="Match"> - <rule from="^http://(www\.)?match\.com/" to="https://www.match.com/"/> -</ruleset> +<ruleset name="Match"> + <rule from="^http://(www\.)?match\.com/" to="https://www.match.com/"/> +</ruleset> diff --git a/pending-rules/MyPoints.xml b/pending-rules/MyPoints.xml index 47e2dd7..ea1aa62 100644 --- a/pending-rules/MyPoints.xml +++ b/pending-rules/MyPoints.xml @@ -1,3 +1,3 @@ -<ruleset name="MyPoints"> - <rule from="^http://(www\.)?mypoints\.com/" to="https://www.mypoints.com/"/> -</ruleset> +<ruleset name="MyPoints"> + <rule from="^http://(www\.)?mypoints\.com/" to="https://www.mypoints.com/"/> +</ruleset> diff --git a/pending-rules/Open-Mesh.xml b/pending-rules/Open-Mesh.xml index f6771f9..8096602 100644 --- a/pending-rules/Open-Mesh.xml +++ b/pending-rules/Open-Mesh.xml @@ -1,4 +1,4 @@ -<ruleset name="Open-Mesh"> - <rule from="^http://(www\.)?open-mesh\.com/" to="https://www.open-mesh.com/"/> - <rule from="^http://dashboard\.open-mesh\.com/"; to="https://dashboard.open-mesh.com/"/> -</ruleset> +<ruleset name="Open-Mesh"> + <rule from="^http://(www\.)?open-mesh\.com/" to="https://www.open-mesh.com/"/> + <rule from="^http://dashboard\.open-mesh\.com/"; to="https://dashboard.open-mesh.com/"/> +</ruleset> diff --git a/pending-rules/OzBargain.xml b/pending-rules/OzBargain.xml index e2568e9..151c96b 100644 --- a/pending-rules/OzBargain.xml +++ b/pending-rules/OzBargain.xml @@ -1,3 +1,3 @@ -<ruleset name="OzBargain"> - <rule from="^(http|https)://(www\.)?ozbargain\.com\.au/" to="https://www.ozbargain.com.au/"/> -</ruleset> +<ruleset name="OzBargain"> + <rule from="^(http|https)://(www\.)?ozbargain\.com\.au/" to="https://www.ozbargain.com.au/"/> +</ruleset> diff --git a/pending-rules/PCCaseGear.xml b/pending-rules/PCCaseGear.xml index 481308c..93bede1 100644 --- a/pending-rules/PCCaseGear.xml +++ b/pending-rules/PCCaseGear.xml @@ -1,3 +1,3 @@ -<ruleset name="PCCaseGear"> - <rule from="^(http|https)://(www\.)?pccasegear\.(com|com\.au)/" to="https://www.pccasegear.com/"/> -</ruleset> +<ruleset name="PCCaseGear"> + <rule from="^(http|https)://(www\.)?pccasegear\.(com|com\.au)/" to="https://www.pccasegear.com/"/> +</ruleset> diff --git a/pending-rules/Pandora.xml b/pending-rules/Pandora.xml index 7e2810b..5d536fc 100644 --- a/pending-rules/Pandora.xml +++ b/pending-rules/Pandora.xml @@ -1,3 +1,3 @@ -<ruleset name="Pandora"> - <rule from="^http://(www\.)?pandora\.com/" to="https://www.pandora.com/"/> -</ruleset> +<ruleset name="Pandora"> + <rule from="^http://(www\.)?pandora\.com/" to="https://www.pandora.com/"/> +</ruleset> diff --git a/pending-rules/PirateBay.xml b/pending-rules/PirateBay.xml index 22a60dc..3c693a0 100644 --- a/pending-rules/PirateBay.xml +++ b/pending-rules/PirateBay.xml @@ -1,4 +1,4 @@ -<ruleset name="ThePirateBay"> - <rule from="^http://(rss|static|torrents)\.thepiratebay\.org/" to="https://$1.thepiratebay.org/"/> - <rule from="^(http|https)://(www\.)?thepiratebay\.org/" to="https://thepiratebay.org/"/> -</ruleset> +<ruleset name="ThePirateBay"> + <rule from="^http://(rss|static|torrents)\.thepiratebay\.org/" to="https://$1.thepiratebay.org/"/> + <rule from="^(http|https)://(www\.)?thepiratebay\.org/" to="https://thepiratebay.org/"/> +</ruleset> diff --git a/pending-rules/PlentyOfFish.xml b/pending-rules/PlentyOfFish.xml index ac5537e..be06ee7 100644 --- a/pending-rules/PlentyOfFish.xml +++ b/pending-rules/PlentyOfFish.xml @@ -1,3 +1,3 @@ -<ruleset name="PlentyOfFish"> - <rule from="^https?://(www\.)?plentyoffish\.com/" to="https://www.plentyoffish.com/"/> -</ruleset> +<ruleset name="PlentyOfFish"> + <rule from="^https?://(www\.)?plentyoffish\.com/" to="https://www.plentyoffish.com/"/> +</ruleset> diff --git a/pending-rules/Pogo.xml b/pending-rules/Pogo.xml index df86259..6947057 100644 --- a/pending-rules/Pogo.xml +++ b/pending-rules/Pogo.xml @@ -1,4 +1,4 @@ -<ruleset name="Pogo"> - <rule from="^http://(www\.)?pogo\.com/" to="https://www.pogo.com/"/> - <rule from="^http://help\.pogo\.com/"; to="https://help.pogo.com/"/> -</ruleset> +<ruleset name="Pogo"> + <rule from="^http://(www\.)?pogo\.com/" to="https://www.pogo.com/"/> + <rule from="^http://help\.pogo\.com/"; to="https://help.pogo.com/"/> +</ruleset> diff --git a/pending-rules/Proxify.xml b/pending-rules/Proxify.xml index 3ee633c..689a48b 100644 --- a/pending-rules/Proxify.xml +++ b/pending-rules/Proxify.xml @@ -1,3 +1,3 @@ -<ruleset name="Proxify"> - <rule from="^https?://(www\.)?proxify\.com/" to="https://proxify.com/"/> -</ruleset> +<ruleset name="Proxify"> + <rule from="^https?://(www\.)?proxify\.com/" to="https://proxify.com/"/> +</ruleset> diff --git a/pending-rules/RoadRunner.xml b/pending-rules/RoadRunner.xml index 270e4d4..9a35664 100644 --- a/pending-rules/RoadRunner.xml +++ b/pending-rules/RoadRunner.xml @@ -1,4 +1,4 @@ -<ruleset name="RoadRunner"> - <rule from="^http://(www\.)?rr\.com/" to="https://www.rr.com/"/> - <rule from="^http://hercules\.rr\.com/"; to="https://hercules.rr.com/"/> -</ruleset> +<ruleset name="RoadRunner"> + <rule from="^http://(www\.)?rr\.com/" to="https://www.rr.com/"/> + <rule from="^http://hercules\.rr\.com/"; to="https://hercules.rr.com/"/> +</ruleset> diff --git a/pending-rules/SixApart.xml b/pending-rules/SixApart.xml index 5a32c10..37d0338 100644 --- a/pending-rules/SixApart.xml +++ b/pending-rules/SixApart.xml @@ -1,5 +1,5 @@ -<ruleset name="SixApart"> - <rule from="^http://sixapart\.com/"; to="https://sixapart.com/"/> - <rule from="^http://(help|www)\.sixapart\.com/" to="https://$1.sixapart.com/"/> - <rule from="^http://(www\.)?sixapart\.jp/" to="https://www.sixapart.jp/"/> -</ruleset> +<ruleset name="SixApart"> + <rule from="^http://sixapart\.com/"; to="https://sixapart.com/"/> + <rule from="^http://(help|www)\.sixapart\.com/" to="https://$1.sixapart.com/"/> + <rule from="^http://(www\.)?sixapart\.jp/" to="https://www.sixapart.jp/"/> +</ruleset> diff --git a/pending-rules/SlySoft.xml b/pending-rules/SlySoft.xml index 17b0eef..d8951ec 100644 --- a/pending-rules/SlySoft.xml +++ b/pending-rules/SlySoft.xml @@ -1,4 +1,4 @@ -<ruleset name="SlySoft"> - <rule from="^http://forum\.slysoft\.com/"; to="https://forum.slysoft.com/"/> - <rule from="^https?://(www\.)?slysoft\.com/" to="https://www.slysoft.com/"/> -</ruleset> +<ruleset name="SlySoft"> + <rule from="^http://forum\.slysoft\.com/"; to="https://forum.slysoft.com/"/> + <rule from="^https?://(www\.)?slysoft\.com/" to="https://www.slysoft.com/"/> +</ruleset> diff --git a/pending-rules/SpamGourmet.xml b/pending-rules/SpamGourmet.xml index da81ee0..16dc5f4 100644 --- a/pending-rules/SpamGourmet.xml +++ b/pending-rules/SpamGourmet.xml @@ -1,4 +1,4 @@ -<ruleset name="SpamGourmet"> - <rule from="^http://spamgourmet\.com/"; to="https://spamgourmet.com/"/> - <rule from="^http://www\.spamgourmet\.com/"; to="https://www.spamgourmet.com/"/> -</ruleset> +<ruleset name="SpamGourmet"> + <rule from="^http://spamgourmet\.com/"; to="https://spamgourmet.com/"/> + <rule from="^http://www\.spamgourmet\.com/"; to="https://www.spamgourmet.com/"/> +</ruleset> diff --git a/pending-rules/Target.xml b/pending-rules/Target.xml index 5dd00c4..90a1683 100644 --- a/pending-rules/Target.xml +++ b/pending-rules/Target.xml @@ -1,4 +1,4 @@ -<ruleset name="Target"> - <rule from="^http://(www\.)?target\.com/" to="https://www.target.com/"/> - <rule from="^http://sites\.target\.com/"; to="https://sites.target.com/"/> -</ruleset> +<ruleset name="Target"> + <rule from="^http://(www\.)?target\.com/" to="https://www.target.com/"/> + <rule from="^http://sites\.target\.com/"; to="https://sites.target.com/"/> +</ruleset> diff --git a/pending-rules/Torrentz.xml b/pending-rules/Torrentz.xml index 4c16ad2..fdec3c8 100644 --- a/pending-rules/Torrentz.xml +++ b/pending-rules/Torrentz.xml @@ -1,3 +1,3 @@ -<ruleset name="Torrentz"> - <rule from="^https?://(www\.)?torrentz\.(com|eu)/" to="https://www.torrentz.$2/"/> -</ruleset> +<ruleset name="Torrentz"> + <rule from="^https?://(www\.)?torrentz\.(com|eu)/" to="https://www.torrentz.$2/"/> +</ruleset> diff --git a/pending-rules/Typepad.xml b/pending-rules/Typepad.xml index fb51042..4d23bee 100644 --- a/pending-rules/Typepad.xml +++ b/pending-rules/Typepad.xml @@ -1,3 +1,3 @@ -<ruleset name="Typepad"> - <rule from="^http://(www\.)?typepad\.com/" to="https://www.typepad.com/"/> -</ruleset> +<ruleset name="Typepad"> + <rule from="^http://(www\.)?typepad\.com/" to="https://www.typepad.com/"/> +</ruleset> diff --git a/pending-rules/WinPcap.xml b/pending-rules/WinPcap.xml index 5c90c19..530ff60 100644 --- a/pending-rules/WinPcap.xml +++ b/pending-rules/WinPcap.xml @@ -1,4 +1,4 @@ -<ruleset name="WinPcap"> - <rule from="^http://winpcap\.org/"; to="https://winpcap.org/"/> - <rule from="^http://www\.winpcap\.org/"; to="https://www.winpcap.org/"/> -</ruleset> +<ruleset name="WinPcap"> + <rule from="^http://winpcap\.org/"; to="https://winpcap.org/"/> + <rule from="^http://www\.winpcap\.org/"; to="https://www.winpcap.org/"/> +</ruleset> diff --git a/pending-rules/Wireshark.xml b/pending-rules/Wireshark.xml index d316db7..2a5532a 100644 --- a/pending-rules/Wireshark.xml +++ b/pending-rules/Wireshark.xml @@ -1,4 +1,4 @@ -<ruleset name="Wireshark"> - <rule from="^http://wireshark\.org/"; to="https://wireshark.org/"/> - <rule from="^http://(anonsvn|www)\.wireshark\.org/" to="https://$1.wireshark.org/"/> -</ruleset> +<ruleset name="Wireshark"> + <rule from="^http://wireshark\.org/"; to="https://wireshark.org/"/> + <rule from="^http://(anonsvn|www)\.wireshark\.org/" to="https://$1.wireshark.org/"/> +</ruleset> diff --git a/pending-rules/btjunkie.xml b/pending-rules/btjunkie.xml index 146daa1..a54e3c7 100644 --- a/pending-rules/btjunkie.xml +++ b/pending-rules/btjunkie.xml @@ -1,4 +1,4 @@ -<ruleset name="btjunkie"> - <rule from="^http://(dl|static)\.btjunkie\.org/" to="https://$1.btjunkie.org/"/> - <rule from="^https?://(www\.)?btjunkie\.org/" to="https://btjunkie.org/"/> -</ruleset> +<ruleset name="btjunkie"> + <rule from="^http://(dl|static)\.btjunkie\.org/" to="https://$1.btjunkie.org/"/> + <rule from="^https?://(www\.)?btjunkie\.org/" to="https://btjunkie.org/"/> +</ruleset> diff --git a/pending-rules/eHow.xml b/pending-rules/eHow.xml index 662dddf..c6bb0a9 100644 --- a/pending-rules/eHow.xml +++ b/pending-rules/eHow.xml @@ -1,3 +1,3 @@ -<ruleset name="eHow"> - <rule from="^http://(www\.)?ehow\.com/" to="https://www.ehow.com/"/> -</ruleset> +<ruleset name="eHow"> + <rule from="^http://(www\.)?ehow\.com/" to="https://www.ehow.com/"/> +</ruleset> diff --git a/pending-rules/uTorrent.xml b/pending-rules/uTorrent.xml index 7193616..8abad42 100644 --- a/pending-rules/uTorrent.xml +++ b/pending-rules/uTorrent.xml @@ -1,4 +1,4 @@ -<ruleset name="uTorrent"> - <rule from="^https?://(www\.)?utorrent\.com/" to="https://www.utorrent.com/"/> - <rule from="^http://(download|forum)\.utorrent\.com/" to="https://$1.utorrent.com/"/> -</ruleset> +<ruleset name="uTorrent"> + <rule from="^https?://(www\.)?utorrent\.com/" to="https://www.utorrent.com/"/> + <rule from="^http://(download|forum)\.utorrent\.com/" to="https://$1.utorrent.com/"/> +</ruleset> -- 1.7.1
