bug#14658: 24.3; M-x snoop keywords need updating

[micah]

Hello,

Due to the recent NSA leaks, we have found out many interesting
things. One such thing is that the website Attrition.org which closely
follows the security industry published a list of words that supposedly
cause the NSA to flag you as a potential terrorists if you over-use them
in an email.

It seems like M-x spook is missing quite a few of these, so I submit the
following diff as words that should be added:

--- /tmp/emacs24.spook 2013-06-18 16:22:50.932434566 -0400
+++ /tmp/emacs24.spooknew 2013-06-18 16:22:27.705108970 -0400
@@ -1,17 +1,61 @@
-[Hello to all my friends and fans in domestic surveillance]
+
+^
+^?
+~
+$
+&
+1*
+1071
+1080H
+15kg
+17
+1911
+1984
+1997
+20
+22nd SAS
22nd SAS
2600
2600 Magazine
+2600 Magazine
+3
+312
+3848
+3B2
+414
+50BMG
+5.0i
+51
64 Vauxhall Cross
-9705 Samford Road
+69
+7
+707
+737
+747
+757
+767
+77
+8182
+868
+888
9/11
+9705 Samford Road
+a
Abbas
+ABC
Abu Ghraib
Abu Sayyaf
+ACC
+Active
+ADIU
Adriatic
+advise
+advisors
advisors
Afghanistan
afsatcom
+afsatcom
+AFSPC
AFSPC
Agent
Agfa
@@ -19,8 +63,11 @@
Agro
Agro Terror
AGT. AMME
+AHPCRC
Aid
AIEWS
+AIEWS
+AIMSX
AIMSX
Air borne
airframe
@@ -28,7 +75,16 @@
Airplane
Airport
AK-47
+Aladdin
+Aladdin
+Albania
+Albanian
+Albright
+Alcohol Tobacco and Firearms
+Aldergrove
+Alica
Al Jazeera
+Alouette
Al-Qaeda
Al Qaeda Arabian Peninsula
Al Qaeda in the Islamic Maghreb
@@ -37,236 +93,397 @@
Al Qaida
Al Qa'ida
Al-Shabaab
-Aladdin
-Albania
-Albanian
-Albright
-Alcohol Tobacco and Firearms
-Aldergrove
AMEMB
+AMEMB
+Amherst
Ammonium nitrate
ammunition
AMTRAK
AMW
+AMW
analyzer
anarchy
+anarchy
+ANC
ANC
ANDVT
+Anonymous
Ansar al-Islam
anthrax
Antiviral
ANZUS
+AOL
+AOL TOS
AQAP
AQIM
+ARC
+Archives
+Area51
Area 51
Arellano-Felix
argus
+argus
+Armani
Armani
Armed Revolutionary Forces Colombia
Arnett
ARPA
+ARPA
arrangements
+Artichoke
Artistic Assassins
ASDIC
ASIO
+ASIO
+ASIS
+ASIS
+ASLET
ASLET
ASO
ASPIC
+assasinate
assassinate
assassination
asset
+Asset
+AT
ATF
+Atlas
+AT&T
Attack
Attorney General
Audiotel
+Audiotel
+Austin
Authorities
AUTODIN
Avalanche
Avian
AVIP
AVN
+AVN
Axis of Evil
+b
+b9
Bacteria
+Badger
+bank
bank
Baranyi
Barrio Azteca
BART
basement
+basement
Basque Separatists
BATF
+BATF
+BBE
BCCI
bce
+B.D.M.
beanpole
+BECCA
+Becker
Becker
+beef
Belknap
Bellcore
Beltran-Leyva
bemd
benelux
+Bess
+bet
+Beyond Hope
+BfV
Bin Laden
Biological
Biological event
Biological infection
Biological weapon
+BITNET
+black-bag
+Blackbird
blackjack
+Blacklisted 411
+Blackmednet
+Blacknet
+Black-Ops
Blackout
Black out
Bletchley Park
+Bletchley Park
Blister agent
Blizzard
Blowfish
+Blowfish
+Blowpipe
Blowpipe
BLU-114/B
BLU-97 A/B
bluebird
+BMDO
+BND
+Bob
Body scanner
bomb
Bomb squad
Bomb threat
bootleg
+BOP
Border
Border Patrol
Bosnia
+BOSS
Botnet
+botux
Breach
Bridge
brigand
BRLO
+BRLO
broadside
+Broadside
BROMURE
Brownout
Brown out
Brush fire
Brute forcing
Bruxelles
+Bubba
+Bubba the Love Sponge
+bullion
bullion
Burn
Burst
Bush Wired
Bust
+BVD
+BZ
+c
+Cable & Wireless
Cain and Abel
Calderon
Cancelled
+CANSLO
+Capricorn
Capricorn
+Cap-Stun
Car bomb
Cartel
Cartel de Golfo
+CATO
+CBM
+CBNRC
CBNRC
+CBOT
CBP
+CCC
+CCS
+CDA
+CdC
CDC
+CDC
+cdi
CDMA
Center for Disease Control
Central Intelligence Agency
Centro
Ceridian
CESID
+CESID
+CFC
+chaining
+chameleon man
chameleon man
+Chan
+Chelsea
Chemical
Chemical agent
Chemical burn
Chemical fire
Chemical spill
Chemical weapon
+Chicago Posse
China
Chobetsu
+Chobetsu
+chosen
+CIA
CIA
CID
+CID
+CIDA
CIDA
CIKR
+CIM
+CIO
CipherTAC-2000
CIS
+CIS
+CISE
CISU
Ciudad Juarez
clandestine
+Clandestine
class struggle
Clinton
+clone
clones
Closure
Cloud
CNCIS
Coast Guard
+cocaine
Cocaine
+COCOT
+Coderpunks
+codes
codes
Cohiba
+Cohiba
Collapse
Colombia
colonel
+Colonel
+Comirex
Comirex
Commecen
Communications infrastructure
+Competitor
+Compsec
Compsec
+Compsec 97
Computer infrastructure
computer terrorism
+Computer Terrorism
condor
Conficker
+Connections
constitution
Consul
+Consul
Consular
Contamination
+CONUS
Conventional weapon
Cops
+Cornflower
corporate security
+Corporate Security
+COS
COSCO
+COSMOS
+Counter
+counterintelligence
counter intelligence
counter terrorism
+Counterterrorism
covert video
+Covert Video
+Cowboy
+CQB
+CQB
+CRA
cracking
Craig Livingstone
Crash
credit card
+credit card
Crest
Critical infrastructure
Critical Infrastructure & Key Resources
Croatian
Crowell
cryptanalysis
+cryptanalysis
Crypto AG
crypto anarchy
+crypto-anarchy
cryptographic
+CSE
csim
csystems
+csystems
+CTP
+CTP
+CTU
+CTU
+CUD
Customs and Border Protection
Cyber attack
cybercash
+cybercash
Cyber Command
Cyber security
Cyber terror
cypherpunk
+Cypherpunks
+d
+D-11
+Daisy
data haven
+data-haven
+data havens
Dateline
+DATTA
David John Oates
+DCJFTF
DDOS
DEA
+Dead
+DEADBEEF
Deaths
+debugging
Decapitated
dedicated denial of service
Defcon
+Defcon
+DefCon V
+defence Information Warfare
defense information warfare
Delays
+Delta
+Delta Force
Delta Force
Denial of service
Department of Homeland Security
+DERA
+DES
DES
+DEVGRP
+DF
DHS
+DIA
Dick Cheney
dictionary
+Dictionary
digicash
+Digicash
Dirty bomb
Disaster
Disaster assistance
Disaster management
Disaster medical assistance team
distributed denial of service
+DITSA
diwn
+DJC
DMAT
DNDO
Dock
doctrine
+DOE
+DOE
+Dolch
+domestic disruption
domestic disruption
Domestic nuclear detection
Domestic Nuclear Detection Office
Domestic security
Downing Street
+DRA
+DREC
+DREO
Drill
DRM
Drug
@@ -275,20 +492,36 @@
Drug Enforcement Agency
Drug trade
Drug war
-e-bomb
-e-cash
-eavesdropping
+DSD
+DSD
+DSS
+Duress
+DynCorp
+E911
+EADA
Earthquake
+eavesdropping
+eavesdropping
Ebola
+e-bomb
EBS
+e-cash
+e-cash
+Echelon
Echelon
E. Coli
Eco terrorism
+EDI
+EG&G
+Egret
Electric
electronic surveillance
+Electronic Surveillance
El Paso
Elvis
+Elvis
embassy
+Embassy
emc
Emergency
Emergency Broadcast System
@@ -296,26 +529,42 @@
Emergency management
Emergency response
encryption
+Encryption
enemy of the state
enforcers
enigma
+enigma
Enriched
Environmental terrorist
+EO
+EO
+EOD
+E.O.D.
Epidemic
Ermes
Erosion
+ESN
+espionage
espionage
+Espionage
+E.T.
+ETA
ETA
Etacs
+eternity
eternity server
+EUB
EuroFed
Europol
Euskadi ta Askatasuna
Evacuation
+Event
event security
-Exon Shell
Execution
Exercise
+Exon Shell
+Exon Shell
+explicit
explosion
explosive
Exposure
@@ -323,215 +572,421 @@
Extremism
Exxon
FAA
+Face
Facility
Failure
FAMS
+fangs
FARC
+Fax
+Fax encryption
+FBI
+FBI
FBI
+FBIS
+FCIC
FDA
+FDM
Fedayeen
Federal Air Marshal Service
Federal Aviation Administration
Federal Bureau of Investigation
Federal Emergency Management Agency
FEMA
+Fetish
+FINCEN
+finks
FIPS140
Firefly
Firewalls
+Firewalls
First responder
+FIS
+fish
+fissionable
fissionable
+FKS
+Flame
+FLAME
+Flashbangs
+FLETC
+Flintlock
+FLiR
Flood
Flu
+Flu
FMD
+FMS
Food Poisoning
Foot and Mouth
+force
Forest fire
Forte
+Forte
Fortezza
Fort Hancock
+Fort Meade
+fraud
fraud
freedom
+freedom
Freeh
+Freeh
+froglegs
+FSB
FSF
Ft. Bragg
Ft. Knox
Ft. Meade
+Ft. Meade
FTS2000
Fundamentalism
fundamentalist
Fusion Center
+FX
+FXR
gamma
+Gamma
Gang
Gangs
+garbage
Gas
+Gatt
Gazprom
+GCHQ
genetic
+GEO
+GEODSS
George W. Bush
+GEOS
+Geraldton
Geraldton
+GGL
+GIGN
+Gist
global
+Global
Glock
+Glock
+Glock 26
+GOE
+Goodwin
+Gorelick
+gorilla
+Gorizont
+government
government
+GPMG
+grey Data
Grid
+grom
+GRU
+GRU
+GRU
+GRU
+GSA
+GSG-9
+GSS
Guantanamo
Gulf Cartel
Gunfight
+Guppy
Guzman
H1N1
H5N1
Hacker
hackers
+Hackers
+HAHO
Hail
halcon
+Halcon
+Halibut
+HALO
Hamas
HAMASMOIS
+Harvard
+hate
Hazardous
Hazardous material incident
Hazmat
+[Hello to all my friends and fans in domestic surveillance]
Help
Heroin
Hezbollah
+HIC
high security
-Hugo Chavez
+High Security
+Hillal
+H&K
+H.N.P.
+HoHoCon
+Hollyhock
Home grown
Homeland Defense
Homeland security
Honduras
Hostage
+HPCC
+HRT
+HTCIA
+Hugo Chavez
Human to Animal
Human to Human
+humint
Hurricane
+Hutsul
+IACIS
+IB
ICE
+ICE
+ID
+IDEA
IDEA
+IDF
+IDP
IED
Illegal immigrants
illuminati
+illuminati
+IMF
IMF
Immigration Customs Enforcement
import
Improvised explosive device
Incident
Indigo
+Indigo
+industrial
industrial espionage
industrial intelligence
+industrial intelligence
Industrial spill
Infection
Influenza
+Information Security
+Information Terrorism
+Information Warfare
+Information Warfare
InfoSec
+InfoSec
+INFOSEC
infowar
+Infowar
Infrastructure security
+Ingram Mac-10
initiative
+INR
+INS
INS
INSCOM
insurgency
interception
+interception
+Internet
Interstate
+Intiso
investigation
+Investigation
+Ionosphere
IRA
+Iran
Iraq
+IRIDF
+Iris
Irish Republican Army
+IRS
+IS
+ISA
+ISACA
ISEC
+ISI
Islam Abduganievich Karimov
-Iran
Islamist
+ISN
Israel
+ISS
+IW
+jack
+JANET
Janet Reno
+Jasmine
+JAVA
Jet
JFK
Jiang Zemin
+JICC
+jihad
jihad
+JITEM
John Kerry
JPL
JSOFC3IP
Juarez
+Juile
+Juiliett Class
Juiliett Class Submarine
JUWTF
Jyllandsposten
Kennedy
keyhole
+Keyhole
+Keyhole
Keylogger
KGB
Kh-11
+Kh-11
Khaddafi
kibo
Kidnap
kilderkin
+Kilderkin
kilo class
+Kilo Class
+Kiwi
+KLM
Kosovo
+l0ck
+LABLINK
LABLINK
+Lacrosse
La Familia
Law enforcement
Leak
+Lebed
+LEETAC
Legion of Doom
Leitrim
+Leitrim
Leuken-Baden
Lexis-Nexis
+Lexis-Nexis
+LF
Lightening
Lightning
Listeria
+LLC
LLNL
+loch
Lockdown
lock picking
+lock picking
+Locks
+Loin
Lon Horiuchi
Looting
Los Zetas
+LRTS
+LUK
lynch
+Lynch
+M-14
M-14
+M5
+M72750
+Mace
+Macintosh Firewalls
+Macintosh Internet
+Macintosh Security
Mafia
Magnitude
Mahmoud Ahmadinejad
mailbomb
+mailbomb
Majic
Malware
Manfurov
mania
Mantis
+Mantis
Maple
Mara salvatrucha
Marijuana
Maritime domain awarenes
+market
MARTA
Marxist
+Masuda
Matamoros
+Mavricks
+Mayfly
+MCI
+MD2
MD2
MD4
+MD4
+MD5
MD5
MDA
+MDA
Medco
+Medco
+mega
Mena
+Menwith
+Merlin
Merlin
+Meta-hackers
Methamphetamine
Meth Lab
Metro
Mexican army
Mexicles
Mexico
+MF
+MI-17
+MI5
+MI6
Michoacna
+Middleman
military
+Military
+Military Intelligence
militia
MILSATCOM
mindwar
+Minox
+MIT
Mitigation
MIT-LL
+MITM
+MOD
+MOIS
+mol
+Mole
Mole
monarchist
Montenegro
morse
+Morwenstow
Mossad
+Mossberg
+MP5k
MP5K-SD
+MP5K-SD
+M.P.R.I.
MS13
MS-13
+MSCJ
+MSEE
+MSNBC
+MSW
Mudslide
Mud slide
munitions
Mutation
+MYK
Mysql injection
+NACSI
Narco banners
Narcos
Narcotics
NASA
+NATIA
National Biosurveillance Integration Center
National Guard
national information infrastructure
+National Information Infrastructure
National infrastructure
Nationalist
National laboratory
@@ -539,186 +994,409 @@
National preparedness
National security
NATO
+NATOA
+NAVWAN
+NAVWCWPNS
Nazi
+NB
NBIC
+NCCS
+NCSA
+Nerd
Nerve agent
New Federation
New World Order
+niche
Nigeria
+NIJ
+Nike
+NIMA
+ninja
+nitrate
nitrate
+nkvd
NOC
+NOCS
Nogales
NORAD
+NORAD
Noriega
North Korea
Norvo Virus
+NRC
+NRL
+NRO
+NRO
NSA
+NSA
+NSCT
+NSG
+NSP
+NSWC
+NTIS
+NTT
+NTT
+nuclear
nuclear
+Nuclear
Nuclear facility
Nuclear threat
Nuevo Leon
number key
+NVD
NWO
+OAU
+Offensive
+Offensive Information
offensive information warfare
oil
Operation Iraqi Freedom
+Oratory
Organized crime
Ortega
+Ortega
+orthodox
Osama
+Oscor
+OSS
+OTP
outage
Outbreak
+package
+package
Pakistan
Palestine Liberation Front
Palestine Liberation Organization
Panama
+Panama
Pandemic
passwd
+passwd
password
+Passwords
+Patel
+PBX
+PCS
+Peering
Peking
+PEM
+penrep
+Perl-RSA
Perl-RSA
PET
+PFS
PGP
-pipeline
+PGP
+PGP
+PGP 2.6.2.
+PGP 5.1
+PGP 5.53
+phinx
Phishing
+Phon-e
+phones
Phreaking
+PI
Pine Gap
+Pine Gap
+pink noise
pink noise
Pipe bomb
+pipeline
Pirates
+Pixar
+PLA
Plague
Plame
Plane
+Planet-1
+Platform
+Playboy
PLF
PLO
Plot
Plume
plutonium
+plutonium
+plutonium
+POCSAG
+Police
Police
Pork
+Porno
+Pornstars
Port
Port Authority
Power
Power lines
Power outage
+PPP
+PPS
pre-emptive
president
+president
+press-release
+Pretoria
Prevention
+primacord
+PRIME
+Privacy
Project Monarch
propaganda
+Propaganda
+PSAC
+Pseudonyms
+Psyops
+PTT
Public Health
Putin
Qaddafi
Quarnantine
quarter
quiche
+quiche
+r00t
+racal
radar
Radiation
Radicals
Radioactive
+RAID
rail gun
+rail gun
+Rand Corporation
Rand Corporation
+Rapid Reaction
+RCMP
+rebels
Recall
+Recce
Recovery
Recruitment
+Red Cell
Red Cross
+redheads
red noise
+Reflection
Relief
+remailers
+ReMOB
+Reno
Reno
+replay
Resistant
Response
+Retinal Fetish
Reynosa
Reyosa
+RFI
+rhost
+rhosts
Ricin
Riot
+RIT
+RL
+rogue
+Rolm
Ron Brown
+Ronco
Rootkit
Roswell
+Roswell
rs9512c
RSA
+RSA
+RSP
Rubin
Ruby Ridge
Rule Psix
Rumsfeld
-S Box
-S Key
+RUOP
+RX-7
+SABC
+SACLANT
Saddam Hussein
+SADF
+SADMS
SAFE
+S.A.I.C.
Salmonella
+Salsa
San Diego
+SAP
SAPO
+SAR
+sardine
+Sardine
Sarin
+SAS
+SASP
+SASR
+Satellite
satellite imagery
+Satellite imagery
Saudi Arabia
SBI
+SBI
+SBIRS
+S Box
+SBS
Scammers
+SCIF
Screening
+screws
SCUD missile
+Scully
SDI
+SDI
+SEAL
SEAL Team 6
Sears Tower
+Sears Tower
+Secert Service
+secret
Secret Service
secure
+Secure
Secure Border Initiative
+Secure Internet
+secure shell
security
+Security
+Security
+Security Consulting
Security Council
+Security Evaluation
+SEL
Semtex
+SEMTEX
Serbian
+SERT
+server
Service disruption
+SETA
+S.E.T. Team
+Sex
+SGC
+SGDN
+SGDN
+SGI
+SHA
SHA
+SHAPE
+Shayet-13
Shell
Shelter-in-place
+SHF
Shooting
Shootout
Shots fired
Sick
+SIG
+SIGDASYS
+SIGDEV
+sigvoice
+siliconpimp
+SIN
Sinaloa
+SIRC
+SISDE
+SISMI
+S Key
+S/Key
Skipjack
+Skytel
+SL-1
Sleet
+SLI
+SLIP
Smallpox
Small Pox
Smart
smuggle
+smuggle
smugglers
Smuggling
+sneakers
+sniper
sniper
Snow
+snuffle
Social media
Somolia
+SONANGOL
Sonora
+SORO
+Soros
+SORT
South Africa
Southwest
Soviet
SP4
Spammer
+Speakeasy
+speedbump
+Spetznaz
+spies
spies
Spillover
+Spoke
+spook
+spook keywords
spy
+Spyderco
+squib
+SRI
SRI
+ssa
+SSCI
+SSL
SSL
+stakeout
+Standford
Standoff
STARLAN
+STARLAN
State of emergency
+Stego
+STEP
+Stephanie
+Steve Case
Steve Case
Storm
Strain
Stranded
strategic
Stuck
+Submarine
subversive
+subversives
Subway
+Sugar Grove
Suicide attack
Suicide bomber
+SUN
+Sundevil
Sundevil
supercomputer
+supercomputer
+SURVIAC
+SUSLO
Suspicious device
Suspicious package
Suspicious substance
+SVR
+SWAT
SWAT
sweep
+sweep
+sweeping
Swine
+SWS
Symptoms
Syria
Taiwan
+Talent
Taliban
Tamaulipas
Tamiflu
@@ -726,67 +1404,136 @@
target
Task Force
TB
+TDM. SUKLO
+TDR
+TDYC
Tehrik-i-Taliban Pakistan
Telecommunications
Telex
+Telex
+TELINT
+TELINT
TELINT
Temblor
tempest
+Templeton
+TEMPSET
Terror
terrorism
+Terrorism Defensive Information
+Terrorism Security
terrorist
+Texas
+TEXTA. ELF
+THAAD
+the
threat
+Ti
+TIE
+Tie-fighter
Tijuana
+Time
+toad
Tony Blair
+Tools
+top
top secret
Tornado
Torreon
Toxic
Trafficking
+transfer
Transportation security
Transportation Security Administration
+TRD
Treasury
Tremor
Trojan
+Trump
+TRW
TSA
+TSCI
+TSCM
Tsunami
Tsunami Warning Center
TTP
Tuberculosis
Tucson
+TUSA
+TWA
TWA
Twister
Typhoon
+UDT
UFO
+UHF
+UKUSA
UMTS
UN
unclassified
+unclassified
+UNCPCJ
undercover
+Undercover
underground
+Underground
United Nations
+unix
+Unix Security
UNSCOM
UOP
+UOP
+USACIL
+USAFA
+USCG
USCG
U.S. Citizenship and Immigration Services
USCODE
+USCODE
+USCOI
USCOI
U.S. Consulate
USDOJ
+USDOJ
+USP
+USP
+USSS
USSS
+utopia
+UT/RUS
+UTU
+UXO
Uzbekistan
Uzi
+Uzi
Vaccine
+veggie
Venezuela
Verisign
+Verisign
+VHF
Vickie Weaver
Vince Foster
+Vinnell
Violence
+VIP
+VIP Protection
+Virii
+virtual
Virual Hemorrhagic Fever
virus
+virus
+VLSI
+VNET
+W3
+Wackendude
+Wackenhutt
Waco, Texas
-War on Terrorism
+Waihopai
+WANK
warfare
Warning
+War on Terrorism
Watch
Water borne
Watergate
@@ -794,19 +1541,40 @@
Weapons cache
Weapons grade
weapons of mass destruction
+Weekly
+Whitehouse
+White House
White House
+white noise
White Powder
+Whitewater
White Water
-Whitehouse
WHO
Wildfire
+William Gates
+WINGS
+wire
wire transfer
WMATA
+words
world domination
+World Domination
World Health Organization
+World News
World Trade Center
Worm
+WORM
+X
+xecutive
+XS4ALL
+Yakima
Yemen
+Yobie
+York
+Yukon
Yukon
Yuma
Zachawi
+Zen
+zip
+zone

[Glenn Morris]

micah wrote:

> +3
[...]
> +a

Mmm, yes, these look suspicious...

As well as adding a bunch of totally normal words like these, this patch
removes existing entries and adds many duplicates. Maybe you could re-do
your patch?

> +AFSPC
> AFSPC
[...]
> anarchy
> +anarchy
> +ANC
> ANC

etc.


Also, is the NSA really case-sensitive?

> dictionary
> +Dictionary
> digicash
> +Digicash

etc.

[Richard Stallman]

Rather than just add keywords, I've decided to add a note to my
mail signature, which you can see below.

--
Dr Richard Stallman
President, Free Software Foundation
51 Franklin St
Boston MA 02110
USA
www.fsf.org www.gnu.org
Skype: No way! That's nonfree (freedom-denying) software.
Use Ekiga or an ordinary phone call.
NSA and FBI agents reading my email: consider whether
defending the US Constitution against all enemies,
foreign or domestic, requires you to follow Snowden's path.

[Glenn Morris]

Version: 24.4

Tidied up and applied.