www/proprietary/workshop README.md item-create ...

[Ineiev]

CVSROOT:        /web/www
Module name:    www
Changes by:     Ineiev <ineiev> 19/02/04 02:12:22

Modified files:
        proprietary/workshop: README.md item-create mal.rec malgen 
                              update-item-count 

Log message:
        New format for Id: YYYYMMDDN.V

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/README.md?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/item-create?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/mal.rec?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/malgen?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/update-item-count?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: README.md
===================================================================
RCS file: /web/www/www/proprietary/workshop/README.md,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- README.md   5 Jan 2019 09:20:32 -0000       1.2
+++ README.md   4 Feb 2019 07:12:21 -0000       1.3
@@ -1,4 +1,4 @@
-Copyright (C) 2018 Free Software Foundation, Inc.
+Copyright (C) 2018, 2019 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -136,11 +136,11 @@
      May 30th, 2018.
 
      Another blurb on a different topic with the same latest-publication
-     date would have "Id: 201805304", and a third one "Id: 201805308".
+     date would have "Id: 201805301", and a third one "Id: 201805302".
 
      Variants of these 3 blurbs (e.g., different wording in malware-* and
-     proprietary-*) would have "Id: 201805301", "Id: 201805305", and
-     "Id: 201805309" respectively.
+     proprietary-*) would have "Id: 201805300.1", "Id: 201805301.1", and
+     "Id: 201805302.1" respectively.
 
  *RT*
 

Index: item-create
===================================================================
RCS file: /web/www/www/proprietary/workshop/item-create,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- item-create 28 Jan 2019 10:53:43 -0000      1.7
+++ item-create 4 Feb 2019 07:12:22 -0000       1.8
@@ -14,7 +14,7 @@
 # added. Any further changes should be made in mal.rec, and pages should
 # then be regenerated with malgen.
 
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2019 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -67,7 +67,7 @@
   echo 1>&2 "!!! This item still has the default Id."
   exit 1
 fi
-if echo "$id" | egrep -qv '^Id: 20[0-9]{7}$'; then
+if echo "$id" | egrep -qv '^Id: 20[0-9]{7}(\..)?$'; then
   echo 1>&2 "!!! This item has a malformed Id, '$id'."
   exit 1
 fi

Index: mal.rec
===================================================================
RCS file: /web/www/www/proprietary/workshop/mal.rec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- mal.rec     3 Feb 2019 15:09:33 -0000       1.32
+++ mal.rec     4 Feb 2019 07:12:22 -0000       1.33
@@ -1,7 +1,7 @@
 # This is the source file for malware examples in
 # https://www.gnu.org/proprietary/
 
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2019 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -340,7 +340,7 @@
 +   (including the US and the EU) require the network to store all
 +   these location data for months or years.</p>
 
-Id: 201311121
+Id: 201311120.1
 Target: malware-mobiles.html phone-communications
 PubDate: 2006-12-05
 PubDate: 2013-11-12
@@ -1021,7 +1021,7 @@
 +   changes the file system from HFS+  to APFS</a>, which cannot be
 +   accessed from GNU/Linux, Windows or even older versions of MacOS.</p>
 
-Id: 201710041
+Id: 201710040.1
 Target: proprietary-subscriptions.html proprietary-subscriptions
 Target: proprietary-sabotage.html proprietary-sabotage
 Target: proprietary-tethers.html proprietary-tethers
@@ -1092,7 +1092,7 @@
 +   href="/philosophy/words-to-avoid.html#Hacker">&ldquo;hackers&rdquo;</a>
 +   referring to crackers.</p>
 
-Id: 201709091
+Id: 201709090.1
 Target: proprietary-back-doors.html universal
 Target: malware-cars.html malware-cars
 PubDate: 2017-09-09
@@ -1235,7 +1235,7 @@
 +   on you.  Even if it is air-gapped, it could be saving up records
 +   about you for later examination.</p>
 
-Id: 201706202
+Id: 201706200.2
 Target: proprietary-back-doors.html spy
 PubDate: 2017-06-07
 Keywords:
@@ -1250,7 +1250,7 @@
 +   a back door that can be used by the manufacturer (and
 +   government) to spy on users.</p>
 
-Id: 201706201
+Id: 201706200.1
 Target: proprietary-insecurity.html proprietary-insecurity
 PubDate: 2017-06-20
 Keywords: appliances
@@ -1447,7 +1447,7 @@
 +   href="/philosophy/surveillance-vs-democracy.html"> illegal to design
 +   the app to snoop at all</a>.</p>
 
-Id: 201704131
+Id: 201704130.1
 Target: malware-amazon.html drm
 PubDate: 2017-04-13
 Keywords:
@@ -1512,7 +1512,7 @@
 +   
href="https://www.theatlantic.com/technology/archive/2017/04/when-apps-collude-to-steal-your-data/522177/";>A
 +   study found tens of thousands of pairs that collude</a>.</p>
 
-Id: 201704071
+Id: 201704070.1
 Target: malware-apple.html drm
 PubDate: 2017-04-07
 Keywords: sabotage
@@ -1692,7 +1692,7 @@
 +   to use it without having your fingerprints taken. Users would have
 +   no way to tell whether the phone is snooping on them.</p>
 
-Id: 201702061
+Id: 201702060.1
 Target: proprietary-back-doors.html universal
 PubDate: 2017-02-06
 Keywords: vizio surveillance tvsets appliances
@@ -1886,7 +1886,7 @@
 +   the tracking is done by recording interactions with servers, but
 +   proprietary software contributes.</p>
 
-Id: 201612061
+Id: 201612060.1
 Target: malware-appliances.html malware-appliances
 Target: proprietary-insecurity.html proprietary-insecurity
 PubDate: 2016-12-06
@@ -1947,7 +1947,7 @@
 +   lots of personal data to Apple's servers</a>.  Big Brother can get
 +   them from there.</p>
 
-Id: 201611161
+Id: 201611160.1
 Target: malware-webpages.html malware-webpages
 PubDate: 2016-11-16
 Keywords: vpn mobiles-surveillance apps 
@@ -2145,7 +2145,7 @@
 +   
href="https://www.theregister.co.uk/2016/08/05/payperinstall_study/";>install
 +   other proprietary programs that the users don't want</a>.</p>
 
-Id: 201608172
+Id: 201608171
 Target: malware-microsoft.html back-doors
 Target: proprietary-back-doors.html universal
 PubDate: 2007-09-13
@@ -2170,7 +2170,7 @@
 +   
href="http://arstechnica.com/information-technology/2015/07/windows-10-updates-to-be-automatic-and-mandatory-for-home-users/";>
 +   forcibly and immediately imposed</a>.</p>
 
-Id: 201608171
+Id: 201608170.1
 Target: proprietary-surveillance.html SpywareInWindows
 Target: malware-microsoft.html surveillance
 PubDate: 2016-08-17
@@ -3673,7 +3673,7 @@
 +   <p>We can be quite sure this EULA is unjust because injustice is the
 +   only motive for imposing an EULA.</p>
 
-Id: 201410081
+Id: 201410080.1
 Target: proprietary-drm.html proprietary-drm
 PubDate: 2014-10-08
 Keywords: surveillance adobe e-readers
@@ -3798,7 +3798,7 @@
 +   about other crimes such as killing people.  Perhaps Apple considers
 +   killing more acceptable than marijuana.</p>
 
-Id: 201405201
+Id: 201405200.1
 Target: proprietary-sabotage.html proprietary-sabotage
 Target: malware-appliances.html malware-appliances
 PubDate: 2014-05-20
@@ -3875,7 +3875,7 @@
 Blurb: <p><a href="http://soylentnews.org/article.pl?sid=14/03/15/1912255";>
 +   Intel processors will have tyrant software built in</a>.</p>
 
-Id: 201403121
+Id: 201403120.1
 Target: malware-mobiles.html back-doors
 Target: proprietary-back-doors.html alter-data
 PubDate: 2014-03-12
@@ -3961,7 +3961,7 @@
 +   
href="http://www.theguardian.com/technology/2014/jan/19/apple-talking-cats-in-app-purchases";>
 +   games lure children to spend their parents' money</a>.</p>
 
-Id: 201401151
+Id: 201401150.1
 Target: proprietary-surveillance.html SpywareInMobileApps
 Target: malware-mobiles.html surveillance
 PubDate: 2014-01-15
@@ -3978,7 +3978,7 @@
 +   
href="https://www.techrepublic.com/blog/asian-technology/japanese-government-warns-baidu-ime-is-spying-on-users/";>
 +   Baidu's Japanese-input and Chinese-input apps spy on users</a>.</p>
 
-Id: 201401101
+Id: 201401100.1
 Target: proprietary-surveillance.html SpywareInMacOS
 Target: malware-apple.html surveillance
 PubDate: 2014-01-10
@@ -4517,7 +4517,7 @@
 +   
href="http://arstechnica.com/information-technology/2012/12/ftc-disclosures-severely-lacking-in-kids-mobile-appsand-its-getting-worse/";>
 +   
http://arstechnica.com/information-technology/2012/12/ftc-disclosures-severely-lacking-in-kids-mobile-appsand-its-getting-worse/</a>.</p>
 
-Id: 201212031
+Id: 201212030.1
 Target: malware-amazon.html surveillance
 PubDate: 2012-12-03
 Keywords:
@@ -4544,7 +4544,7 @@
 +   (as of 5/17/2012) fed their visitors third-party cookies, allowing
 +   other sites to track them</a>.</p>
 
-Id: 201210221
+Id: 201210220.1
 Target: malware-amazon.html back-doors
 PubDate: 2009-07-17
 PubDate: 2012-10-22
@@ -4665,7 +4665,7 @@
 +   of other people's phone numbers or email addresses).  This violates
 +   the privacy of those other people.</p>
 
-Id: 201112081
+Id: 201112080.1
 Target: malware-microsoft.html back-doors
 PubDate: 2011-12-08
 Keywords: back-doors install-delete windows
@@ -4904,7 +4904,7 @@
 +   not approved by <a href="/proprietary/proprietary-jails.html">Apple
 +   censorship</a>.  All this was apparently intentional.</p>
 
-Id: 200708131
+Id: 200708130.1
 Target: proprietary-drm.html proprietary-drm
 Target: malware-microsoft.html drm
 PubDate: 2007-08-13
@@ -4933,7 +4933,7 @@
 +   href="https://en.wikipedia.org/wiki/FairPlay";>dictate where its
 +   customers can watch the videos they purchased</a>.</p>
 
-Id: 200700001
+Id: 200700000.1
 Target: proprietary-back-doors.html universal
 PubDate: 2007
 Keywords: amazon back-door

Index: malgen
===================================================================
RCS file: /web/www/www/proprietary/workshop/malgen,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- malgen      3 Feb 2019 13:17:33 -0000       1.4
+++ malgen      4 Feb 2019 07:12:22 -0000       1.5
@@ -7,7 +7,7 @@
 
 # The script processes all pages when no argument is given.
 
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2019 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -68,7 +68,7 @@
   sed    '$ { /^$/d }' $temp1 > $temp2
   sed    '/^[-0-9][-0-9]*$/d' $temp2 |
   sed    '/^Id:/p;/^Blurb:/p;/^+/p;/^$/p;d' |
-  sed    's,^Id:[ \t]*\([0-9]\{9\}\).*$,  <li id="M\1">,
+  sed    's,^Id:[ \t]*\([0-9]\{9\}\(\..\)\?\).*$,  <li id="M\1">,
           s,^$,  </li>\n,
           s,^Blurb:[ \t]*,    ,
           s,^+, ,
@@ -151,7 +151,7 @@
           done
       for i in $recent; do
         awk 'BEGIN { RS=""; FS="\n"; ORS="\n\n" }
-             /(\n|^)Added: '$i'(\n|$)/ { print }
+             /(\n|^)Added: '$i'(\n|$)/ && !/(\n|^)Id: [^\n]*[.]/ { print }
             ' $sorted;
       done | awk 'BEGIN { RS=""; FS="\n"; ORS="\n\n"; i = 1 }
                   { if (i++ > 5) { exit 0; } print }

Index: update-item-count
===================================================================
RCS file: /web/www/www/proprietary/workshop/update-item-count,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- update-item-count   30 Nov 2018 09:18:10 -0000      1.1
+++ update-item-count   4 Feb 2019 07:12:22 -0000       1.2
@@ -5,7 +5,7 @@
 
 # RT #1328973.
 
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2018, 2019 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -18,7 +18,7 @@
 set -e
 
 # Get the number of items, and approximate it to the nearest 50.
-item_count=$(grep -Ec '^Id: 20[0-9]{6}[048]' mal.rec)
+item_count=$(grep -Ec '^Id: 20[0-9]{7}$' mal.rec)
 i=$((item_count/50))
 i=$((i*50))
 d=$((item_count%50))