Merge branch 'master' of git://dev.alpinelinux.org/aports

5 files changed, 126 insertions, 47 deletions

diff --git a/core/linux-grsec/APKBUILD b/core/linux-grsec/APKBUILD
index 5c690da86..169490c40 100644
--- a/core/linux-grsec/APKBUILD
+++ b/core/linux-grsec/APKBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=linux-grsec
+_flavor=grsec
+pkgname=linux-$_flavor
 pkgver=2.6.28.9
-pkgrel=0
+pkgrel=2
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 arch=i486
@@ -22,13 +23,15 @@ build() {
 		INSTALL_MOD_PATH=$pkgdir \
 		INSTALL_PATH=$pkgdir/boot
 	cd "$pkgdir"/boot
-	mv vmlinuz ${pkgname#linux-}
-	mv System.map System-${pkgname#linux-}.map
+	mv vmlinuz $_flavor
 }
 
 dev()  {
+	install -Dm644 "$srcdir"/$pkgname/Module.symvers \
+		"$subpkgdir"/boot/Module.symvers-$_flavor
 	install -Dm644 "$srcdir/kernelconfig" \
-		"$subpkgdir"/usr/share/$pkgname/config
+		"$subpkgdir"/boot/config-$_flavor
+	mv "$pkgdir"/boot/System.map "$subpkgdir"/boot/System.map-$_flavor
 }
 
-md5sums="b44152b7ca7199c3d6ab499a61f06fdd  kernelconfig"
+md5sums="080e5d30c79999d696588f824073803d  kernelconfig"
diff --git a/core/linux-grsec/kernelconfig b/core/linux-grsec/kernelconfig
index c45b3e186..41599f417 100644
--- a/core/linux-grsec/kernelconfig
+++ b/core/linux-grsec/kernelconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28.7
-# Thu Mar 19 12:44:45 2009
+# Linux kernel version: 2.6.28.9
+# Wed Apr  8 06:37:18 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -86,6 +86,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -95,10 +96,8 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_COMPAT_BRK is not set
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -108,6 +107,7 @@ CONFIG_AIO=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
@@ -172,17 +172,19 @@ CONFIG_X86_PC=y
 # CONFIG_X86_RDC321X is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_VMI=y
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
-CONFIG_M486=y
+# CONFIG_M486 is not set
 # CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
+CONFIG_M586TSC=y
 # CONFIG_M586MMX is not set
 # CONFIG_M686 is not set
 # CONFIG_MPENTIUMII is not set
@@ -217,6 +219,8 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
@@ -238,7 +242,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_MCE is not set
-# CONFIG_VM86 is not set
+CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
@@ -249,8 +253,8 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
@@ -258,7 +262,8 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -272,7 +277,7 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -1202,6 +1207,7 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_MISC_DEVICES=y
@@ -1580,6 +1586,7 @@ CONFIG_IEEE1394_DV1394=m
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
@@ -1727,7 +1734,6 @@ CONFIG_E1000E=m
 CONFIG_IP1000=m
 CONFIG_IGB=m
 CONFIG_IGB_LRO=y
-CONFIG_IGB_DCA=y
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -1749,11 +1755,9 @@ CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
 CONFIG_IXGB=m
 CONFIG_S2IO=m
 CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
 CONFIG_MLX4_EN=m
@@ -1972,6 +1976,7 @@ CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_HE=m
 CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2062,6 +2067,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_EVBUG=m
+CONFIG_XEN_KBDDEV_FRONTEND=m
 
 #
 # Input Device Drivers
@@ -2245,7 +2251,9 @@ CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -3118,6 +3126,7 @@ CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
 CONFIG_FB_SM501=m
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
 # CONFIG_FB_MB862XX_PCI_GDC is not set
@@ -3704,20 +3713,6 @@ CONFIG_RTC_DRV_WM8350=m
 #
 # on-CPU RTC drivers
 #
-CONFIG_DMADEVICES=y
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_DMATEST=m
-CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -3729,6 +3724,8 @@ CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_SMX=m
 CONFIG_UIO_SERCOS3=m
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
 # CONFIG_STAGING is not set
 
 #
@@ -4133,6 +4130,7 @@ CONFIG_PAX_HAVE_ACL_FLAGS=y
 # Non-executable pages
 #
 CONFIG_PAX_NOEXEC=y
+# CONFIG_PAX_PAGEEXEC is not set
 CONFIG_PAX_SEGMEXEC=y
 # CONFIG_PAX_EMUTRAMP is not set
 CONFIG_PAX_MPROTECT=y
@@ -4142,6 +4140,7 @@ CONFIG_PAX_NOELFRELOCS=y
 # Address Space Layout Randomization
 #
 CONFIG_PAX_ASLR=y
+# CONFIG_PAX_RANDKSTACK is not set
 CONFIG_PAX_RANDUSTACK=y
 CONFIG_PAX_RANDMMAP=y
 
@@ -4273,9 +4272,8 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
-CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 
diff --git a/core/openssl/APKBUILD b/core/openssl/APKBUILD
index 67bce486f..7f2dc2765 100644
--- a/core/openssl/APKBUILD
+++ b/core/openssl/APKBUILD
@@ -1,5 +1,6 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openssl
-pkgver=0.9.8j
+pkgver=0.9.8k
 pkgrel=0
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url=http://openssl.org
@@ -12,19 +13,23 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
         http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8g-fix_manpages-1.patch
 	openssl-bb-basename.patch
+	openssl-0.9.8k-quote-cc.patch
 	"
 	
 build() {
-	cd $startdir/src/$pkgname-$pkgver
+	cd "$startdir"/src/$pkgname-$pkgver
+	for i in ../*.patch; do
+		msg "Applying $i..."
+		patch -p1 < $i || return 1
+	done
 
-	patch -p1 -i ../openssl-0.9.8g-fix_manpages-1.patch  || return 1
-	patch -p1 -i ../openssl-bb-basename.patch || return 1
 	./config --prefix=/usr --openssldir=/etc/ssl shared
 
 	make -j1 || return 1
 	make INSTALL_PREFIX=$startdir/pkg MANDIR=/usr/share/man install
 }
 
-md5sums="a5cb5f6c3d11affb387ecf7a997cac0c  openssl-0.9.8j.tar.gz
+md5sums="e555c6d58d276aec7fdc53363e338ab3  openssl-0.9.8k.tar.gz
 04a6a88c2ee4badd4f8649792b73eaf3  openssl-0.9.8g-fix_manpages-1.patch
-c6a9857a5dbd30cead0404aa7dd73977  openssl-bb-basename.patch"
+c6a9857a5dbd30cead0404aa7dd73977  openssl-bb-basename.patch
+c838eb8488896cfeb7de957a0cbe04ae  openssl-0.9.8k-quote-cc.patch"
diff --git a/core/openssl/openssl-0.9.8k-quote-cc.patch b/core/openssl/openssl-0.9.8k-quote-cc.patch
new file mode 100644
index 000000000..5a6166288
--- /dev/null
+++ b/core/openssl/openssl-0.9.8k-quote-cc.patch
@@ -0,0 +1,72 @@
+--- openssl-0.9.8k/Makefile.orig	2009-04-07 12:28:31.000000000 +0000
++++ openssl-0.9.8k/Makefile	2009-04-07 12:30:13.000000000 +0000
+@@ -359,7 +359,7 @@
+ 			$(AR) libcrypto.a fips/fipscanister.o ; \
+ 		else \
+ 			if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+-				FIPSLD_CC=$(CC); CC=fips/fipsld; \
++				FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+ 				export CC FIPSLD_CC; \
+ 			fi; \
+ 			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
+@@ -382,9 +382,9 @@
+ fips/fipscanister.o:	build_fips
+ libfips$(SHLIB_EXT):		fips/fipscanister.o
+ 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
+-		FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
++		FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \
+ 		$(MAKE) -f Makefile.shared -e $(BUILDENV) \
+-			CC=$${CC} LIBNAME=fips THIS=$@ \
++			CC="$${CC}" LIBNAME=fips THIS=$@ \
+ 			LIBEXTRAS=fips/fipscanister.o \
+ 			LIBDEPS="$(EX_LIBS)" \
+ 			LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
+--- openssl-0.9.8k/apps/Makefile.orig	2009-04-07 12:35:30.000000000 +0000
++++ openssl-0.9.8k/apps/Makefile	2009-04-07 12:56:53.000000000 +0000
+@@ -153,12 +153,12 @@
+ 	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
+ 		shlib_target="$(SHLIB_TARGET)"; \
+ 	elif [ -n "$(FIPSCANLIB)" ]; then \
+-	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
++	  FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+ 	fi; \
+ 	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
+ 	[ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
+ 	$(MAKE) -f $(TOP)/Makefile.shared -e \
+-		CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
++		CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
+ 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+ 		link_app.$${shlib_target}
+ 	-(cd ..; \
+--- openssl-0.9.8k/test/Makefile.orig	2009-04-07 13:26:06.000000000 +0000
++++ openssl-0.9.8k/test/Makefile	2009-04-07 13:26:38.000000000 +0000
+@@ -402,13 +402,13 @@
+ 	if [ "$(FIPSCANLIB)" = "libfips" ]; then \
+ 		LIBRARIES="-L$(TOP) -lfips"; \
+ 	elif [ -n "$(FIPSCANLIB)" ]; then \
+-		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
++		FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+ 		LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
+ 	else \
+ 		LIBRARIES="$(LIBCRYPTO)"; \
+ 	fi; \
+ 	$(MAKE) -f $(TOP)/Makefile.shared -e \
+-		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
++		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+ 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+ 		link_app.$${shlib_target}
+ 
+@@ -417,11 +417,11 @@
+ 	fi; \
+ 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
+ 	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
+-		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
++		FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+ 	fi; \
+ 	[ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
+ 	$(MAKE) -f $(TOP)/Makefile.shared -e \
+-		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
++		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+ 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+ 		link_app.$${shlib_target}
+ 
diff --git a/testing/dahdi-linux/APKBUILD b/testing/dahdi-linux/APKBUILD
index dea3090f0..1ef6c4af1 100644
--- a/testing/dahdi-linux/APKBUILD
+++ b/testing/dahdi-linux/APKBUILD
@@ -4,7 +4,7 @@ pkgname=dahdi-linux
 _kernflavor=grsec
 _kernver=2.6.28.9
 pkgver=2.1.0.4
-pkgrel=3
+pkgrel=5
 pkgdesc="Digium Asterisk Hardware Device Interface drivers"
 url="http://www.asterisk.org"
 license="GPL"
@@ -26,7 +26,8 @@ build() {
 	local ksrc="/usr/src/linux-$_kernver-$_kernflavor"
 	mkdir -p "$kout"
 	cd "$kout"
-	cp /usr/share/linux-grsec/config .config
+	cp /boot/config-grsec .config
+	cp /boot/Module.symvers-grsec Module.symvers
 	make -C $ksrc O=$PWD silentoldconfig || return 1
 	make modules_prepare