porting in updated changes from bash branch (master)

extra/mirrorlist

@@ -1,7 +1,7 @@
-# Server list generated by rankmirrors on 2015-02-26
+# Server list generated by rankmirrors on 2016-07-09
+Server = http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch
 Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
-Server = http://mirror.umd.edu/archlinux/$repo/os/$arch
-Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch
-Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch
-Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
+Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch
 Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch
+Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch
+Server = http://arch.mirrors.ionfish.org/$repo/os/$arch

extra/packages.both

@@ -43,7 +43,7 @@ cpio
 cpuburn
 cpupower
 crackpkcs12
-#cryptcat
+cryptcat
 cryptsetup
 csync2
 customizepkg-scripting
@@ -54,7 +54,7 @@ dd_rescue
 dd_rhelp
 debianutils
 debootstrap
-dialog
+#dialog #giving a weird dependency issue
 diffutils
 djohn
 dmidecode
@@ -107,6 +107,7 @@ gptfdisk
 gst-libav
 gst-plugins-ugly
 hashcat
+hashdeep
 hddtemp
 hdparm
 hexcurse
@@ -140,23 +141,38 @@ keyutils
 kismet-allplugins
 lftp
 links
-#logkeys
-logkeys-keymaps
+#logkeys-git # requires a /dev/input, which apparently isn't included in the chroots
 lm_sensors
 lrzsz
 lshw
-lsiutil
+#lsiutil # giving intermittent errors when trying to fetch source
 lsof
 lsscsi
-lxde
+#lxde # apacman currently doesn't like package groups, so...
+gpicview
+lxappearance
+lxappearance-obconf
+lxde-common
+lxde-icon-theme
+lxdm
+lxinput
+lxlauncher
+lxmusic
+lxpanel
+lxrandr
+lxsession
+lxtask
+lxterminal
+openbox
+pcmanfm
+# end lxde
 lynx
 #lzip
 macchanger
-magicrescue
+#magicrescue # no longer maintained, upstream down
 mbr
 mbuffer
 mcelog
-md5deep
 mdadm
 mdcrack
 # superseded by storcli
@@ -164,11 +180,10 @@ mdcrack
 memtester
 mfoc
 minicom
-mondo
+#mondo # mindi-busybox fails to build 09.23.2016
 mtd-utils
 mtr
 mtree
-#mtx
 multipath-tools
 myrescue
 nbd
@@ -208,20 +223,19 @@ php
 php-fpm
 php-gd
 php-mcrypt
-#phrasendrescher
+phrasendrescher
 pigz
 pkgfile
 pkgtools
 ppp
 pptpclient
-prebootloader
 procinfo-ng
 procps-ng
 progsreiserfs
 psmisc
 pwgen
 pixz
-pyrit-svn
+pyrit
 python2-gnuplot
 python2-pyx
 rarcrack
@@ -239,6 +253,7 @@ rsnapshot
 rygel
 safecopy
 samba
+scalpel-git
 scapy
 screen
 scrounge-ntfs
@@ -254,7 +269,7 @@ smartmontools
 smbclient
 s-nail
 socat
-#star ## do people even USE tape packups anymore?
+#star ## do people even USE tape backups anymore?
 storcli
 strace
 stress
@@ -271,7 +286,7 @@ thttpd
 tmon
 tmux
 tre
-truecrack-svn
+truecrack-git
 truecrypt
 tor
 udftools
@@ -296,7 +311,7 @@ vncrack
 vnstat
 vpnc
 weplab
-whdd
+#whdd #currently depends on dialog, which is broke as shit
 whois
 wifite-mod-pixiewps-git
 wipe

extra/pre-build.d/32/etc/pacman.conf

@@ -0,0 +1,95 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = i686
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+UseSyslog
+Color
+TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+#SigLevel    = Required DatabaseOptional #RE-ENABLE ME WHEN A NEW SNAPSHOT IS RELEASED WITH FIXED GPG
+SigLevel    = Never
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#[archlinuxfr]
+#SigLevel = Never
+#Server = http://repo.archlinux.fr/$arch

extra/pre-build.d/64/etc/pacman.conf

@@ -0,0 +1,104 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = x86_64
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+UseSyslog
+Color
+TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+#SigLevel    = Required DatabaseOptional #RE-ENABLE ME WHEN A NEW SNAPSHOT IS RELEASED WITH FIXED GPG
+SigLevel    = Never
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+#[archlinuxfr]
+#SigLevel = Never
+#Server = http://repo.archlinux.fr/$arch

