Merge branch 'testing'

Conflicts:
	repo/tunneling/ctunnel/PKGBUILD
	repo/voip/sipvicious/PKGBUILD
	repo/www/burpsuite/PKGBUILD

docs/BUILD.md

@@ -0,0 +1,146 @@
+Prerequisites
+=============
+
+First of all we **highly** recommend to execute the build process by
+using a normal user account. Avoid root super powers here, since
+permission errors triggered by various PKGBUILDs might exist.
+
+Before proceeding, be sure to have:
+
+- kernel26-pwn installed
+- grub installed (preferably grub-gfx)
+
+After that, you have to regen aufs2 from lkm-skel/ and install it before
+proceeding with the build of aufs2-util.
+
+At the end you should have these packages installed:
+
+- kernel26-pwn
+- aufs2 (-pwn tainted)
+
+You should keep these packages installed until explictly indicated.
+
+Duplicated packages
+===================
+
+There are various duplicates packages in lkm-skel/ directory.
+
+- aufs2 and aufs-util:
+
+    Remember that these two packages (aufs2 and aufs2-util) are kept in
+    lkm-skel/ due to the absence of KDIR tricks in aufs2-util build
+    process. This is the only difference between our version and the ABS
+    one.
+
+    If a newer version is present in ABS be sure to sync it before the
+    release.
+
+- tiacx
+
+    The only difference is the patch provided by aircrack team. So take
+    care to take synced this package too.
+
+- open-vm-tools-modules and virtualbox-ose
+
+    Some customization to make the build process suitable to create
+    modules for our tainted kernel.
+
+Local Modules
+=============
+
+Before each release be sure to:
+
+- Update the kernel accordingly
+- Sync duplicated modules with ABS
+
+After that generate fresh PKGBUILDs from lkm-skel/ by using:
+
+    $ module-rebuild -a repo/lkm-skel repo/regen-modules
+    $ pkg-builder -x repo/regen-modules/ pacman/src/ pacman/pkg/
+
+Extra modules
+=============
+
+ArchPwn depends on various external modules. This is a brief list
+(extracted from the forced list of module-rebuild tool):
+
+- aufs2
+- aufs2-util
+- vhba-module
+- fcpci
+- intel-536ep
+- intel-537
+- martian
+- slmodem
+- virtualbox-ose
+
+Of course every module is taken from ABS tree, so you need to sync your
+ABS tree before proceed:
+
+    $ sudo abs
+    $ module-rebuild /var/abs repo/regen-modules/
+    modulerebuild - >>> - These are the packages that depends on kernel26
+    modulerebuild - >>> -          ndiswrapper => done
+    modulerebuild - >>> -                aufs2 => done
+    modulerebuild - >>> -            intel-537 => done
+    modulerebuild - >>> -              slmodem => done
+    modulerebuild - >>> -              martian => done
+    modulerebuild - >>> -                fcpci => done
+    modulerebuild - >>> -               nvidia => done
+    modulerebuild - >>> -          intel-536ep => done
+    modulerebuild - >>> -            compcache => done
+    modulerebuild - >>> -          vhba-module => done
+    ...
+
+    $ pkg-builder -x repo/regen-modules/ pacman/src/ pacman/pkg/
+
+After that you should be ready for the next phase.
+
+Create your ISO
+===============
+
+At this point everything is done trough a script called mkarchiso. This
+requires to have a kernel with aufs2 module installed. So the possible
+solutions are:
+
+- proceed with your -ARCH kernel
+- use your shiny -PWN kernel
+
+The first options is the best since it doesn't require any module
+rebuild and doesn't impact your system in any way. By the way, it's not
+all gold. You have to remove aufs2-\* packages (-pwn tainted) that you
+have installed in the earlier phases:
+
+    # pacman -Rd aufs2 aufs2-utils
+    # rm /var/cache/pacman/aufs2*
+    # pacman -S extra/aufs2 extra/aufs2-util
+    # rm /var/cache/pacman/aufs2*
+
+Did you see any duplicated lines? Well they are not duplicated. Since
+the package names of the -pwn version and the -ARCH version are the same
+you have to be sure to clean up the pacman cache to avoid package
+corruption in the install phase.
+
+Another requirement for mkarchiso script is mksquashfs binary provided
+by squashfs-tools PKGBUILD (it's located in repo/base).
+
+    # pacman -U pacman/pkg/squashfs-tools-*
+
+Build your profile
+------------------
+
+mkarchiso script provide a flexible way to customize your iso. You could
+easilly define a profile and build it without touching or polluting
+anything. ArchPwn is organized in two profiles:
+
+- archpwn-mini
+
+    That contains the only strict requirements for pentesters that fits
+    in standard CD.
+
+- archpwn-full
+
+    Contains everything you need for a complete penetration testing. You
+    could burn the image onto a DVD or use with your favourite USB
+    stick.
+

repo/base/chakra-hardware-detection/PKGBUILD

@@ -1,6 +1,5 @@
-
 pkgname=chakra-hardware-detection
-pkgver=20091114
+pkgver=20100412
 pkgrel=1
 pkgdesc="Hardware detection scripts for Chakra"
 arch=('any')

repo/base/chakra-hardware-detection/etc/chakra-hwdetect.conf

@@ -9,7 +9,7 @@ HW_DB_PATH="/opt/chakra/hwdb"
 
 # VERSION OF THE "NVIDIA" DRIVER PKG
 # (keep in sync with postinstall config)
-NVIDIA_DRV_VER="190"
+NVIDIA_DRV_VER="195"
 
 # NVIDIA HW DATABASE FILE NAME
 NV_DB="hw_nvidia_hwdb"

repo/base/chakra-hardware-detection/opt/chakra/hooks/hwdetect_6_alsa

@@ -12,6 +12,7 @@ hwdetect_alsa()
 	$alsa_amixer -c 0 sset "Center" 70% unmute &>/dev/null
 	$alsa_amixer -c 0 sset "LFE" 70% unmute &> /dev/null
 	$alsa_amixer -c 0 sset "Headphone" 70% unmute &>/dev/null
+	$alsa_amixer -c 0 sset "Speaker" 70% unmute &>/dev/null
 	$alsa_amixer -c 0 sset "PCM" 70% unmute &>/dev/null
 	$alsa_amixer -c 0 sset "Line" 70% unmute &>/dev/null
 	$alsa_amixer -c 0 sset "External" 70% unmute &>/dev/null

repo/base/chakra-hardware-detection/opt/chakra/hooks/hwdetect_7_graphics

@@ -109,20 +109,19 @@ hwdetect_graphics()
 			elif [ "$CARD_ATI" != "" ]
 			then
 
-				# Disabled for the moment
-				#if [ $(grep -i "$CARD_ATI" ${HW_DB_PATH}/${ATI_DB}) ]
-				#then
-				#
-				#	printhl "ATI hardware detected"
-				#	printhl "Installing driver: ATI catalyst. This can take some seconds."
-				#
-				#	pacman -Udf ${HW_DRIVER_PATH}/catalyst* &>/dev/null
-				#
-				#	# add a status file in /tmp
-				#	touch /tmp/catalyst
-				#else
+				if [ $(grep -i "$CARD_ATI" ${HW_DB_PATH}/${ATI_DB}) ]
+				then
+
+					printhl "ATI hardware detected"
+					printhl "Installing driver: ATI catalyst. This can take some seconds."
+
+					pacman -Udf ${HW_DRIVER_PATH}/catalyst* &>/dev/null
+
+					# add a status file in /tmp
+					touch /tmp/catalyst
+				else
 					printhl "No non-free drivers available for this hardware"
-				#fi
+				fi
 			else
 
 					printhl "No non-free drivers available for this hardware"
@@ -134,6 +133,23 @@ hwdetect_graphics()
 
 					printhl "Non-free graphics drivers disabled"
 
+# arg! this don't work yet
+#					# check for nvidia
+#					CARD_NVIDIA=$(lspci -n | sed -n "s/.* 0300: 10de:\(....\).*/\1/p")
+#
+#					# do we have one?
+#					if [ "$CARD_NVIDIA" != "" ]
+#					then
+#						printhl "NVIDIA hardware detected"
+#						printhl "Installing driver: nouveau. This can take some seconds."
+#
+#						pacman -Rd libdrm --noconfirm &>/dev/null
+#						pacman -Udf ${HW_DRIVER_PATH}/xf86-video-nouveau* &>/dev/null
+#						pacman -Udf ${HW_DRIVER_PATH}/nouveau-drm* &>/dev/null
+#						pacman -Udf ${HW_DRIVER_PATH}/nouveau-libdrm* &>/dev/null
+#
+#					fi
+
 		;;
 	esac
 }

