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

7 files changed, 291 insertions, 3 deletions

diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index e3fe8bad..43ce5aa5 100644
--- a/main/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysklogd
 pkgver=1.5
-pkgrel=0
+pkgrel=1
 pkgdesc="System and kernel log daemons"
 url="http://www.infodrom.org/projects/sysklogd/"
 license="GPL BSD"
@@ -16,6 +16,8 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.
 	sysklogd-1.4.2-caen-owl-syslogd-bind.diff
 	sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
 	sysklogd-1.5-build.patch
+	ksym-fclose-fix.diff
+	syslog.conf
 	LICENSE"
 
 build ()
@@ -37,6 +39,7 @@ build ()
 		"$pkgdir"/etc/logrotate.d/sysklogd
 	install -D -m755 ../sysklogd.initd "$pkgdir"/etc/init.d/sysklogd
 	install -D -m644 ../sysklogd.confd "$pkgdir"/etc/conf.d/sysklogd
+	install -D -m644 ../syslog.conf "$pkgdir"/etc/syslog.conf
 	install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 md5sums="e053094e8103165f98ddafe828f6ae4b  sysklogd-1.5.tar.gz
@@ -47,4 +50,6 @@ e25d7b583b7e4bd8be503b89e1771e90  sysklogd.confd
 4715e1dd2deb7a9ac137e004210e3154  sysklogd-1.4.2-caen-owl-syslogd-bind.diff
 6c0a416e40a678cf99c454b0e98185c9  sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
 c71826d1a4f3f7e8ffa57adbfc24f1ce  sysklogd-1.5-build.patch
+8e70cdf98cce9defae0c28a3d2db4410  ksym-fclose-fix.diff
+49ba209742f1651f4bda6c5e92cbb3eb  syslog.conf
 7930f7ff5038e1318511624e348581cc  LICENSE"
