Skip to content

Commit

Permalink
this fixes #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@IdkWhatToPutHere
IdkWhatToPutHere committed Apr 11, 2016
1 parent b4eb879 commit f4462f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion checksums/ublock0.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
059e0bfbf22bd242dda7b07389fe09a2 assets/ublock/filter-lists.json
98088252cedafb8571cf61b91bea219e assets/ublock/badware.txt
89f1a0b14271b83ca4980a3373d5fc12 assets/ublock/experimental.txt
a3582eeb70cf8fccb89945bb7e2f35a5 assets/ublock/filters.txt
235dfeb3960a6d2820ed5fa543cbb0b9 assets/ublock/filters.txt
b4589085581924119fa07c1af2e56eb6 assets/ublock/privacy.txt
b3cdc695a36989b1da420d989f53fefe assets/ublock/resources.txt
ccc035bf1c9f5c074cacb38023c438ea assets/ublock/unbreak.txt
Expand Down
3 changes: 3 additions & 0 deletions filters/filters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,3 +367,6 @@ vaughnlive.tv##.abvsDynamic

# https://github.com/uBlockOrigin/uAssets/issues/9
sembilhete.tv##script:inject(fuckadblock.js-3.2.0)

! https://github.com/uBlockOrigin/uAssets/issues/2
||data.*.com^$document

10 comments on commit f4462f3

@gorhill
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your checksums were not properly computed, I fixed with 021b9a9.

Was this an mistake, or is there an issue with md5sum on your side?

@gorhill
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had an empty line at the end of filters.txt which GH removed

GitHub won't change the content of files. I do enforce an empty line as the last line myself -- and looking at the committed version, there is indeed an empty line (which is correct). I tried removing or adding trailing empty lines, and I can't get your checksums.

Are you using an editor which generates \r as part of a new line?

@gorhill
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe your compare plugin ignores differences in new line characters?

If I replace all instances of \n with \r\n, I get 235dfeb3960a6d2820ed5fa543cbb0b9, so that confirms line ending character is the issue. Can't Notepad++ be configured to save text files to Unix-like format?

(Note that uBO should still work fine with \r\n, and there was no issue for users, but it's best if everybody uses the same format for commits).

@Hrxn
Copy link

@Hrxn Hrxn commented on f4462f3 Apr 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, EOL should not be changed by cloning. That would be just wrong.

@gorhill
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For lack of other places to share this... I just saw an announcement from EasyList maintainers:

we are going to move the hosting of our EasyList repositories completely to GitHub as well soon. We are very grateful that we were allowed to use Adblock Plus' infrastructure in the past but it's time for the EasyList project to move on.

This is good news, this will make submitting filter issues/solutions much more easy I believe, and make it easier for more volunteers to contribute.

@gorhill
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Frivolous use of DMCA should be fought -- I have absolutely no doubt that all those who benefits from EasyList/EasyPrivacy through their blockers will be happy to contribute funds to fight this nonsense.

I don't get the "Github asked me and the japanese repository to edit the content": is it not for the owner of the repository (rather than GitHub) to decide whether to comply or fight a DMCA notice?

@Hrxn
Copy link

@Hrxn Hrxn commented on f4462f3 Apr 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is ridiculous...

What are these lists? Nothing more than a bunch of names or identifiers. No sane person can argue that the DMCA applies here. Copyright for what? For merely mentioning a (domain) name, or site? Completely laughable. That is not even fair use, i.e. protected usage without permission, that is far less.

The only copyright here is that of the authors of these lists.

Where did this notion even come from, that some believe they have a say on what is appropriate to happen on the client side? It's as if they don't understand what a user agent or browser is. That is only the business of the user, and no one's else.

@Hrxn
Copy link

@Hrxn Hrxn commented on f4462f3 Apr 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was obvious right from the start...
Just saying.. :)

@okiehsch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub Support responded that they will try to find out what is causing the issue.

@IdkWhatToPutHere have you heard from GitHub Support since then?
I ask because I have cloned uAssets to GitHub Desktop and checked the checksums.
They are all incorrect. I have to convert the filter .txt files to Unix via Notepad++ to get the
correct checksums.

@okiehsch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That works thx.

Please sign in to comment.