extra/pre-build.d/etc/apacman.conf

@@ -11,27 +11,26 @@
 #buildonly=1
 #cachevcs=1
 #ignorearch=1
-#needed=1
+#keepkeys=1
+needed=1
+#noaur=1
 noconfirm=1
 noedit=1
-#noaur=1
-#noconfirm=1
-#noedit=1
-#nofail=1
+nofail=1
 #preview=1
-#purgebuild=1
+progress=1
+purgebuild=1
 #quiet=1
-#skipcache=1
-skipinteg=1
+skipcache=1
+#skipinteg=1
 #skiptest=1
 #warn=1
-#tmpdir=/var/tmp/apacman
-#TMPDIR=/var/tmp/apacman
 
 #
 # CONFIGURATION
 #
 
+#builddir="/tmp/pkgbuild-$UID"
 #tmpdir="/tmp/apacmantmp-$UID"
 #makepkgconf="/etc/makepkg.conf"
 #usermakepkgconf="$HOME/.makepkg.conf"
@@ -39,19 +38,21 @@ skipinteg=1
 #downdir="/var/cache/pacman/pkg"
 #savedir="/var/cache/apacman/pkg"
 #editor="nano -w"
-editor="vim"
+#pager="less -R"
 #RPCURL="https://aur.archlinux.org/rpc.php?type"
 #PKGURL="https://aur.archlinux.org"
+#WEBURL="https://www.archlinux.org"
 #ABSURL="rsync.archlinux.org"
 
 #
 # COLORIZATION
 #
 
-COLOR1='\e[1;39m'
-COLOR2='\e[1;32m'
-COLOR3='\e[1;35m'
-COLOR4='\e[1;36m'
-COLOR5='\e[1;34m'
-COLOR6='\e[1;33m'
-COLOR7='\e[1;31m'
+#COLOR1='\e[1;39m'
+#COLOR2='\e[1;32m'
+#COLOR3='\e[1;35m'
+#COLOR4='\e[1;36m'
+#COLOR5='\e[1;34m'
+#COLOR6='\e[1;33m'
+#COLOR7='\e[1;31m'
+

extra/pre-build.d/etc/customizepkg.d/autopsy

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# original URL at sourceforge chokes out
+sed -re 's@^(source=\(").*$@\1ftp://ftp.gnome.org/mirror/temp/sf2015/a/au/autopsy/autopsy/2.24/autopsy-2.24.tar.gz")@g' ${1}

extra/pre-build.d/etc/customizepkg.d/etc-update

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -re 's/^(url=)\((.*)\)$/\1\2/g' ${1}

extra/pre-build.d/etc/customizepkg.d/fang

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -re 's/^(url=)\((.*)\)$/\1\2/g' ${1}

extra/pre-build.d/etc/customizepkg.d/libnfc

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i -re 's/^(url=)\((.*)\)$/\1\2/g' ${1}

extra/pre-build.d/etc/customizepkg.d/ms-sys

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# original URL at sourceforge chokes out
+sed -re 's@^(source=\(").*$@\1http://fossies.org/linux/privat/${pkgname}-${pkgver}.tar.gz")@g' ${1}

extra/pre-build.d/etc/mkinitcpio.conf

@@ -64,4 +64,4 @@ COMPRESSION="xz"
 
 # COMPRESSION_OPTIONS
 # Additional options for the compressor
-#COMPRESSION_OPTIONS=""
+COMPRESSION_OPTIONS="-9"

extra/pre-build.d/etc/pacman.d/mirrorlist

@@ -1,7 +1,6 @@
-# Server list generated by rankmirrors on 2014-11-10
-Server = http://mirror.rit.edu/archlinux/$repo/os/$arch
-Server = http://mirror.cc.columbia.edu/pub/linux/archlinux/$repo/os/$arch
-Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch
-Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch
-Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch
-Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch
+Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
+Server = http://mirrors.gigenet.com/archlinux/$repo/os/$arch
+Server = http://il.mirrors.linaxe.net/archlinux/$repo/os/$arch
+Server = http://mirror.grig.io/archlinux/$repo/os/$arch
+Server = http://arch.mirrors.ionfish.org/$repo/os/$arch
+Server = http://cosmos.cites.illinois.edu/pub/archlinux/$repo/os/$arch