diff --git a/main/sysklogd/ksym-fclose-fix.diff b/main/sysklogd/ksym-fclose-fix.diff
new file mode 100644
index 00000000..a1b3401e
--- /dev/null
+++ b/main/sysklogd/ksym-fclose-fix.diff
@@ -0,0 +1,12 @@
+Index: sysklogd-1.5/ksym_mod.c
+===================================================================
+--- sysklogd-1.5.orig/ksym_mod.c	2009-08-04 09:47:53.000000000 +0300
++++ sysklogd-1.5/ksym_mod.c	2009-08-04 09:48:05.000000000 +0300
+@@ -189,7 +189,6 @@
+ 		else
+ 			Syslog(LOG_ERR, "Error loading kernel symbols " \
+ 			       "- %s\n", strerror(errno));
+-		fclose(ksyms);
+ 		return(0);
+ 	}
+ 
diff --git a/main/sysklogd/syslog.conf b/main/sysklogd/syslog.conf
new file mode 100644
index 00000000..855ee6e3
--- /dev/null
+++ b/main/sysklogd/syslog.conf
@@ -0,0 +1,48 @@
+#  /etc/syslog.conf	Configuration file for syslogd.
+#
+#			For more information see syslog.conf(5)
+#			manpage.
+
+# First some standard logfiles.  Log by facility.
+#
+
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/var/log/syslog
+cron.*				/var/log/cron.log
+daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+user.*				-/var/log/user.log
+
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+mail.info			-/var/log/mail.info
+mail.warning			-/var/log/mail.warn
+mail.err			/var/log/mail.err
+
+# Some `catch-all' logfiles.
+#
+*.=debug;\
+	auth,authpriv.none;\
+	news.none;mail.none	-/var/log/debug
+*.=info;*.=notice;*.=warning;\
+	auth,authpriv.none;\
+	cron,daemon.none;\
+	mail,news.none		-/var/log/messages
+
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg				*
+
+#
+# I like to have messages displayed on the console, but only on a virtual
+# console I usually leave idle.
+#
+#daemon,mail.*;\
+#	news.=crit;news.=err;news.=notice;\
+#	*.=debug;*.=info;\
+#	*.=notice;*.=warning	/dev/tty8
+
diff --git a/testing/gcc/APKBUILD b/testing/gcc/APKBUILD
new file mode 100644
index 00000000..8f78827e
--- /dev/null
+++ b/testing/gcc/APKBUILD
@@ -0,0 +1,122 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gcc
+pkgver=4.4.1
+_specsver=0.1.4
+_espfver=0.3.1
+pkgrel=0
+pkgdesc="The GNU Compiler Collection"
+url="http://gcc.gnu.org"
+license="GPL LGPL"
+depends="binutils"
+makedepends="bison flex gmp-dev mpfr-dev texinfo"
+subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
+source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
+	http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-espf-$_espfver.tar.bz2
+	http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-specs-$_specsver.tar.bz2
+	gcc4-stack-protector-uclibc-no_tls.patch
+	pt_gnu_eh_frame.patch
+	"
+#	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
+build ()
+{
+	cd ${srcdir}/gcc-${pkgver}
+
+	# uclibc patches
+	for i in ../*.patch; do
+		msg "Applying $i"
+		patch -p1 -i $i || return 1
+	done
+
+	# ESPF patches. we dont use objc yet
+	rm -f ../espf-gcc-$pkgver/*_objc*lang-specs*.patch
+	# thanks to Zorry for hard work on those patches
+	for i in ../espf-gcc-$pkgver/*.patch; do
+		msg "Applying $i"
+		patch -p0 -i $i || return 1
+	done
+
+	echo ${pkgver} > gcc/BASE-VER
+	mkdir build
+	cd build
+	../configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--build=${CHOST:-i486-alpine-linux-uclibc} \
+		--disable-altivec \
+		--disable-checking \
+		--disable-fixed-point \
+		--disable-libssp \
+		--disable-libstdcxx-pch \
+		--disable-multilib \
+		--disable-nls \
+		--disable-threads \
+		--disable-tls \
+		--disable-werror \
+		--enable-__cxa_atexit \
+		--enable-cld \
+		--enable-espf \
+		--enable-languages=c,c++ \
+		--enable-shared \
+		--enable-target-optspace \
+		--with-arch=i486 \
+		--with-system-zlib
+
+	make || return 1
+	make -j1 DESTDIR="${pkgdir}" install || return 1
+	ln -s gcc "$pkgdir"/usr/bin/cc
+
+	# binutils provides libiberty.a
+	rm -f "$pkgdir"/usr/lib/libiberty.a
+	
+	# install the specs
+	cd "$srcdir"/specs
+	install -d "$pkgdir"/usr/share/gcc
+	for i in *.specs; do
+		install -m644 $i "$pkgdir"/usr/share/gcc/$i || return 1
+	done
+}
+
+libcxx() {
+	pkgdesc="GNU C++ standard runtime library"
+	depends=
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libstdc++.so* "$subpkgdir"/usr/lib/
+}
+
+gpp() {
+	pkgdesc="GNU C++ standard library and compiler"
+	depends=
+	local libexec=usr/libexec/gcc/${CHOST:-i486-alpine-linux-uclibc}/$pkgver
+	mkdir -p "$subpkgdir/$libexec" \
+		"$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/include \
+		"$subpkgdir"/usr/lib \
+
+	mv "$pkgdir/$libexec/cc1plus" "$subpkgdir/$libexec/"
+	mv "$pkgdir"/usr/lib/*++* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/include/c++ "$subpkgdir"/usr/include/
+	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+}
+
+libgcc() {
+	pkgdesc="GNU C compiler runtime libraries"
+	depends=
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgcc_s.so* "$subpkgdir"/usr/lib/
+}
+	
+libgomp() {
+	pkgdesc="GCC shared-memory parallel programming API library"
+	depends=
+	replaces="gcc"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgomp.so* "$subpkgdir"/usr/lib/
+}
+
+md5sums="d19693308aa6b2052e14c071111df59f  gcc-core-4.4.1.tar.bz2
+d449047b5761348ceec23739f5553e0b  gcc-g++-4.4.1.tar.bz2
+43d0bbd676bbb2acd67ddabd0ea1bc2b  gcc-4.4.1-espf-0.3.1.tar.bz2
+da8d9165e828bbb9809ef86f1c72886f  gcc-4.4.1-specs-0.1.4.tar.bz2
+15e77082db0e1a131af98debd3016290  gcc4-stack-protector-uclibc-no_tls.patch
+2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch"
diff --git a/testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch b/testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch
new file mode 100644
index 00000000..c9b54adb
--- /dev/null
+++ b/testing/gcc/gcc4-stack-protector-uclibc-no_tls.patch
@@ -0,0 +1,84 @@
+diff -u gcc/config/i386/linux.h gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h	2 Jul 2005 08:52:20 -0000	1.60
++++ b/gcc/config/i386/linux.h	2 Jul 2005 08:52:20 -0000	1.60
+@@ -186,7 +186,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h.  */
+ #define REG_NAME(reg) reg
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
+ #define TARGET_THREAD_SSP_OFFSET	0x14
+ #endif
+diff -u gcc/config/i386/linux64.h gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h	2 Jul 2005 08:52:20 -0000	1.33
++++ b/gcc/config/i386/linux64.h	2 Jul 2005 08:52:20 -0000	1.33
+@@ -74,7 +74,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h.  */
+ #define REG_NAME(reg) reg
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14,
+    x86_64 glibc provides it in %fs:0x28.  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? 0x28 : 0x14)
+diff -u gcc/config/rs6000/linux.h gcc/config/rs6000/linux.h
+--- a/gcc/config/rs6000/linux.h	2 Jul 2005 08:52:11 -0000	1.53
++++ b/gcc/config/rs6000/linux.h	2 Jul 2005 08:52:11 -0000	1.53
+@@ -114,7 +114,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2).  */
+ #define TARGET_THREAD_SSP_OFFSET	-0x7008
+ #endif
+diff -u gcc/config/rs6000/linux64.h gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h	2 Jul 2005 08:52:15 -0000	1.81
++++ b/gcc/config/rs6000/linux64.h	2 Jul 2005 08:52:15 -0000	1.81
+@@ -548,7 +548,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2),
+    ppc64 glibc provides it at -0x7010(13).  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? -0x7010 : -0x7008)
+diff -u gcc/config/s390/linux.h gcc/config/s390/linux.h
+--- a/gcc/config/s390/linux.h	2005-08-22 15:53:01.000000000 +0200	1.40
++++ b/gcc/config/s390/linux.h	2005-08-22 15:53:01.000000000 +0200	1.40
+@@ -94,7 +94,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/s390/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* s390 glibc provides __stack_chk_guard in 0x14(tp),
+    s390x glibc provides it at 0x28(tp).  */
+ #define TARGET_THREAD_SSP_OFFSET        (TARGET_64BIT ? 0x28 : 0x14)
+diff -u gcc/config/sparc/linux.h gcc/config/sparc/linux.h
+--- a/gcc/config/sparc/linux.h	6 Jul 2005 07:48:57 -0000	1.72
++++ b/gcc/config/sparc/linux.h	6 Jul 2005 07:48:57 -0000	1.72
+@@ -230,7 +230,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14].  */
+ #define TARGET_THREAD_SSP_OFFSET	0x14
+ #endif
+diff -u gcc/config/sparc/linux64.h gcc/config/sparc/linux64.h
+--- a/gcc/config/sparc/linux64.h	6 Jul 2005 07:48:57 -0000	1.95
++++ b/gcc/config/sparc/linux64.h	6 Jul 2005 07:48:57 -0000	1.95
+@@ -364,7 +364,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14],
+    sparc64 glibc provides it at [%g7 + 0x28].  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_ARCH64 ? 0x28 : 0x14)
diff --git a/testing/gcc/pt_gnu_eh_frame.patch b/testing/gcc/pt_gnu_eh_frame.patch
new file mode 100644
index 00000000..3e029104
--- /dev/null
+++ b/testing/gcc/pt_gnu_eh_frame.patch
@@ -0,0 +1,12 @@
+--- gcc-4.3.2/gcc/crtstuff.c.orig	Mon Nov 17 16:02:38 2008
++++ gcc-4.3.2/gcc/crtstuff.c	Mon Nov 17 16:02:52 2008
+@@ -94,8 +94,7 @@
+ #include <link.h>
+ /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h.
+    But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
+-# if !defined(__UCLIBC__) \
+-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
++# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+      || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
+ #  define USE_PT_GNU_EH_FRAME
+ # endif
diff --git a/testing/igmpproxy/APKBUILD b/testing/igmpproxy/APKBUILD
index 5c0358d9..a3acac70 100644
--- a/testing/igmpproxy/APKBUILD
+++ b/testing/igmpproxy/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=igmpproxy
 pkgver=0.1_beta4
-pkgrel=0
+pkgrel=1
 pkgdesc="a simple dynamic Multicast Routing Daemon using only IGMP signalling"
 url="http://sourceforge.net/projects/igmpproxy/"
 license="GPL"
-depends="uclibc"
+depends=""
 makedepends=""
 install=
 subpackages="$pkgname-doc"
@@ -15,6 +15,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
+	# our kernel have a patch that changes MAXVIFS
+	# note that this is ABI incompatible
+	sed -i -e 's:^#define MAX_MC_VIFS.*:#define MAX_MC_VIFS   MAXVIFS:' \
+		src/igmpproxy.h
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \