Merge remote-tracking branch 'origin/master' into gluglugt60-par/master

9 files changed, 36 insertions, 24 deletions

diff --git a/.config/Makefile b/.config/Makefile
index 94d0cca..9ee3115 100644
--- a/.config/Makefile
+++ b/.config/Makefile
@@ -4,8 +4,8 @@ default: all; @:
 %:
 	. ~/.profile && $(MAKE) '$@'
 else
-SHELL = /bin/bash
 
+SHELL = /bin/bash -o pipefail
 GIT_DIR = ${HOME}/.git
 
 targets = \
@@ -16,10 +16,11 @@ targets = \
 
 all: $(targets)
 clean:
-	rm -f $(targets)
+	rm -f -- $(targets)
+.PHONY: all clean
 
 ${HOME}/.folders: ${HOME}/Maildir $(MAKEFILE_LIST)
-	find $< -mindepth 2 -maxdepth 2 \( -type f -name "maildirfolder" -o -type d -name new -o -type d -name tmp -o -type d -name cur \) -printf '%P\0' | xargs -r0 dirname -z -- | sort -zu | xargs -0 printf -- '.%s\n' | grep -vP '^\.FOLDERS.Ham.20(?!15)' > '$@'
+	find -L $< -mindepth 2 -maxdepth 2 \( -type f -name "maildirfolder" -o -type d -name new -o -type d -name tmp -o -type d -name cur \) -printf '%P\0' | xargs -r0 dirname -z -- | sort -zu | xargs -0 printf -- '.%s\n' | grep -vP '^\.FOLDERS.Ham.20(?!15)' > '$@'
 ${GIT_DIR}/info/exclude: ${HOME}/.git.info.exclude.in $(shell echo .??*/)
 	( cat $<; find $^ -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@
 
@@ -40,7 +41,5 @@ ${HOME}/Maildir/%: | ${HOME}/Maildir
 	touch '$@'/maildirfolder
 
 .DELETE_ON_ERROR:
-.PHONY: FORCE PHONY
-FORCE: ; 
-PHONY: ;
+.SECONDARY:
 endif
diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index 88ae527..ac0d5a8 100644
--- a/.config/X11/clientrc
+++ b/.config/X11/clientrc
@@ -18,9 +18,10 @@ if [ -f "$usermodmap" ]; then
 fi
 
 [ -n "$XDG_RUNTIME_DIR" ] || exit 1
-trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}")" EXIT
-mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}"
+_DISPLAY="$(systemd-escape -- "$DISPLAY")"
+trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}")" EXIT
+mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}"
 
-cat "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" &
-systemctl --user start "wm@${DISPLAY}.target" &
+cat "${XDG_RUNTIME_DIR}/x11-wm@${_DISPLAY}" &
+systemctl --user start "wm@${_DISPLAY}.target" &
 wait
diff --git a/.config/bash/rc.d/aliases.sh b/.config/bash/rc.d/aliases.sh
index 6b2460e..cd2cfd8 100644
--- a/.config/bash/rc.d/aliases.sh
+++ b/.config/bash/rc.d/aliases.sh
@@ -46,7 +46,18 @@ alias userctl='systemctl --user'
 ######################################################################
 alias lock="clear; away -C 'This terminal is locked'"
 alias plock="term-title Terminal Locked;lock"
-mvln() { mv $1 $2; ln -s $2 $1; }
+mvln() {
+	if [[ ! -L "$1" ]]; then
+		libremessages error 'Not a soft link: %s' "$1"
+	fi
+	target=$(readlink -f -- "$1")
+	ln -srT -- "$target" "$2"
+	if cmp -- "$1" "$2"; then
+		rm -f -- "$1"
+	else
+		libremessages error 'Failed moving link: %s -> %s' "$1" "$2"
+	fi
+}
 jarls() { jar tf "$1" | sed -n 's/\.class$//p' | LC_ALL=C sort | xargs -r -d $'\n' javap -classpath "$1"; }
 tarls() { local file; for file in "$@"; do bsdtar tf "$file" | sed "s|^|$file:|"; done; }
 jarmain() { jarls "$1" 2>/dev/null | grep -E '(^[a-z]|public static void main\(java\.lang\.String\[\]\))' | grep -B1 '^ '; }
