main/opennhrp: update to 0.11.3

4 files changed, 7 insertions, 99 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 8c432b0ad..615d6219e 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -3,7 +3,7 @@ pkgname=gcc
 pkgver=4.4.1
 _specsver=0.1.4
 _espfver=0.3.1
-pkgrel=3
+pkgrel=10
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 license="GPL LGPL"
@@ -15,7 +15,6 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$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
 	gcc-spec-env.patch
-	gcc4-stack-protector-uclibc-no_tls.patch
 	pt_gnu_eh_frame.patch
 	uclibc-getipinfo.patch
 	"
@@ -47,13 +46,12 @@ build ()
 		--build=${CHOST:-i486-alpine-linux-uclibc} \
 		--disable-altivec \
 		--disable-checking \
+		--disable-threads \
 		--disable-fixed-point \
 		--disable-libssp \
 		--disable-libstdcxx-pch \
 		--disable-multilib \
 		--disable-nls \
-		--disable-threads \
-		--disable-tls \
 		--disable-werror \
 		--enable-__cxa_atexit \
 		--enable-cld \
@@ -122,6 +120,5 @@ 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
 c4045bfa85d8be780affd465be9d8ca8  gcc-spec-env.patch
-15e77082db0e1a131af98debd3016290  gcc4-stack-protector-uclibc-no_tls.patch
 2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch
 6cc2385c5bbd6d0da6eaedd53c8bf547  uclibc-getipinfo.patch"
diff --git a/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch b/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch
deleted file mode 100644
index c9b54adbe..000000000
--- a/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 6fedf05fd..968de7866 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
-pkgver=0.11.2
-pkgrel=3
+pkgver=0.11.3
+pkgrel=0
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 license="GPL-3"
@@ -10,7 +10,6 @@ makedepends="c-ares-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 	opennhrp-0.9.3-peer-up-bgp.patch
-	0001-peer-handle-dns-lookup-failure-properly.patch
 	$pkgname.initd
 	$pkgname.confd
 	"
@@ -28,8 +27,7 @@ build() {
 	install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp
 	install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp
 }
-md5sums="3aace509ac79acbde3bb3e44e88798d5  opennhrp-0.11.2.tar.bz2
+md5sums="6f6f8571ccc0a9f97e52c6240fe9002a  opennhrp-0.11.3.tar.bz2
 f81539fc92800bb79668dda119a97d1d  opennhrp-0.9.3-peer-up-bgp.patch
-7d4c31dbde10340eb0e053ae7804bf1e  0001-peer-handle-dns-lookup-failure-properly.patch
 ae65f88ccf849ef882669a8b4f0c7fc0  opennhrp.initd
 8eee86233728dc0d156bbfee6d98f338  opennhrp.confd"
diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index 541a54e85..98269b52b 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rrdtool
 pkgver=1.2.30
-pkgrel=0
+pkgrel=1
 pkgdesc="Data logging and graphing application"
 url="http://www.rrdtool.org"
 license="GPL"
@@ -15,11 +15,8 @@ build() {
 
 	./configure --prefix=/usr \
 		--disable-tcl \
-		--disable-perl \
-		--disable-perl-site-install \
 		--disable-python \
-		--disable-ruby \
-		--disable-rrdcgi
+		--disable-ruby
 
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1