diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk/APKBUILD | 8 | ||||
-rw-r--r-- | main/gnupg/APKBUILD | 14 | ||||
-rw-r--r-- | main/libao/APKBUILD | 6 | ||||
-rw-r--r-- | main/libassuan/APKBUILD | 13 | ||||
-rw-r--r-- | main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch | 125 | ||||
-rw-r--r-- | main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch | 69 | ||||
-rw-r--r-- | main/libc0.9.32/APKBUILD | 24 | ||||
-rw-r--r-- | main/libc0.9.32/uclibcconfig.x86 | 3 | ||||
-rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch | 14 | ||||
-rw-r--r-- | main/mpd/APKBUILD | 2 | ||||
-rw-r--r-- | main/rdesktop/APKBUILD | 8 | ||||
-rw-r--r-- | main/sox/APKBUILD | 2 |
13 files changed, 261 insertions, 31 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 2a955f8b6..e1aec9bb7 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.6.2.6 -pkgrel=2 +pkgver=1.6.2.7 +pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz 100-uclibc-daemon.patch 101-caps-uclibc.patch - 102-gsm-pic.patch 400-bug-227.patch asterisk.initd asterisk.confd @@ -111,10 +110,9 @@ sample() { make samples DESTDIR="$subpkgdir" } -md5sums="f068ef2433eebdc7f6dd635986f36d77 asterisk-1.6.2.6.tar.gz +md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch -97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch 0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD index 4e04d84b4..b35f8566a 100644 --- a/main/gnupg/APKBUILD +++ b/main/gnupg/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnupg -pkgver=2.0.10 -pkgrel=1 +pkgver=2.0.15 +pkgrel=0 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" url="http://www.gnupg.org/" license="GPL" -depends="curl zlib libksba libgcrypt libgpg-error pth pinentry libiconv" +depends= makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev - pth-dev zlib-dev libiconv-dev" + pth-dev zlib-dev libiconv-dev libassuan-dev" subpackages="$pkgname-doc" source="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2" @@ -16,6 +16,10 @@ build () { ./configure --prefix=/usr \ --disable-nls make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="1cb778dd555f87685a8fde2f7113725e gnupg-2.0.10.tar.bz2" +md5sums="c1286e85b66349879dc4b760dd83e2f1 gnupg-2.0.15.tar.bz2" diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD index d94523388..9c179172f 100644 --- a/main/libao/APKBUILD +++ b/main/libao/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libao -pkgver=0.8.8 -pkgrel=2 +pkgver=1.0.0 +pkgrel=0 pkgdesc="Cross-platform audio output library and plugins" url="http://www.xiph.org/ao" license="GPL" @@ -23,4 +23,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="b92cba3cbcf1ee9bc221118a85d23dcd libao-0.8.8.tar.gz" +md5sums="08283fbe1f587619053a156254afecec libao-1.0.0.tar.gz" diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD index 2b2498c49..ee8a0d979 100644 --- a/main/libassuan/APKBUILD +++ b/main/libassuan/APKBUILD @@ -1,18 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libassuan -pkgver=1.0.5 +pkgver=2.0.0 pkgrel=0 pkgdesc="Libassuan is the IPC library used by some GnuPG related software" url="ftp://ftp.gnupg.org/gcrypt/libgcrypt" license="GPL" -makedepends="pth-dev" -subpackages="$pkgname-doc" +depends= +makedepends="pth-dev libgpg-error-dev" +subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="c2db0974fcce4401f48f3fa41c4edc5a libassuan-1.0.5.tar.bz2" +md5sums="59bc0ae7194c412d7a522029005684b2 libassuan-2.0.0.tar.bz2" diff --git a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch new file mode 100644 index 000000000..2898a0d02 --- /dev/null +++ b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch @@ -0,0 +1,125 @@ +From 67403d1d692c3b8022b0adca127a2c14ef8e3237 Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Fri, 7 May 2010 11:28:27 +0300 +Subject: [PATCH 1/2] static build: fix internal locking weaks to get pulled in always + +Linker is smart and does not pull in weaks.os, ever. This happens +because that compilation unit does not get strong references and +ld eliminates dead code. We really need the weaks for static build +in a compilation unit that is always there, otherwise it won't work. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +--- + libc/misc/internals/__uClibc_main.c | 35 ++++++++++++++++++++++++++++++ + libc/misc/pthread/Makefile.in | 1 - + libc/misc/pthread/weaks.c | 40 ----------------------------------- + 3 files changed, 35 insertions(+), 41 deletions(-) + delete mode 100644 libc/misc/pthread/weaks.c + +diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c +index f7e45c6..f9e1244 100644 +--- a/libc/misc/internals/__uClibc_main.c ++++ b/libc/misc/internals/__uClibc_main.c +@@ -68,6 +68,41 @@ uintptr_t __guard attribute_relro; + */ + + void internal_function _dl_aux_init (ElfW(auxv_t) *av); ++ ++/* ++ * uClibc internal locking requires that we have weak aliases ++ * for dummy functions in case libpthread.a is not linked in. ++ * This needs to be in compilation unit that is pulled always ++ * in or linker will disregard these weaks. ++ */ ++ ++static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; } ++weak_alias (__pthread_return_0, __pthread_mutex_lock) ++weak_alias (__pthread_return_0, __pthread_mutex_trylock) ++weak_alias (__pthread_return_0, __pthread_mutex_unlock) ++ ++int weak_function ++__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) ++{ ++ return 0; ++} ++ ++void weak_function ++_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer, ++ void (*__routine) (void *), void *__arg) ++{ ++ __buffer->__routine = __routine; ++ __buffer->__arg = __arg; ++} ++ ++void weak_function ++_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer, ++ int __execute) ++{ ++ if (__execute) ++ __buffer->__routine(__buffer->__arg); ++} ++ + #endif /* !SHARED */ + + /* +diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in +index 69cdf10..2f436ac 100644 +--- a/libc/misc/pthread/Makefile.in ++++ b/libc/misc/pthread/Makefile.in +@@ -11,7 +11,6 @@ MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread + MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread + + libc-shared-$(UCLIBC_HAS_TLS) += $(MISC_PTHREAD_OUT)/tsd.os +-libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o + + objclean-y += CLEAN_libc/misc/pthread + +diff --git a/libc/misc/pthread/weaks.c b/libc/misc/pthread/weaks.c +deleted file mode 100644 +index fb1d85f..0000000 +--- a/libc/misc/pthread/weaks.c ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* The weak pthread functions for Linux. +- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ +- +-#include <libc-internal.h> +- +-/* Weaks for internal library use only. +- * +- * We need to define weaks here to cover all the pthread functions that +- * libc itself will use so that we aren't forced to link libc against +- * libpthread. This file is only used in libc.a and since we have +- * weaks here, they will be automatically overridden by libpthread.a +- * if it gets linked in. +- */ +- +-static int __pthread_return_0 (void) { return 0; } +-static void __pthread_return_void (void) { return; } +- +-weak_alias (__pthread_return_0, __pthread_mutex_init) +-weak_alias (__pthread_return_0, __pthread_mutex_lock) +-weak_alias (__pthread_return_0, __pthread_mutex_trylock) +-weak_alias (__pthread_return_0, __pthread_mutex_unlock) +-weak_alias (__pthread_return_void, _pthread_cleanup_push_defer) +-weak_alias (__pthread_return_void, _pthread_cleanup_pop_restore) +- +-- +1.6.3.3 + diff --git a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch new file mode 100644 index 000000000..562d648a6 --- /dev/null +++ b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch @@ -0,0 +1,69 @@ +From bfe9a589a402d4b6265e32b1b5ca0942efdcff3b Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Fri, 7 May 2010 11:30:04 +0300 +Subject: [PATCH 2/2] resolv: various memory corruption and off by one fixes + +Fixes resolution of names with AAAA entries and gethostbyaddr issues. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +--- + libc/inet/resolv.c | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c +index 84289a6..320aec4 100644 +--- a/libc/inet/resolv.c ++++ b/libc/inet/resolv.c +@@ -689,7 +689,7 @@ int attribute_hidden __decode_dotted(const unsigned char *packet, + + if (used + b + 1 >= dest_len) + return -1; +- if (offset + b + 1 >= packet_len) ++ if (offset + b >= packet_len) + return -1; + memcpy(dest + used, packet + offset, b); + offset += b; +@@ -2417,7 +2417,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + /* Layout in buf: + * char *alias[ALIAS_DIM]; + * struct in[6]_addr* addr_list[2]; +- * struct in[6]_addr* in; ++ * struct in[6]_addr in; + * char scratch_buffer[256+]; + */ + #define in6 ((struct in6_addr *)in) +@@ -2431,9 +2431,13 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + #ifndef __UCLIBC_HAS_IPV6__ + buf += sizeof(*in); + buflen -= sizeof(*in); ++ if (addrlen > sizeof(*in)) ++ return ERANGE; + #else + buf += sizeof(*in6); + buflen -= sizeof(*in6); ++ if (addrlen > sizeof(*in6)) ++ return ERANGE; + #endif + if ((ssize_t)buflen < 256) + return ERANGE; +@@ -2441,7 +2445,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + alias[1] = NULL; + addr_list[0] = in; + addr_list[1] = NULL; +- memcpy(&in, addr, addrlen); ++ memcpy(in, addr, addrlen); + + if (0) /* nothing */; + #ifdef __UCLIBC_HAS_IPV4__ +@@ -2456,7 +2460,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + char *dst = buf; + unsigned char *tp = (unsigned char *)addr + addrlen - 1; + do { +- dst += sprintf(dst, "%x.%x.", tp[i] & 0xf, tp[i] >> 4); ++ dst += sprintf(dst, "%x.%x.", tp[0] & 0xf, tp[0] >> 4); + tp--; + } while (tp >= (unsigned char *)addr); + strcpy(dst, "ip6.arpa"); +-- +1.6.3.3 + diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 7dc33f121..db7a9b0c1 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _abiver=0.9.32 pkgname=libc$_abiver -_gitver=100427 +_gitver=100507 pkgver=${_abiver}_alpha0_git$_gitver -pkgrel=2 +pkgrel=0 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -13,9 +13,12 @@ depends_dev="linux-headers=>2.6.32" #options="!strip" replaces=uclibc -source=" - http://git.uclibc.org/uClibc/snapshot/master.tar.bz2 +_snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" +_snapfile="$pkgname-$pkgver.tar.bz2" +source="http://build.alpinelinux.org:8010/distfiles/$_snapfile compat-stack-guard.patch + 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch + 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch uclibcconfig.x86 uclibcconfig.i486 " @@ -25,7 +28,10 @@ _builddir="$srcdir"/master snapshot() { local _date=$(date +%y%m%d%H%M) - rm -f "$SRCDEST"/master.tar.bz2 + pkgver=${_abiver}_alpha0_git$_gitver + + rm -f "$SRCDEST"/$_snapfile + wget -O "$SRCDEST"/$_snapfile $_snapurl pkgrel=0 sed -i -e "s/^_gitver=.*/_gitver=$(date +%y%m%d)/" \ -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ @@ -86,7 +92,9 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -md5sums="1189f8f739b1977a86b7afa8637e6827 master.tar.bz2 +md5sums="46e98672dc2a4309d9a7c65b4e626845 libc0.9.32-0.9.32_alpha0_git100507.tar.bz2 4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch -791e2fc050cab523ce1c907ca39a2486 uclibcconfig.x86 -791e2fc050cab523ce1c907ca39a2486 uclibcconfig.i486" +826666b365f2d63a71d67eb76c94f7bc 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch +0800a489a738c7b1d8c3643cb9806926 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch +e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 +e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" diff --git a/main/libc0.9.32/uclibcconfig.x86 b/main/libc0.9.32/uclibcconfig.x86 index be5cfbb51..1368b58ec 100644 --- a/main/libc0.9.32/uclibcconfig.x86 +++ b/main/libc0.9.32/uclibcconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Version: 0.9.32-git -# Tue May 4 07:38:19 2010 +# Fri May 7 11:46:52 2010 # # TARGET_alpha is not set # TARGET_arm is not set @@ -123,6 +123,7 @@ UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y UCLIBC_HAS_TZ_FILE_READ_MANY=y UCLIBC_TZ_FILE_PATH="/etc/TZ" +UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y # # Advanced Library Settings diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 4cbcb41e0..a529ae86f 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.32.12 _kernver=2.6.32 -pkgrel=3 +pkgrel=4 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -31,6 +31,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 0016-xfrm-remove-policy-garbage-collection.patch 0017-flow-delayed-deletion-of-flow-cache-entries.patch 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch + xfrm-fix-policy-unreferencing-on-larval-drop.patch kernelconfig.x86 " subpackages="$pkgname-dev linux-firmware:firmware" @@ -154,4 +155,5 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch +c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch 7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" diff --git a/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch new file mode 100644 index 000000000..25dc0dcdc --- /dev/null +++ b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch @@ -0,0 +1,14 @@ +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 31f4ba4..f4ea3a0 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1805,7 +1805,7 @@ restart: + /* EREMOTE tells the caller to generate + * a one-shot blackhole route. */ + dst_release(dst); +- xfrm_pols_put(pols, num_pols); ++ xfrm_pols_put(pols, drop_pols); + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); + return -EREMOTE; + } + diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index 5877ab3fa..a549978c6 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=mpd pkgver=0.15.9 -pkgrel=1 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" pkgusers="mpd" diff --git a/main/rdesktop/APKBUILD b/main/rdesktop/APKBUILD index 597af311c..45a865e0c 100644 --- a/main/rdesktop/APKBUILD +++ b/main/rdesktop/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rdesktop pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="rdesktop is used to connect to windows terminal servers" url="http://www.rdesktop.org/" license="GPL" subpackages="$pkgname-doc" -depends="libx11 openssl libao libsamplerate" +depends= makedepends="libx11-dev libao-dev openssl-dev libsamplerate-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" @@ -16,6 +16,10 @@ build () ./configure --prefix=/usr \ --with-sound=ao make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } md5sums="c6fcbed7f0ad7e60ac5fcb2d324d8b16 rdesktop-1.6.0.tar.gz" diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD index 1f2fdcdd3..37b016a99 100644 --- a/main/sox/APKBUILD +++ b/main/sox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sox pkgver=14.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="The Swiss Army knife of sound processing tools" url="http://sox.sourceforge.net/" license="GPL LGPL" |