Merge remote-tracking branch 'gitlab/updates'

.mailmap

@@ -9,4 +9,5 @@ d1rt <[email protected]> d1rt <[email protected]>
 d1rt <[email protected]> d1rt <d1rt>
 d1rt <[email protected]> d1rt <[email protected]>
 d1rt <[email protected]> plxsert <plxsert@plxsert>
-Cthulu201 <[email protected]> <cthulu201 AT gmail DOT com>
+Cthulu201 <[email protected]> Cthulu201 <[email protected]>
+Cthulu201 <[email protected]> Mike Henze <[email protected]>

packages/acpi_call-archassault/PKGBUILD

@@ -5,14 +5,14 @@
 
 pkgname=acpi_call-archassault
 pkgver=1.1.0
-pkgrel=1
-_extramodules=extramodules-3.17-archassault
+pkgrel=2
+_extramodules=extramodules-3.18-archassault
 pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call'
 arch=('i686' 'x86_64')
 url="http://github.com/mkottman/${pkgname%-*}"
 license=('GPL')
-depends=('linux-archassault>=3.17')
-makedepends=('linux-archassault-headers>=3.17')
+depends=('linux-archassault>=3.18')
+makedepends=('linux-archassault-headers>=3.18')
 provides=("${pkgname%-*}")
 install="${pkgname%-*}.install"
 source=("${url}/archive/v${pkgver}.tar.gz")

packages/acpi_call-archassault/acpi_call.install

@@ -1,5 +1,5 @@
 post_install() {
-  _extramodules=extramodules-3.17-archassault
+  _extramodules=extramodules-3.18-archassault
   depmod $(cat /usr/lib/modules/${_extramodules}/version)
 }
 

packages/afflib/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: ArchAssault <[email protected]>
 pkgname=afflib
 pkgver=3.7.4
-pkgrel=3
+pkgrel=4
 groups=('archassault' 'archassault-forensics')
 pkgdesc="An extensible open format for the storage of disk images and related forensic information"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')

packages/aiengine/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: ArchAssault <team archassault.org>
 pkgname=aiengine
-pkgver=1.0
-pkgrel=3
+pkgver=1.1
+pkgrel=1
 groups=('archassault' 'archassault-networking')
 pkgdesc="A packet inspection engine with capabilities of learning without any human intervention."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -12,9 +12,9 @@ if [[ $CARCH == 'x86_64' ]]; then
 else 
      makedepends=('boost' 'boost-bloom-filters-git' 'log4cxx' 'python2' 'gcc-libs')
 fi
-depends=('libpcap' 'boost-libs' 'python2')
+depends=('libpcap' 'boost-libs' 'python2' 'pcre')
 source=("https://bitbucket.org/camp0/aiengine/downloads/aiengine-$pkgver.tar.gz")