repo/base/chakra-hardware-detection/opt/chakra/hwdb/fglrx_supported_chakra

@@ -5,14 +5,15 @@ set -e
 filename="$1"
 
 [ -e "$filename" ] || {
-    echo "USAGE: $0 path/to/fglrx_drv.so > hw_ati_hwdb" >&2
+    echo "USAGE: $0 path/to/fglrxko_pci_ids.h" >&2
     exit 1
 }
 
-echo "# Listing generated by fglrx_supported_chakra-20090930."
+echo "# Listing generated by fglrx_supported_chakra-20100412."
 echo "# Do not edit manually."
-echo "# (C) 2009 Chakra-Developer-Team"
+echo "# (C) 2010 Chakra-Developer-Team"
+
+grep "0x" "$filename" | \
+  sed -n 's/FGL_ASIC_ID(0x\([0-9A-F]\{4\}\)),$/0x\1/p' | \
+  sort | uniq | sed -e 's/^[ \t]*//'
 
-strings "$filename" | \
-  sed -n 's/^0x\([0-9A-F]\{4\}\)$/0x\1/p' | \
-  sort | uniq

repo/base/chakra-hardware-detection/opt/chakra/hwdb/hw_ati_hwdb

@@ -1,15 +1,17 @@
-# Listing generated by fglrx_supported_chakra-20090930.
+# Listing generated by fglrx_supported_chakra-20100412.
 # Do not edit manually.
