From fbfdf59d9bd2bced58ca36ba39c37ba9b34f1436 Mon Sep 17 00:00:00 2001
From: "Toerd@iArch" <philip.gaber@gmail.com>
Date: Mon, 10 Dec 2018 21:54:01 +0100
Subject: [PATCH] scrottypotty

---
 etc/ImageMagick-7/policy.xml | 76 ------------------------------------
 fresh.sh                     |  6 ---
 pack.csv                     |  3 +-
 3 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 etc/ImageMagick-7/policy.xml

diff --git a/etc/ImageMagick-7/policy.xml b/etc/ImageMagick-7/policy.xml
deleted file mode 100644
index 1f30588..0000000
--- a/etc/ImageMagick-7/policy.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policymap [
-  <!ELEMENT policymap (policy)+>
-  <!ATTLIST policymap xmlns CDATA #FIXED ''>
-  <!ELEMENT policy EMPTY>
-  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-]>
-<!--
-  Configure ImageMagick policies.
-
-  Domains include system, delegate, coder, filter, path, or resource.
-
-  Rights include none, read, write, execute and all.  Use | to combine them,
-  for example: "read | write" to permit read from, or write to, a path.
-
-  Use a glob expression as a pattern.
-
-  Suppose we do not want users to process MPEG video images:
-
-    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
-
-  Here we do not want users reading images from HTTP:
-
-    <policy domain="coder" rights="none" pattern="HTTP" />
-
-  The /repository file system is restricted to read only.  We use a glob
-  expression to match all paths that start with /repository:
-
-    <policy domain="path" rights="read" pattern="/repository/*" />
-
-  Lets prevent users from executing any image filters:
-
-    <policy domain="filter" rights="none" pattern="*" />
-
-  Any large image is cached to disk rather than memory:
-
-    <policy domain="resource" name="area" value="1GP"/>
-
-  Define arguments for the memory, map, area, width, height and disk resources
-  with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
-  for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
-  exceeds policy maximum so memory limit is 1GB).
-
-  Rules are processed in order.  Here we want to restrict ImageMagick to only
-  read or write a small subset of proven web-safe image types:
-
-    <policy domain="delegate" rights="none" pattern="*" />
-    <policy domain="filter" rights="none" pattern="*" />
-    <policy domain="coder" rights="none" pattern="*" />
-    <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
--->
-<policymap>
-  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
-  <policy domain="resource" name="memory" value="256MiB"/>
-  <policy domain="resource" name="map" value="512MiB"/>
-  <policy domain="resource" name="width" value="16KP"/>
-  <policy domain="resource" name="height" value="16KP"/>
-  <policy domain="resource" name="area" value="128MB"/>
-  <policy domain="resource" name="disk" value="1GiB"/>
-  <!-- <policy domain="resource" name="file" value="768"/> -->
-  <!-- <policy domain="resource" name="thread" value="4"/> -->
-  <!-- <policy domain="resource" name="throttle" value="0"/> -->
-  <!-- <policy domain="resource" name="time" value="3600"/> -->
-  <!-- <policy domain="system" name="precision" value="6"/> -->
-  <!-- not needed due to the need to use explicitly by mvg: -->
-  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
-  <!-- use curl -->
-  <policy domain="delegate" rights="none" pattern="URL" />
-  <policy domain="delegate" rights="none" pattern="HTTPS" />
-  <policy domain="delegate" rights="none" pattern="HTTP" />
-  <!-- in order to avoid to get image with password text -->
-  <policy domain="path" rights="none" pattern="@*"/>
-  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
-</policymap>
diff --git a/fresh.sh b/fresh.sh
index e57ecda..21de9c4 100755
--- a/fresh.sh
+++ b/fresh.sh
@@ -185,11 +185,6 @@ add_xorg_conf() {
     cp $scriptdir/etc/X11/xorg.conf.d/* /etc/X11/xorg.conf.d/ &>> $logfile
 }
 
-add_imagemagick_conf() {
-    echo "Adding image conf\n\n" >> $logfile
-    cp $scriptdir/etc/ImageMagick-7/* /etc/ImageMagick-7/ &>> $logfile
-}
-
 add_udev_rules() {
     echo "Adding udev rules from $scriptdir into udev folder\n\n" >> $logfile
     cp $scriptdir/etc/udev/rules.d/* /etc/udev/rules.d/ &>> $logfile
@@ -227,7 +222,6 @@ set_system_stuff() {
     set_pacman_config
     add_pacman_hooks
     add_xorg_conf
-    add_imagemagick_conf
     set_git_config
     #link syncthing config and move certs
     sudo -u $uname /home/$uname/.dotfiles/syncthing/link-confs.sh &>> $logfile
diff --git a/pack.csv b/pack.csv
index b7cf194..d3139c0 100644
--- a/pack.csv
+++ b/pack.csv
@@ -67,7 +67,6 @@ A,P,xournal,Notetaking and sketching application
 
 # emacs reqs
 A,P,pandoc,A universal document converter
-A,P,imagemagick,emacs screenshots
 
 # Mail
 A,P,mu,Maildir indexer/searcher and Emacs client (mu4e)
@@ -94,7 +93,7 @@ A,P,aspell-de,no desc
 A,P,rsibreak,Prevent me from descroying myself
 
 # Tools
-A,P,flameshot,snipping tool for screenshots and stuff
+A,P,scrot,snipping tool for screenshots and stuff
 A,P,syncthing,tool to sync all my docs
 
 # Programming