-sha512sums=('24c5cc2782229c6597fff07ffcb57945b362b7af20e762f23cb30bdcedebd80c4d9931ab63b5a47d30f61a813c2833b8955472fd97ab0689f6e7b195aaf150a5')
+sha512sums=('9dcb5e21118db352ed2f13dd6f204d880e4eac578c4bba04ead4ff60e01d91be9b98ba1349c247441822aadac1431396741728ccae524ba8f60c6530c433082e')
 
 prepare(){
    grep -iRl 'python' "$srcdir/aiengine-$pkgver" | xargs sed -i 's|#!.*/usr/bin/python|#!/usr/bin/python2|;s|#!.*/usr/bin/env python$|#!/usr/bin/env python2|'
@@ -24,7 +24,7 @@ build() {
   cd $srcdir/aiengine-$pkgver
   ./autogen.sh
   export PYTHON=/usr/bin/python2.7
-  ./configure --prefix=/usr --enable-adaptor --enable-bloomfilter --enable-fscompress
+  ./configure --prefix=/usr --enable-adaptor --enable-bloomfilter --enable-fscompress --with-pic
   make
 }
 

packages/airgraph-ng-svn/PKGBUILD

@@ -1,15 +1,18 @@
 # Maintainer: ArchAssault <[email protected]>
-pkgname=airgraph-ng
-pkgver=2459
+pkgname=airgraph-ng-svn
+pkgver=2466
 pkgrel=1
 pkgdesc="Graphing tool for the aircrack suite"
 arch=('any')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
 depends=('graphviz' 'python2')
 makedepends=("subversion")
-groups=('archassault' 'archassault-misc')
+groups=('archassault' 'archassault-miscellaneous')
 source=('svn+http://svn.aircrack-ng.org/trunk/scripts/airgraph-ng' 'airgraph-ng.desktop')
+provides=('airgraph-ng')
+conflicts=('airgraph-ng')
+replaces=('airgraph-ng')
 sha512sums=('SKIP'
             '9415be15bdcaa9b3644838929e88e19745392c2eeaab132db81b15d8b74389bbb0552c8b540f02706fc063a06bf24a9ac4545fd667e870e031326d1b2fd1631d')
 

packages/allthevhosts/PKGBUILD

@@ -1,24 +1,26 @@
 # Maintainer: ArchAssault <[email protected]>
 pkgname=allthevhosts
 pkgver=1.0
-pkgrel=2
-groups=('archassault' 'archassault-scanners' 'archassault-webapp')
+pkgrel=3
+groups=('archassault' 'archassault-scanners' 'archassault-reconnaissance' 'archassault-webapps')
 pkgdesc="A vhost discovery tool that scrapes various web applications"
 arch=('any')
 url="http://labs.portcullis.co.uk/tools/finding-all-the-vhosts/"
 license=('custom')
 depends=('python2' 'python2-beautifulsoup4')
-source=("http://labs.portcullis.co.uk/download/allthevhosts.tar.gz" 'allthevhosts.desktop')
-md5sums=('be3c25a78d89f9b5234689250824fbed'
-         '115d4e61bf69aba0ebcd1774d1230096')
+source=("http://labs.portcullis.co.uk/download/${pkgname}.tar.gz" "${pkgname}.desktop" "${pkgname}.py.patch")
+sha512sums=('18e29cd7ced958ee0d2753088fdbd2073abcf48b35601a0405a5d6ad2dc1a35ce1b933c6952131909b283ea607ec5a718a7d879cf1b732b3908d9551af73e758'
+            '556d7eeb2f8fc1a968470390299152bdc6401fc51e04436eb5bb5ce41d0b36d252dacce3c3ba61c3131740041516ece99020319923bc2064ee4081f31351f626'
+            '2dac2f6a59d3c9c98fb7882ef4bb6c72d5897d06f216c3291aa85463a43277fe1c243a43df2e3b78489b68f04c8de9ec819f5a2fc8c9f4353ee6d1b4ce8f6da8')
 
 prepare() {
-  cd "$srcdir"
-  sed -i '1i\#!/usr/bin/env python2' allthevhosts.py
+  cd "${srcdir}"
+  sed -i '1i\#!/usr/bin/env python2' ${pkgname}.py
+  patch < ${pkgname}.py.patch
 }
 
 package() {
-  cd "$srcdir"
-  install -Dm644 "$srcdir/allthevhosts.desktop" "$pkgdir/usr/share/applications/allthevhosts.desktop"
-  install -Dm755 allthevhosts.py "$pkgdir/usr/bin/allthevhosts"
+  cd "${srcdir}"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm755 ${pkgname}.py "${pkgdir}/usr/bin/${pkgname}"
 }

packages/allthevhosts/allthevhosts.py.patch

@@ -0,0 +1,17 @@
+--- allthevhosts.py	2015-02-17 22:30:13.821814743 -0500
++++ allthevhosts.patched.py	2015-02-17 22:35:33.577725292 -0500
+@@ -80,9 +80,12 @@
+
+ def yougetsignal():
+ 	print "[-] searching yougetsignal...",
+-	req = urllib2.Request(url='http://www.yougetsignal.com/tools/web-sites-on-web-server/php/get-web-sites-on-web-server-json-data.php',data='remoteAddress='+ip+'&key=')
++	req = urllib2.Request(url='http://domains.yougetsignal.com/domains.php',data='remoteAddress='+ip+'&key=&_=')
+ 	req.add_header('Referer', 'http://www.yougetsignal.com/tools/web-sites-on-web-server/')
+-	req.add_header('User-Agent', 'firefox')
++	req.add_header('Origin', 'http://www.yougetsignal.com')
++	req.add_header('User-Agent', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.111 Safari/537.36') 
++	req.add_header('X-Prototype-Version', '1.6.0') 
++	req.add_header('X-Requested-With', 'XMLHttpRequest')
+ 	search = urllib2.urlopen(req)
+ 	results = json.load(search)
+ 	try:

packages/american-fuzzy-lop/PKGBUILD

@@ -1,31 +1,45 @@
 # Maintainer: ArchAssault <team archassault org>
+
 pkgname=american-fuzzy-lop
-pkgver=0.96b
+pkgver=1.57b
 pkgrel=1
 groups=('archassault' 'archassault-fuzzers')
-pkgdesc="A practical, instrumentation-driven fuzzer for binary formats" 
-arch=('i686' 'x86_64')
+pkgdesc="A practical, instrumentation-driven fuzzer for binary formats"
+arch=('i686' 'x86_64' 'armv7h')
 url="http://lcamtuf.coredump.cx/afl/"
 license=('APACHE')
 depends=('bash')
 options=('!strip')
 source=("http://lcamtuf.coredump.cx/afl/releases/afl-${pkgver}.tgz" "makefile.patch")
-sha512sums=('e5869c97a101bd75bbfdabb51ba7d50477f478616f00d31a9a9d7f25a9cf869b40029dd40f9372d056d285921a9942f57865fc48af89f64a004c4682ad346964'
+sha512sums=('87d29ee22c7d097c672c106cc2eeac2fa26de646f2539e46444640c836887f8a4c7188e7bc30ab43d1a94b340bd55aaeea25171531d09331393395b0156e9cda'
             '33e8838fb4f9dfc312753dcc59e94086abf26607614a6bf31ec0a5fe06d891f84d931766f9f07b94b29cdefe6b8e736cb4ab3b1ce4f9af4148bc750de279c485')
 
 prepare(){
  cd "$srcdir/afl-$pkgver"
  patch < $srcdir/makefile.patch
 }
-  
+
 build() {
   cd "$srcdir/afl-$pkgver"
-  make
+  if [[ $CARCH == "armv7h" ]] || [[ $CARCH == "armv6h" ]]; then
+     cp  experimental/arm_support/*.c .
+     cp  experimental/arm_support/*.h .
+     sed -i '/__asm__/d' Makefile
+     export CFLAGS='-Wcpp -fstack-protector-strong'
+     make
+  else
+     make
+  fi
 }
 
 package() {
   cd "$srcdir/afl-$pkgver"
   install -dm755 $pkgdir/usr/bin
   install -dm755 $pkgdir/usr/lib/afl
-  make DESTDIR=$pkgdir install 
+  if [[ $CARCH == "armv7h" ]] || [[ $CARCH == "armv6h" ]]; then
+        export CFLAGS='-Wcpp -fstack-protector-strong'
+        make DESTDIR=$pkgdir install
+  else
+        make DESTDIR=$pkgdir install
+  fi
 }

packages/apache-tika/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: ArchAssault <[email protected]>
 # Contributor: Filip Gralinski <[email protected]>
 pkgname=apache-tika
-pkgver=1.5
+pkgver=1.7
 pkgrel=1
 pkgdesc="Toolkit for detecting and extracting metadata and structured text content"
 arch=('any')
@@ -10,7 +10,7 @@ url="https://tika.apache.org"
 depends=('java-environment' 'bash')
 noextract=(tika-server-${pkgver}.jar)
 source=("http://central.maven.org/maven2/org/apache/tika/tika-server/$pkgver/tika-server-$pkgver.jar" "apache-tika.service")
-sha512sums=('981b14e2aadec7c1c34bddf72132384c3cbbaad93bea9a51168c742d08298d09a2a6b0c62bd46de254e64e6faf9d72eb90569e8bd6876c0a5aa32c7ac3eb36b7'
+sha512sums=('54eafab0c129cbba9f49555b1f8eb1789bf6f8ea44a29b7b11786b4877fba6de60709ffbf31898128fb70699348864e934a3bf2455a64407909bcbaa5d0953a5'
             '9d104dcb5c9cb545f5e21121bbdb6e1f8b2eaa533f951e1bc681cb71f5105b15020a330a81a59926c5790bfd12b80cbf1c733df6e974fb7fea3e1a469433f0ae')
 
 package() {

packages/archassault-artwork/PKGBUILD

@@ -2,7 +2,7 @@
 
 _pkgname=archassault
 pkgname=${_pkgname}-artwork
-pkgver=0.4
+pkgver=0.5
 pkgrel=1
 groups=('archassault' 'archassault-misc')
 pkgdesc="The ArchAssault Project's collection of logos, backgrounds, icons, and other artwork"

packages/archassault-devtools/PKGBUILD

@@ -3,33 +3,47 @@
 # Contributor ALARM: Kevin Mihelich <[email protected]>
 pkgname=archassault-devtools
 _pkgname=devtools
-pkgver=20140108
-pkgrel=2
+pkgver=20141224
+pkgrel=5
+epoch=1
 pkgdesc='Tools for ArchAssault i686 & x86_64 package maintainers'
-arch=('armv6h' 'armv7h' 'i686' 'x86_64')
-groups=('archassault-dev')
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('devtools')
-source=('pacman-archassault-x86_64.conf' 
-		'pacman-archassault-i686.conf' 
-		'makepkg.i686.conf' 
-		'makepkg.x86_64.conf'
-		)
-sha256sums=('7a6840e39bcfaaec2e9da61ad26c38663dd7a91efcc2e93b9ccfd7e3f994298c'
-		'a8b6bb4f6f23b333a3fe35b894b36c3ffc98e9af3f68d1a6df16ad27d71515b2'
-		'9a44ac0dadb73173a9602a5c69010423acb9d5fd5b17f197331881c229d59e05'
-		'f90a11ba0c3f6eed2897a7df810a47c1a88007306d9193507a7a1376fd7fa359')
+conflicts=('devtools')
+provides=('devtools')
+depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
+source=("https://sources.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
+        'https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch'
+        'https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch'
+        'https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch'
+        'pacman-archassault-i686.conf' 'pacman-archassault-x86_64.conf'
+        'noprogressbar_namcap.patch')
+sha512sums=('50c68414fe70bf5bdab5674b047173fb7bd042b25668602bc2937ac3a1fc43702e8e971e20881c42926b013e4c5550326f9cbd7ea9731fe94306f38adcf417b8'
+            '5bd22f3fbb1d368bc7c1bbf7efc30d30072c7eaea225072d23f329774c56e3f765ac7517d99f9927a2c7335589490b0802678189f7c8c8763d4129f0a97696ce'
+            'c7c5b74f6bf91df96d423b9596ddabd4a2fbd178c697b45fc9902b803663bdcfe368ab05b6d40afc1d2a8511ef4d72cc7eb27ba5e86c601a2aa2cf098dea5312'
+            '3ea99c21bf62df72084f457a9f037244521fa0b3c5fac61d8a92231c542d0b8c155f8ba077519a0eafcaa4f3701827c33c191dd6b8ae4151b4fd5a337b672260'
+            '328b7fc035842ff01161b36e51cdabc477e9a86add182ce0ca65938dc3f644029412774af964180670687f6b123c4ce7701d229d40fad5b0c0621d4421076bbb'
+            'e81ffe40661d0e8b25d4a5818493e8882950c2cc729e2c257105266b1bbc81469263ed78237782c8f3787bb30b12cf41dcf009a68a53db0a73de8128376b0fb3'
+            '7fc472f8a6d02cd92f73cb225e1965b6de61516bdb993113d23abfb821ec0d658e2c09902b8478538e2f58d0ecc77546951bfb3a163a494defd880f63982071b')
+
+prepare() {
+  cd "${_pkgname}-${pkgver}"
+  patch -p1 -i ../0001-makechrootpkg-cache-dir.patch
+  patch -p1 -i ../0003-makechrootpkg-distcc.patch
+  patch -p1 -i ../0005-makechrootpkg-no-default-logging.patch
+  patch -p1 -i ../noprogressbar_namcap.patch
+}
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+  make PREFIX=/usr
+}
 
 package() {
-	install -dm755 "${pkgdir}/usr/bin"
-		ln -s archbuild "${pkgdir}/usr/bin/archassault-x86_64-build"
-		ln -s archbuild "${pkgdir}/usr/bin/archassault-i686-build"
-		ln -s archbuild "${pkgdir}/usr/bin/archassault-testing-x86_64-build"
-		ln -s archbuild "${pkgdir}/usr/bin/archassault-testing-i686-build"
-		install -dm755 "${pkgdir}/usr/share/devtools"
-		install -m644 "${srcdir}/pacman-archassault-i686.conf" "${pkgdir}/usr/share/devtools/"
-		install -m644 "${srcdir}/pacman-archassault-x86_64.conf" "${pkgdir}/usr/share/devtools/"
-		install -m644 "${srcdir}/makepkg.x86_64.conf" "${pkgdir}/usr/share/devtools/"
-		install -m644 "${srcdir}/makepkg.i686.conf" "${pkgdir}/usr/share/devtools/"
+  cd "${_pkgname}-${pkgver}"
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+  install -dm0755 "${pkgdir}"/usr/share/archassault-devtools/
+  install -Dm0644 "${srcdir}"/pacman-archassault-*.conf "${pkgdir}"/usr/share/archassault-devtools/
+
 }
 

packages/archassault-devtools/noprogressbar_namcap.patch

@@ -0,0 +1,12 @@
+diff -aur devtools-20141224/makechrootpkg.in devtools-mod/makechrootpkg.in
+--- devtools-20141224/makechrootpkg.in	2014-12-24 07:56:41.000000000 -0800
++++ devtools-mod/makechrootpkg.in	2015-02-04 14:56:55.747455408 -0800
+@@ -273,7 +273,7 @@
+
+ 		if $run_namcap; then
+ 			cat <<'EOF'
+-pacman -S --needed --noconfirm namcap
++pacman -S --needed --noconfirm --noprogressbar --color never namcap
+ for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
+ 	echo "Checking ${pkgfile##*/}"
+ 	sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"

packages/archassault-devtools/pacman-archassault-i686.conf

@@ -68,9 +68,6 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[archassault]
-Server = http://s3-us-west-2.amazonaws.com/archassault/$repo/os/$arch
-
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -86,22 +83,8 @@ 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
+#[archassault]
+#Server = https://repo.archassault.org/archassault/$repo/os/$arch
 
-#[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
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/gusterson/pkgs/
-#Server = http://192.168.81.19
 

packages/archassault-devtools/pacman-archassault-x86_64.conf

@@ -68,9 +68,6 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[archassault]
-Server = http://s3-us-west-2.amazonaws.com/archassault/$repo/os/$arch
-
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -92,16 +89,11 @@ Include = /etc/pacman.d/mirrorlist
 #[multilib-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[multilib]
-Include = /etc/pacman.d/mirrorlist
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+#[archassault]
+#Server = https://repo.archassault.org/archassault/$repo/os/$arch
+
 
-# 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
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/gusterson/pkgs/
-#Server = http://192.168.81.19