diff --git a/.config/libretools/.gitignore b/.config/libretools/.gitignore
deleted file mode 100644
index 1881962..0000000
--- a/.config/libretools/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-blacklist.txt
diff --git a/.config/libretools/libretools.conf b/.config/libretools/libretools.conf
new file mode 100644
index 0000000..a2f2c24
--- /dev/null
+++ b/.config/libretools/libretools.conf
@@ -0,0 +1,4 @@
+HOOKPOSTRELEASE=":"
+if [[ -n "${ONLY_ARCH:-}" ]]; then
+	ARCHES=("$ONLY_ARCH")
+fi
diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc
index 98ef8ae..792b42c 100644
--- a/.config/maildirproc/att.rc
+++ b/.config/maildirproc/att.rc
@@ -13,15 +13,14 @@ def mailman_domain(mail, domain):
 	"""
 	Return a string that is the list-name for a mailman domain
 	"""
-	m = mail["List-Id"].matches("(.*<)?([^<]*)\."+re.escape(domain))
+	m = mail["List-Id"].matches("^(.*<|)([^<]*)\."+re.escape(domain))
 	if m:
-		if mail["Subject"].contains("["+m.group(2)+"]"):
-			return m.group(2)
+		return m.group(2)
 	for hdr in [ 'To', 'Cc', 'From' ]:
-		m = mail[hdr].matches("(\w*)@"+re.escape(domain))
+		m = mail[hdr].matches("((\w|-)*)@"+re.escape(domain))
 		if m:
 			if mail["Subject"].contains("["+m.group(1)+"]"):
-				return m.group(2)
+				return m.group(1)
 	return None
 
 def is_to_or_from(mail,address):
@@ -97,6 +96,7 @@ def handle_incoming_unknown(mail):
 		or mail["From"].contains("@gandi.net")
 		or mail["From"].contains("@github.com>")
 		or mail["From"].contains("@goodwillindy.org>")
+		or mail["From"].contains("@kickstarter.com>")
 		or mail["From"].contains("@lpi.org>")
 		or mail["From"].contains("@msdlt.k12.in.us>")
 		or mail["From"].contains("@parabola.nu")
@@ -295,6 +295,7 @@ def my_filters(mail):
 		"@core3.amsl.com",
 		"@defectivebydesign.org",
 		"@eff.org",
+		"@fedorahosted.org",
 		"@foocorp.net",
 		"@fsf.org",
 		"@github.com",
@@ -303,6 +304,7 @@ def my_filters(mail):
 		"@gnu.org",
 		"@ietf.org",
 		"@kde.org",
+		"@lists.fedorahosted.org",
 		"@nongnu.org",
 		"@sourceforge.com",
 		"@thyrsus.com",
diff --git a/.config/pacman/makepkg.conf b/.config/pacman/makepkg.conf
index 8389fb5..dc3c5ba 100644
--- a/.config/pacman/makepkg.conf
+++ b/.config/pacman/makepkg.conf
@@ -1,4 +1,4 @@
-#!/phony/bash
+#!/hint/bash
 
 PKGDEST="${LIBREHOME:-$HOME}/packages/pkgdest"
 SRCDEST="${LIBREHOME:-$HOME}/packages/srcdest"
diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh
index 6846920..4b968b0 100644
--- a/.config/wmii-hg/config.sh
+++ b/.config/wmii-hg/config.sh
@@ -68,9 +68,7 @@ Event() {
 		## WMII-meta events
 		Quit) ## No args
 			trap - EXIT
-			if [ -S "$NOTIFY_SOCKET" ]; then
-				echo STOPPING=1 | socat STDIO UNIX-SENDTO:"$NOTIFY_SOCKET"
-			fi
+			systemd-notify STOPPING=1 || true
 			Event WmiircUnmount
 			Event WmiircQuit;;
 		Warning) ## $@=string
diff --git a/.config/wmii-hg/wmiirc b/.config/wmii-hg/wmiirc
index 260aaa1..379de79 100755
--- a/.config/wmii-hg/wmiirc
+++ b/.config/wmii-hg/wmiirc
@@ -13,9 +13,7 @@ wmiir xwrite /event WmiircQuit # close any existing wmiirc's
 
 Event WmiircStart
 # Notify systemd that we're ready
-if [ -S "$NOTIFY_SOCKET" ]; then
-	echo READY=1 | socat STDIO UNIX-SENDTO:"$NOTIFY_SOCKET"
-fi
+systemd-notify READY=1 || true
 
 trap "Event Quit" EXIT