extra/dahdi-linux-grsec: renamed dahdi-linux, upgrade to 2.2.0

extra/dahdi-linux/APKBUILD → extra/dahdi-linux-grsec/APKBUILD

 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
-pkgname=dahdi-linux
-_kernflavor=grsec
-_kernver=2.6.28.9
-pkgver=2.1.0.4
-pkgrel=7
+
+_flavor=grsec
+
+# source the kernel version
+if [ -f ../linux-${_flavor}/APKBUILD ]; then
+	. ../linux-${_flavor}/APKBUILD
+fi
+
+_abi_release=${pkgver:-2.6.29.5}-${_flavor}
+_realname=dahdi-linux
+
+pkgname=${_realname}-${_flavor}
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="Digium Asterisk Hardware Device Interface drivers"
 url="http://www.asterisk.org"
 license="GPL"
-depends="linux-grsec"
+depends=
 # we need wget and tar because make install downloads firmware and uses fancy
 # options for tar and wget.
-makedepends="linux-grsec-dev linux-grsec-sources wget tar perl"
+makedepends="linux-${_flavor}-dev wget tar perl"
 install=
-subpackages="$pkgname-dev $pkgname-grsec:mod"
-source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-dev"
+source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realname}-$pkgver.tar.gz
 	dahdi-depmod.patch
 	dahdi-bri_dchan.patch
 	dahdi-zaphfc.patch
 	zaphfc-dahdi-flortz.diff
-	$pkgname-2.1.0.4-hfc-4s.patch
+	dahdi-linux-2.2.0-hfc-4s.patch
 	"
 
 build() {
-	local kout="$srcdir"/grsec
-	local ksrc="/usr/src/linux-$_kernver-$_kernflavor"
-	mkdir -p "$kout"
-	cd "$kout"
-	cp /boot/config-grsec .config
-	cp /boot/Module.symvers-grsec Module.symvers
-	make -C $ksrc O=$PWD silentoldconfig || return 1
-	make modules_prepare
-
-	cd "$srcdir/$pkgname-$pkgver"
-	for i in ../*.patch; do
+	cd "$srcdir/$_realname-$pkgver"
+	for i in ../*.patch ../*.diff; do
 		msg "Applying $i"
 		patch -p1 < $i || return 1;
 	done
 
-	make \
-		KVERS="$_kernver-$_kernflavor" KSRC="$kout" \
-		KCONFIG="$kout/.config" DYNFS="yes" MODULES_EXTRA="zaphfc" \
+	make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
 		|| return 1
-	make DESTDIR="$pkgdir" \
-		KVERS="$_kernver-$_kernflavor" KSRC="$kout" \
-		KCONFIG="$kout/.config" DYNFS="yes" MODULES_EXTRA="zaphfc" \
-		install
+	make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \
+		DESTDIR="$pkgdir" install
 }
 
-md5sums="ef2d34c394e8b600ad392560efc56920  dahdi-linux-2.1.0.4.tar.gz
+# since we sourced the APKBUILD above we got the dev() function there to
+# so we override it again.
+dev() {
+	default_dev
+}
+md5sums="a6b1a24a436e1c1fd08b99d27cfe3f38  dahdi-linux-2.2.0.tar.gz
 c78fb8d80f9efdffd950297c88ff9273  dahdi-depmod.patch
-1c9c44497fc883c6a5381abc93e5e6cf  dahdi-bri_dchan.patch
+4b41a82ff390ac64c08092c5a3eab6a8  dahdi-bri_dchan.patch
 a822c092f0548cd13f5e8d8cba053af6  dahdi-zaphfc.patch
 291c5c44c86ab02443a742415461ddca  zaphfc-dahdi-flortz.diff
-b01c57444be3a87f6f71dd71c4451ec7  dahdi-linux-2.1.0.4-hfc-4s.patch"
+68dfe17a49cca15ae439fd83f4ccfbc5  dahdi-linux-2.2.0-hfc-4s.patch"

extra/dahdi-linux/dahdi-bri_dchan.patch → extra/dahdi-linux-grsec/dahdi-bri_dchan.patch

@@ -37,8 +37,8 @@
  
  struct dahdi_span {
  	spinlock_t lock;
---- a/drivers/dahdi/dahdi_config.h
-+++ b/drivers/dahdi/dahdi_config.h
+--- a/include/dahdi/dahdi_config.h
++++ b/include/dahdi/dahdi_config.h
 @@ -174,4 +174,10 @@
   */
  /* #define	OPTIMIZE_CHANMUTE */