-# Based on Driver-Version: 9.10-1
-# (C) 2009 Chakra-Developer-Team
+# (C) 2010 Chakra-Developer-Team
+# Taken for catalyst-10.4-1chakra
 0x6880
 0x6888
 0x6889
+0x688A
 0x6890
 0x6898
 0x6899
 0x689C
 0x689D
+0x689E
 0x68A0
 0x68A1
 0x68A8
@@ -27,7 +29,19 @@
 0x68D1
 0x68D8
 0x68D9
+0x68DA
 0x68DE
+0x68E0
+0x68E1
+0x68E4
+0x68E5
+0x68E8
+0x68E9
+0x68F0
+0x68F1
+0x68F8
+0x68F9
+0x68FE
 0x9400
 0x9401
 0x9402
@@ -54,6 +68,7 @@
 0x9456
 0x945A
 0x945B
+0x945E
 0x9460
 0x9462
 0x946A
@@ -64,6 +79,7 @@
 0x9487
 0x9488
 0x9489
+0x948A
 0x948F
 0x9490
 0x9491
@@ -113,6 +129,7 @@
 0x9553
 0x9555
 0x9557
+0x955F
 0x9580
 0x9581
 0x9583
@@ -158,3 +175,4 @@
 0x9712
 0x9713
 0x9714
+0x9715

repo/base/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia173xx_hwdb

@@ -1,7 +1,7 @@
 # Listing generated by nvidia_supported_chakra-20090930.
 # Do not edit manually.
-# Based on Driver-Version: 173.14.22-1
 # (C) 2009 Chakra-Developer-Team
+# Taken for nvidia-173xx-173.14.25-1
 0x0040
 0x0041
 0x0042

repo/base/chakra-hardware-detection/opt/chakra/hwdb/hw_nvidia96xx_hwdb

@@ -1,7 +1,7 @@
 # Listing generated by nvidia_supported_chakra-20090930.
 # Do not edit manually.
-# Based on Driver-Version: 96.43.14-1
 # (C) 2009 Chakra-Developer-Team
+# Taken for nvidia-96xx-96.43.16-1
 0x0040
 0x0041
 0x0042