diff options
48 files changed, 780 insertions, 314 deletions
diff --git a/main/alpine-mirrors/RELEASES.txt b/main/alpine-mirrors/RELEASES.txt index ec94b00f2d..903fa336e7 100644 --- a/main/alpine-mirrors/RELEASES.txt +++ b/main/alpine-mirrors/RELEASES.txt @@ -1,2 +1,2 @@ edge -v2.1 +v2.2 diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD index 399a4c0571..988eab3440 100644 --- a/main/bluez/APKBUILD +++ b/main/bluez/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez -pkgver=4.95 +pkgver=4.96 pkgrel=0 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -76,6 +76,6 @@ gstreamer() { mv "$pkgdir"/usr/lib/gstreamer* \ "$subpkgdir"/usr/lib/ } -md5sums="f34338440a4b3697cb9b3a2584f3251d bluez-4.95.tar.bz2 +md5sums="255c3dda8b93210ab0dcf8d04ddaf69f bluez-4.96.tar.bz2 c511078403d7d27673581a8bb468b90b bluetooth.initd a159d897a057f4675548327329c4cc22 bluetooth.confd" diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD index 333abc14c3..6a885d631b 100644 --- a/main/cgit/APKBUILD +++ b/main/cgit/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cgit -pkgver=0.9.0.1 +pkgver=0.9.0.2 pkgrel=0 _gitver=1.7.4 pkgdesc="a fast webinterface for git" @@ -43,5 +43,5 @@ package() { ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit } -md5sums="dddae5bcfc1eeb469fc2b95531a75c1c cgit-0.9.0.1.tar.bz2 +md5sums="5b92b07e0107ff24a783adfb8c0cd1f2 cgit-0.9.0.2.tar.bz2 fa24dc1ef0b663327ea0fe1981365b39 git-1.7.4.tar.bz2" diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index d11ebe14da..54516c5936 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -51,6 +51,7 @@ prepare() { build() { cd "$srcdir/$_realname-$_dahdiver" + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \ || return 1 } diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index 5fec0b5090..8b1611b279 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -50,6 +50,7 @@ prepare() { build() { cd "$srcdir/$_realname-$_dahdiver" + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \ || return 1 } diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 90528e8b65..256d3ede46 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=2.0.13 -pkgrel=0 +pkgrel=1 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" arch="all" @@ -11,10 +11,11 @@ depends="openssl logrotate" pkgusers="dovecot dovenull" pkggroups="dovecot dovenull" makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev postgresql-dev - mysql-dev sqlite-dev" + mysql-dev sqlite-dev heimdal-dev openldap-dev" install="dovecot.pre-install dovecot.post-install" subpackages="$pkgname-sample-config:config $pkgname-doc $pkgname-dev - $pkgname-pgsql $pkgname-mysql $pkgname-sqlite" + $pkgname-pgsql $pkgname-mysql $pkgname-sqlite $pkgname-gssapi + $pkgname-ldap" source="http://www.dovecot.org/releases/2.0/$pkgname-$pkgver.tar.gz dovecot.logrotate dovecot.initd @@ -33,6 +34,8 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --with-gssapi=plugin \ + --with-ldap=plugin \ --with-sql=plugin \ --with-mysql \ --with-sqlite \ @@ -44,7 +47,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install || return 1 + rm "$pkgdir"/usr/lib/dovecot/*.la \ + "$pkgdir"/usr/lib/dovecot/*/*.la || return 1 + install -d "$pkgdir"/var/run/dovecot \ "$pkgdir"/etc/ssl/dovecot install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname @@ -89,6 +95,16 @@ sqlite() { _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') } +gssapi() { + pkgdesc="GSSAPI auth plugin for dovecot" + _mv $(cd "$pkgdir" && find usr -name '*gssapi.so') +} + +ldap() { + pkgdesc="LDAP plugin for dovecot" + _mv $(cd "$pkgdir" && find usr -name '*ldap.so') +} + config() { pkgdesc="Sample configuration files for dovecot" install="dovecot-sample-config.post-install" diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 5e5cb410f6..adb57f8d54 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=0.8 +pkgver=0.8.1 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -59,5 +59,5 @@ package() { install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1 # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 } -md5sums="7e9b8c8a6952de0c477027e48249f3ed ffmpeg-0.8.tar.bz2 +md5sums="e9c497e221b5594df477bcbf318f4bce ffmpeg-0.8.1.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD index 1ec5bc3d71..8fa56bdca2 100644 --- a/main/freetype/APKBUILD +++ b/main/freetype/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=freetype -pkgver=2.4.5 -pkgrel=1 +pkgver=2.4.6 +pkgrel=0 pkgdesc="TrueType font rendering library" url="http://freetype.sourceforge.net" arch="all" @@ -43,7 +43,7 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="0e67460b312df905dc1cc1586690e7b2 freetype-2.4.5.tar.gz +md5sums="1dc4af24a86e2f78a49ac6b520a81ec5 freetype-2.4.6.tar.gz 376b94c06b113a62a3437e4130bb3fc3 20-enable-spr.patch 3f6c5739843dcbc110ee0f243c4f6bdb 30-enable-valid.patch bd2d808a0c00dcf9f1d1c0a9a8227ad9 40-memcpy-fix.patch" diff --git a/main/gdb/80_all_gdb-6.5-dwarf-stack-overflow.patch b/main/gdb/80_all_gdb-6.5-dwarf-stack-overflow.patch deleted file mode 100644 index 2c3c2cbae6..0000000000 --- a/main/gdb/80_all_gdb-6.5-dwarf-stack-overflow.patch +++ /dev/null @@ -1,54 +0,0 @@ -http://bugs.gentoo.org/144833 - -for gdb/ChangeLog: -2006-08-22 Will Drewry <wad@google.com> - Tavis Ormandy <taviso@google.com> - - * dwarf2read.c (decode_locdesc): Enforce location description stack - boundaries. - * dwarfread.c (locval): Likewise. - -2007-10-15 Jan Kratochvil <jan.kratochvil@redhat.com> - - Port to GDB-6.7. - -Index: gdb-6.7/gdb/dwarf2read.c -=================================================================== ---- gdb-6.7.orig/gdb/dwarf2read.c 2007-10-15 00:08:30.000000000 +0200 -+++ gdb-6.7/gdb/dwarf2read.c 2007-10-15 21:42:43.000000000 +0200 -@@ -9070,8 +9070,7 @@ dwarf2_fundamental_type (struct objfile - callers will only want a very basic result and this can become a - complaint. - -- Note that stack[0] is unused except as a default error return. -- Note that stack overflow is not yet handled. */ -+ Note that stack[0] is unused except as a default error return. */ - - static CORE_ADDR - decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu) -@@ -9088,7 +9087,7 @@ decode_locdesc (struct dwarf_block *blk, - - i = 0; - stacki = 0; -- stack[stacki] = 0; -+ stack[++stacki] = 0; - - while (i < size) - { -@@ -9270,6 +9269,16 @@ decode_locdesc (struct dwarf_block *blk, - dwarf_stack_op_name (op)); - return (stack[stacki]); - } -+ /* Enforce maximum stack depth of size-1 to avoid ++stacki writing -+ outside of the allocated space. Also enforce minimum > 0. -+ -- wad@google.com 14 Aug 2006 */ -+ if (stacki >= sizeof (stack) / sizeof (*stack) - 1) -+ internal_error (__FILE__, __LINE__, -+ _("location description stack too deep: %d"), -+ stacki); -+ if (stacki <= 0) -+ internal_error (__FILE__, __LINE__, -+ _("location description stack too shallow")); - } - return (stack[stacki]); - } diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD index b53a2b13e4..b6b8e77936 100644 --- a/main/gdb/APKBUILD +++ b/main/gdb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdb -pkgver=7.2 -pkgrel=1 +pkgver=7.3 +pkgrel=0 pkgdesc="The GNU Debugger" url="http://sources.redhat.com/gdb/" arch="all" @@ -9,9 +9,7 @@ license="GPL3" depends= makedepends="ncurses-dev expat-dev" subpackages="$pkgname-doc" -source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 - 80_all_gdb-6.5-dwarf-stack-overflow.patch - " +source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2" # patches were found here: # http://distfiles.gentoo.org/distfiles/gdb-7.2-patches-1.tar.xz _builddir="$srcdir"/$pkgname-$pkgver @@ -47,5 +45,4 @@ package() { rm -rf "$pkgdir"/usr/lib } -md5sums="64260e6c56979ee750a01055f16091a5 gdb-7.2.tar.bz2 -eb81ee111ba23682d4257dad50e01de0 80_all_gdb-6.5-dwarf-stack-overflow.patch" +md5sums="485022b8df7ba2221f217e128f479fe7 gdb-7.3.tar.bz2" diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD index 8ab075d932..cbd30ddfea 100644 --- a/main/gnumeric/APKBUILD +++ b/main/gnumeric/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnumeric -pkgver=1.10.16 -pkgrel=2 +pkgver=1.10.17 +pkgrel=0 pkgdesc="A GNOME Spreadsheet Program" url="http://www.gnome.org/projects/gnumeric/" arch="all" @@ -31,4 +31,4 @@ package() { "$pkgdir"/usr/lib/*/*/plugins/*/*.la } -md5sums="c79a7c4b6d2080d249c63a5045b78af3 gnumeric-1.10.16.tar.bz2" +md5sums="aacc0899222c98fa9cdd85c49a6840be gnumeric-1.10.17.tar.bz2" diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD index 1dc1be2be4..28445c377c 100644 --- a/main/iscsitarget-grsec/APKBUILD +++ b/main/iscsitarget-grsec/APKBUILD @@ -44,6 +44,7 @@ prepare() { build() { cd "$srcdir"/$_realname-$_iscsiver unset ARCH + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make KSRC="$_ksrc" kernel || return 1 } diff --git a/main/libgssglue/APKBUILD b/main/libgssglue/APKBUILD index 81bca94c41..9deadc927d 100644 --- a/main/libgssglue/APKBUILD +++ b/main/libgssglue/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgssglue -pkgver=0.1 -pkgrel=3 +pkgver=0.3 +pkgrel=0 pkgdesc="exports a gssapi interface which calls other random gssapi libraries" url="http://www.citi.umich.edu/projects/nfsv4/linux/" arch="all" @@ -25,5 +25,5 @@ package() { install -D -m 644 ../gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf install -D -m644 COPYING $pkgdir/usr/share/licenses/libgssglue/COPYING } -md5sums="ce1b4c758e6de01b712d154c5c97e540 libgssglue-0.1.tar.gz +md5sums="48aaad11b7371ba3270faa322202c038 libgssglue-0.3.tar.gz 234b9cca75a33af98eda3f1683756879 gssapi_mech.conf" diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD index 06274e824a..d8783c3416 100644 --- a/main/libsndfile/APKBUILD +++ b/main/libsndfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsndfile -pkgver=1.0.24 -pkgrel=1 +pkgver=1.0.25 +pkgrel=0 pkgdesc="A C library for reading and writing files containing sampled sound" url="http://www.mega-nerd.com/libsndfile" arch="all" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="8f823c30c1d8d44830db6ab845d6679e libsndfile-1.0.24.tar.gz" +md5sums="e2b7bb637e01022c7d20f95f9c3990a2 libsndfile-1.0.25.tar.gz" diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD index 9ee8bf44a0..bc078a8a6e 100644 --- a/main/libsoup/APKBUILD +++ b/main/libsoup/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsoup -pkgver=2.34.2 -pkgrel=1 +pkgver=2.34.3 +pkgrel=0 pkgdesc="Gnome HTTP Library" url="http://www.gnome.org" arch="all" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la } -md5sums="2454b38681a6e082b613a781a501e721 libsoup-2.34.2.tar.bz2" +md5sums="7112d198724f8d29fac4647ef400e39b libsoup-2.34.3.tar.bz2" diff --git a/main/libssh2/APKBUILD b/main/libssh2/APKBUILD new file mode 100644 index 0000000000..b9da63c70a --- /dev/null +++ b/main/libssh2/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: +pkgname=libssh2 +pkgver=1.2.8 +pkgrel=0 +pkgdesc="library for accessing ssh1/ssh2 protocol servers" +url="http://libssh2.org/" +arch="all" +license="BSD" +depends="" +depends_dev="openssl-dev zlib-dev" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev $pkgname-doc" +source="http://www.libssh2.org/download/libssh2-$pkgver.tar.gz" + +_builddir="$srcdir"/libssh2-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="1b236563b75d1b1f0d483352dc5918cf libssh2-1.2.8.tar.gz" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 72e5127e05..750aa0f379 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.38.8 _kernver=2.6.38 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -69,6 +69,7 @@ menuconfig() { build() { cd "$srcdir"/build + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ || return 1 @@ -141,5 +142,5 @@ c0f416f6a2e916633f697287cc7cb914 patch-2.6.38.8.bz2 58e1f9194fa75df9afdf2746370fa3cb grsecurity-2.2.2-2.6.38.8-unofficial.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch aa1b82da0cabfb41c5e6da5bddf60bab net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch -f4cf5b0ddfeef7aa87fb27792aff88a4 kernelconfig.x86 +991a83798618ad3318502116a8044d99 kernelconfig.x86 0a73d8d896101de90f47dae32119e7ca kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index f21ca50e0e..a648b9945e 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.38.6 Kernel Configuration -# Thu May 19 13:36:21 2011 +# Linux/i386 2.6.38.8 Kernel Configuration +# Wed Aug 3 08:43:09 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -49,7 +49,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y -CONFIG_X86_32_LAZY_GS=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_KTIME_SCALAR=y CONFIG_ARCH_CPU_PROBE_RELEASE=y @@ -416,7 +415,6 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_EFI is not set # CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -4947,7 +4945,7 @@ CONFIG_PAX_RANDMMAP=y # # CONFIG_PAX_MEMORY_SANITIZE is not set # CONFIG_PAX_MEMORY_STACKLEAK is not set -# CONFIG_PAX_MEMORY_UDEREF is not set +CONFIG_PAX_MEMORY_UDEREF=y CONFIG_PAX_REFCOUNT=y # CONFIG_PAX_USERCOPY is not set CONFIG_KEYS=y diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index b59cc857a0..921091ec84 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=2.6.38.7 +pkgver=2.6.38.8 _vsver=vs2.3.0.37-rc17 if [ "${pkgver##*.*.*.*}" = "$pkgver" ]; then @@ -63,6 +63,7 @@ menuconfig() { build() { cd "$srcdir"/build + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ || return 1 @@ -131,7 +132,7 @@ dev() { } md5sums="7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 -2639b4b98a2dcfc8b7f091543f289205 patch-2.6.38.7.bz2 -b9581dbf023e47a9f776c8eec8927418 patch-2.6.38.7-vs2.3.0.37-rc17.diff +c0f416f6a2e916633f697287cc7cb914 patch-2.6.38.8.bz2 +2a0c2d21c83811f8aca6b4ebab42f654 patch-2.6.38.8-vs2.3.0.37-rc17.diff bacde2f6f0ac4bac379d4bdfda09322a kernelconfig.x86 f409d26e7fe848308b7ddaf210bfaeb8 kernelconfig.x86_64" diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD index 51fe0e14a4..b2b8181d9f 100644 --- a/main/mc/APKBUILD +++ b/main/mc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mc -pkgver=4.7.5.2 -pkgrel=1 +pkgver=4.7.5.3 +pkgrel=0 pkgdesc="A filemanager/shell that emulates Norton Commander" url="http://www.ibiblio.org/mc/" arch="all" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="bdae966244496cd4f6d282d80c9cf3c6 mc-4.7.5.2.tar.bz2" +md5sums="6a67e139e0032d8a871455a80d490941 mc-4.7.5.3.tar.bz2" diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index e435a75ea1..1c568521c7 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.5.14 -pkgrel=1 +pkgver=5.5.15 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" pkgusers="mysql" @@ -187,6 +187,6 @@ bench() { mv "$pkgdir"/usr/share/sql-bench "$subpkgdir"/usr/share/ } -md5sums="19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz +md5sums="306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz 4e07e045a3abcb457c9c148dfd929ed6 0001-prefer-dynamic-library.patch d46df8ab94cb5686862ff90c0a6bf707 mysql.initd" diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index 611761be9e..446682044f 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -40,6 +40,7 @@ prepare() { build() { cd "$_builddir" unset ARCH + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs make KSRC="$_ksrc" kernel || return 1 } diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index ad2258c73d..37fbd6bb8f 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -65,5 +65,5 @@ package() { done } -md5sums="aa2bd6533e1543c7cbda794db7365780 open-vm-tools-2011.06.27-437995.tar.gz +md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd" diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index c58ce5a4ad..480a019297 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -65,5 +65,5 @@ package() { done } -md5sums="aa2bd6533e1543c7cbda794db7365780 open-vm-tools-2011.06.27-437995.tar.gz +md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd" diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD index 5f3c9a5f68..9ce7481a59 100644 --- a/main/open-vm-tools/APKBUILD +++ b/main/open-vm-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=open-vm-tools -pkgver=2011.06.27 -_pkgsubver=437995 +pkgver=2011.07.19 +_pkgsubver=450511 pkgrel=0 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="http://open-vm-tools.sourceforge.net/" @@ -82,7 +82,7 @@ gtk() { "$subpkgdir"/usr/lib/open-vm-tools/plugins/ } -md5sums="aa2bd6533e1543c7cbda794db7365780 open-vm-tools-2011.06.27-437995.tar.gz +md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz 49e2e394d0b567fa71fcd295e96bc1c8 getloadavg-uclibc.patch 82840b6bed002284b9bd2358707ee826 codeset-uclibc.patch 840e4d6ff3f53fc22bdedf4d64aabc91 ecvt.patch diff --git a/main/openbox/APKBUILD b/main/openbox/APKBUILD index 35e2320707..63db6081bd 100644 --- a/main/openbox/APKBUILD +++ b/main/openbox/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openbox -pkgver=3.4.11.2 -pkgrel=1 +pkgver=3.5.0 +pkgrel=0 pkgdesc="A highly configurable and standards-compliant X11 window manager" url="http://openbox.org" arch="all" @@ -74,5 +74,5 @@ kde() { "$subpkgdir"/usr/share/xsessions/ || return 1 } -md5sums="30e669134fa81df810fe7d1dc59cd931 openbox-3.4.11.2.tar.gz +md5sums="00441b53cf14c03566c8e82643544ff9 openbox-3.5.0.tar.gz 16ca0d290cae2f4c16a35e9cdfb6f503 setlayout.c" diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index 51961c8bc1..b838200cbb 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openldap -pkgver=2.4.25 -pkgrel=2 +pkgver=2.4.26 +pkgrel=0 pkgdesc="LDAP Server" url="http://www.openldap.org/" arch="all" @@ -17,7 +17,6 @@ install="$pkgname.pre-install $pkgname.post-install" source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz openldap-2.4-ppolicy.patch openldap-2.4.11-libldap_r.patch - openldap-back-sql-fix-64bit.patch slapd.initd slapd.confd slurpd.initd @@ -109,10 +108,9 @@ meta() { _backend meta; } monitor() { _backend monitor; } -md5sums="ec63f9c2add59f323a0459128846905b openldap-2.4.25.tgz +md5sums="f36f3086031dd56ae94f722ffae8df5e openldap-2.4.26.tgz 2524e490ba334a760fa57057c16da7a9 openldap-2.4-ppolicy.patch d19d0502f046078ecd737e29e7552fa8 openldap-2.4.11-libldap_r.patch -226eefb3e17810f453b76cbc9d1bdbad openldap-back-sql-fix-64bit.patch a729bf553d12b4a9fbda0ff5202a0443 slapd.initd b672311fca605c398240cd37a2ae080a slapd.confd fa5ce0005ef5f1160b6ff126f97aaa1a slurpd.initd" diff --git a/main/openldap/openldap-back-sql-fix-64bit.patch b/main/openldap/openldap-back-sql-fix-64bit.patch deleted file mode 100644 index 82707d4e73..0000000000 --- a/main/openldap/openldap-back-sql-fix-64bit.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Timo Teräs <timo.teras@iki.fi> - -Fix openldap memory corruption with back-sql on 64-bit architectures. - ---- openldap-2.4.25/servers/slapd/back-sql/add.c -+++ openldap-2.4.25.patched/servers/slapd/back-sql/add.c -@@ -1217,7 +1217,7 @@ - - if ( !BACKSQL_IS_ADD( oc->bom_expect_return ) ) { - SWORD ncols; -- SQLINTEGER value_len; -+ SQLLEN value_len; - - if ( BACKSQL_CREATE_NEEDS_SELECT( bi ) ) { - SQLFreeStmt( sth, SQL_DROP ); ---- openldap-2.4.25/servers/slapd/back-sql/back-sql.h -+++ openldap-2.4.25.patched/servers/slapd/back-sql/back-sql.h -@@ -183,7 +183,7 @@ - UDWORD *col_prec; - SQLSMALLINT *col_type; - char **cols; -- SQLINTEGER *value_len; -+ SQLLEN *value_len; - } BACKSQL_ROW_NTS; - - /* ---- openldap-2.4.25/servers/slapd/back-sql/proto-sql.h -+++ openldap-2.4.25.patched/servers/slapd/back-sql/proto-sql.h -@@ -189,25 +189,25 @@ - #define backsql_BindParamStr( sth, par_ind, io, str, maxlen ) \ - SQLBindParameter( (sth), (SQLUSMALLINT)(par_ind), \ - (io), SQL_C_CHAR, SQL_VARCHAR, \ -- (SQLUINTEGER)(maxlen), 0, (SQLPOINTER)(str), \ -- (SQLUINTEGER)(maxlen), NULL ) -+ (SQLULEN)(maxlen), 0, (SQLPOINTER)(str), \ -+ (SQLLEN)(maxlen), NULL ) - - #define backsql_BindParamBerVal( sth, par_ind, io, bv ) \ - SQLBindParameter( (sth), (SQLUSMALLINT)(par_ind), \ - (io), SQL_C_CHAR, SQL_VARCHAR, \ -- (SQLUINTEGER)(bv)->bv_len, 0, \ -+ (SQLULEN)(bv)->bv_len, 0, \ - (SQLPOINTER)(bv)->bv_val, \ -- (SQLUINTEGER)(bv)->bv_len, NULL ) -+ (SQLLEN)(bv)->bv_len, NULL ) - - #define backsql_BindParamInt( sth, par_ind, io, val ) \ - SQLBindParameter( (sth), (SQLUSMALLINT)(par_ind), \ - (io), SQL_C_ULONG, SQL_INTEGER, \ -- 0, 0, (SQLPOINTER)(val), 0, (SQLINTEGER*)NULL ) -+ 0, 0, (SQLPOINTER)(val), 0, (SQLLEN*)NULL ) - - #define backsql_BindParamNumID( sth, par_ind, io, val ) \ - SQLBindParameter( (sth), (SQLUSMALLINT)(par_ind), \ - (io), BACKSQL_C_NUMID, SQL_INTEGER, \ -- 0, 0, (SQLPOINTER)(val), 0, (SQLINTEGER*)NULL ) -+ 0, 0, (SQLPOINTER)(val), 0, (SQLLEN*)NULL ) - - #ifdef BACKSQL_ARBITRARY_KEY - #define backsql_BindParamID( sth, par_ind, io, id ) \ ---- openldap-2.4.25/servers/slapd/back-sql/sql-wrap.c -+++ openldap-2.4.25.patched/servers/slapd/back-sql/sql-wrap.c -@@ -148,7 +148,7 @@ - } else { - SQLCHAR colname[ 64 ]; - SQLSMALLINT name_len, col_type, col_scale, col_null; -- UDWORD col_prec; -+ SQLLEN col_prec; - int i; - - #ifdef BACKSQL_TRACE -@@ -180,8 +180,8 @@ - goto nomem; - } - -- row->value_len = (SQLINTEGER *)ber_memcalloc_x( row->ncols, -- sizeof( SQLINTEGER ), ctx ); -+ row->value_len = (SQLLEN *)ber_memcalloc_x( row->ncols, -+ sizeof( SQLLEN ), ctx ); - if ( row->value_len == NULL ) { - goto nomem; - } diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 812542cd1e..6b39b89f6b 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openrc -pkgver=0.8.2 +pkgver=0.8.3 _ver=${pkgver/_git*/} -pkgrel=2 +pkgrel=0 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -60,10 +60,10 @@ package() { done install -D -m644 "$srcdir"/modloop.confd "$pkgdir"/etc/conf.d/modloop - install -d "$pkgdir"/etc/local.d + install -d "$pkgdir"/etc/local.d "$pkgdir"/run } -md5sums="a30f2e54f025b92fb40a0be5d464877d openrc-0.8.2.tar.bz2 +md5sums="c2c964d29e91a32dec4df75cd6d79102 openrc-0.8.3.tar.bz2 8c2c1c2ee0509b63966b7187a2079f4b openrc-0.4.3-mkmntdirs.patch 4fd036ff07ed9ad7fb76af6a3ffc0695 0001-Force-root-be-rw-before-localmount.patch fb8baeaf32f4d53491312675f28a9939 0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch diff --git a/main/pekwm/APKBUILD b/main/pekwm/APKBUILD index a34ffe3769..ea946a01df 100644 --- a/main/pekwm/APKBUILD +++ b/main/pekwm/APKBUILD @@ -1,8 +1,7 @@ -# Contributor: # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pekwm -pkgver=0.1.12 -pkgrel=1 +pkgver=0.1.13 +pkgrel=0 pkgdesc="Fast & Light Window Manager" url="http://pekwm.org/projects/pekwm" arch="all" @@ -11,7 +10,7 @@ depends= makedepends="libiconv-dev libx11-dev" install= subpackages="$pkgname-doc" -source="http://pekwm.org/projects/pekwm/files/pekwm-$pkgver.tar.gz" +source="http://pekwm.org/projects/pekwm/files/pekwm-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver @@ -34,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="1f7f9ed32cc03f565a3ad30fd6045c1f pekwm-0.1.12.tar.gz" +md5sums="51a3f9030817df0304cc1da5110e493a pekwm-0.1.13.tar.bz2" diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index b25d795239..1581aa764a 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,23 +1,35 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.6.17 -pkgrel=3 +pkgrel=4 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" arch="all" license="apache bsd" depends= makedepends="apr-dev apr-util-dev expat-dev neon-dev openssl-dev zlib-dev - e2fsprogs-dev sqlite-dev apache2-dev perl-dev swig" + e2fsprogs-dev sqlite-dev apache2-dev perl-dev swig + autoconf automake libtool" install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs mod_dav_svn perl-$pkgname:pl" source="http://subversion.tigris.org/downloads/subversion-$pkgver.tar.bz2 + subversion-1.6.0-deplibs.patch svnserve.confd svnserve.initd " _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + ./autogen.sh +} + build() { cd "$_builddir" ./configure --prefix=/usr \ @@ -65,5 +77,6 @@ pl() { } md5sums="81e5dc5beee4b3fc025ac70c0b6caa14 subversion-1.6.17.tar.bz2 +f1ebbdcd51671f5394dca0e8489d088c subversion-1.6.0-deplibs.patch d084a7558053784886bc858b94fa9186 svnserve.confd 22c274fafb4817e31126f60f9d84039f svnserve.initd" diff --git a/main/subversion/subversion-1.6.0-deplibs.patch b/main/subversion/subversion-1.6.0-deplibs.patch new file mode 100644 index 0000000000..d892a7b24f --- /dev/null +++ b/main/subversion/subversion-1.6.0-deplibs.patch @@ -0,0 +1,30 @@ +--- subversion-1.6.0/build/ac-macros/apr.m4.deplibs ++++ subversion-1.6.0/build/ac-macros/apr.m4 +@@ -76,9 +76,9 @@ AC_DEFUN(SVN_LIB_APR, + + dnl When APR stores the dependent libs in the .la file, we don't need + dnl --libs. +- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" ++ SVN_APR_LIBS="`$apr_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apr-config --link-libtool failed]) + fi + + SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" +--- subversion-1.6.0/build/ac-macros/aprutil.m4.deplibs ++++ subversion-1.6.0/build/ac-macros/aprutil.m4 +@@ -77,11 +77,9 @@ AC_DEFUN(SVN_LIB_APRUTIL, + AC_MSG_ERROR([apu-config --prefix failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" ++ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apu-config --link-libtool failed]) + fi + + SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 4e92dbe37a..5a962cfddd 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux pkgver=4.04 -pkgrel=3 +pkgrel=4 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." url="http://syslinux.org" arch="x86 x86_64" license="GPL" makedepends="nasm perl" depends="mtools blkid" -triggers="syslinux.trigger=/boot" +triggers="" source="http://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgver%%.*}.xx/$pkgname-$pkgver.tar.bz2 extlinux.conf update-extlinux diff --git a/main/thunar-vcs-plugin/APKBUILD b/main/thunar-vcs-plugin/APKBUILD new file mode 100644 index 0000000000..a91443366a --- /dev/null +++ b/main/thunar-vcs-plugin/APKBUILD @@ -0,0 +1,72 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=thunar-vcs-plugin +pkgver=0.1.4 +pkgrel=1 +pkgdesc="Version Contol System plugin for the Thunar filemanager" +url="http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin" +arch="all" +license="GPLv2+" +depends= +makedepends="thunar-dev subversion-dev apr-dev util-linux-ng-dev" +install="" +subpackages="$pkgname-git:_git $pkgname-svn:_svn" +source="http://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/thunar-vcs-plugin-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + # quick and dirty fix for apr linking + sed -i -e 's/APR_LDFLAGS/APR_LIBS/' thunar-vcs-plugin/Makefile.in +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/xfce4 \ + --disable-static \ + --enable-subversion \ + --enable-git \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/thunarx-*/*.la +} + +_mv_files() { + local i + for i in "$@"; do + mkdir -p "$subpkgdir"/${i%/*} + mv "$pkgdir"/$i "$subpkgdir"/$i || return 1 + done +} + +_git() { + pkgdesc="Git support for thunar-vcs-plugin" + depends= + install_if="thunar-vcs-plugin git" + cd "$pkgdir" + _mv_files usr/lib/xfce4/tvp-git-helper \ + usr/share/icons/hicolor/*/apps/git.png +} + +_svn() { + pkgdesc="Subversion support for thunar-vcs-plugin" + depends= + install_if="thunar-vcs-plugin subversion" + cd "$pkgdir" + _mv_files usr/lib/xfce4/tvp-svn-helper \ + usr/share/icons/hicolor/*/apps/subversion.png +} + +md5sums="b2321096c706e42b85987f0114ab73bc thunar-vcs-plugin-0.1.4.tar.bz2" diff --git a/testing/thunar-volman/APKBUILD b/main/thunar-volman/APKBUILD index e092d537d1..e092d537d1 100644 --- a/testing/thunar-volman/APKBUILD +++ b/main/thunar-volman/APKBUILD diff --git a/main/udev/APKBUILD b/main/udev/APKBUILD index e1e3d12688..be7e52d930 100644 --- a/main/udev/APKBUILD +++ b/main/udev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=udev -pkgver=171 -pkgrel=1 +pkgver=173 +pkgrel=0 pkgdesc="The userspace dev tools (udev)" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" arch="all" @@ -67,7 +67,7 @@ libgudev() { "$subpkgdir"/usr/lib/ } -md5sums="bdf4617284be2ecac11767437417e209 udev-171.tar.bz2 +md5sums="91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2 c9de7581099cdfdcd105666cd98a0f0a write_root_link_rule 7bf11e11519117f743483c73e0767750 move_tmp_persistent_rules.sh 884d7faaaa149a323b14e907ea1934f4 udev-mount.initd diff --git a/main/udisks/APKBUILD b/main/udisks/APKBUILD index ce028a33b6..b8b6851bba 100644 --- a/main/udisks/APKBUILD +++ b/main/udisks/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=udisks -pkgver=1.0.2 -pkgrel=3 +pkgver=1.0.3 +pkgrel=0 pkgdesc="Disk Management Service" url="http://www.freedesktop.org/wiki/Software/udisks" arch="all" @@ -47,4 +47,4 @@ package() { mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -md5sums="f630eefa51b95d6485eb3246bc1bea9a udisks-1.0.2.tar.gz" +md5sums="9ad30772152c755df95cbb6fc91ad0cf udisks-1.0.3.tar.gz" diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index 57862e5bad..a13f83f5c4 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vim -pkgver=7.3.206 +pkgver=7.3.266 _srcver=${pkgver%.*} _patchver=${pkgver##*.} -pkgrel=1 +pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" arch="all" @@ -269,4 +269,64 @@ c1cd1bdaa61c6ab76a39dc59926781ef 7.3.201 ce69cdd4cff0f9a1ae208bb6a3c490d2 7.3.203 07443373d2221a375988d58e25935599 7.3.204 857f19149697b27088447bbac1dac8a2 7.3.205 -f6c7f47221c0459c7742a82163b875ec 7.3.206" +f6c7f47221c0459c7742a82163b875ec 7.3.206 +8345c7411daf0d5874569aecc00116d6 7.3.207 +305b1a2aca53880ae175bcf5c8b8677c 7.3.208 +318086a8e28f1ef629c447410bcfd5bb 7.3.209 +fc829046b2c27d7255bd41ee53c6bdf3 7.3.210 +3e6c6aeadc3e4442426db92774030fcc 7.3.211 +3fb34281705b6e665b9ec2dbe4529170 7.3.212 +1c2fb1aec7b85b941d4459e65dbf6be2 7.3.213 +d4dc20af8f15778ddea5669ee758d8c1 7.3.214 +ab31988223b9ec68c551ef2e493049d6 7.3.215 +8bfadd46248bbfbe7979d1d6161befc2 7.3.216 +d42c9de414acf351e37f19af168905bc 7.3.217 +6d01c2640c6c27c4b52462d6fb932598 7.3.218 +b723228570479525596d8ecb801d9c76 7.3.219 +36dd4e49c8d0a7407cd3447ce11c0aff 7.3.220 +11791e6072d3237424c0f383835a4b7f 7.3.221 +4a084d6e010fc5c31a89478a918ebe53 7.3.222 +fb57886a2e3e9791b87d68fbc9eef52f 7.3.223 +0b9747a5a0465d7fe543f8b61ffc9b06 7.3.224 +3a36d002f35d54e7e71da0cde224534b 7.3.225 +caa99b2aba3d2f64d4da35c28d4e6ef8 7.3.226 +4e0baffb29e3e38487c4206c78ea515c 7.3.227 +511c6f3ee0703d2b1380c72c7d296e6f 7.3.228 +14997e70581cfb6ff6f2388789171e33 7.3.229 +17259f324289a8e398a3acfba915b979 7.3.230 +97d5c45f8962fc301ca53ce8c5ecc7eb 7.3.231 +4601b72331313fbd68789673055020a8 7.3.232 +d00dd333810b99a9c34ea9fe44c6dec7 7.3.233 +e93dd1dcf4659ad7f7a31d186842180d 7.3.234 +78e79d2172140d6cb26012859d2b765e 7.3.235 +f48a731e37bb068a11615fc84b13d9b4 7.3.236 +ae4c4ba1a880872d735e33d721847f82 7.3.237 +d7b91bce232cc3592aee0b999f2260ce 7.3.238 +45c528a5991e5269d0f99f1bd60a1108 7.3.239 +e73f15b7f1a7cf257a126a797bc1024e 7.3.240 +f32f5f0c4c437f7f661bfe1bbd03924f 7.3.241 +4071af06946723d29a502a0a005ad79a 7.3.242 +93d093ed4a247ebfd9d485e1949b73c6 7.3.243 +0eaf4bd3d26ed9760901e9dbefc0a631 7.3.244 +7906c8701fcfc608c2845937c58d4ebe 7.3.245 +514a57d874e75020342622e3031ff1f6 7.3.246 +0cc613cf226c3eb2b2c6992f6abf8fa6 7.3.247 +36aa885fdfb0ae812b3f3371ee178b7d 7.3.248 +2f1a1c835e46e409ca62a906b014bead 7.3.249 +e3c8db05d35f495ab87f2bd7d6f0798c 7.3.250 +8fad46eda9f29a79b852f9761951b528 7.3.251 +54e0f0c2d867cc3e9dc0d619ceab2fa0 7.3.252 +1dba332eda89257de3b4ab6bb7df2ffb 7.3.253 +42135c50e9b0de895fea643b9fbf31ff 7.3.254 +90e0151fc8c6516315a0aae7e659e493 7.3.255 +ff7faa0e5f65cd23c72658a6769be01d 7.3.256 +eefe321ea81f64d5900b0c22807d1548 7.3.257 +e491344e65975e1bd57b2e2e98c3f37c 7.3.258 +408ef7a75b952a1eff9748ee84e3efd7 7.3.259 +2b978f84b6938e6987c8bfa7381f8149 7.3.260 +5b1be0859bacd79aa4a5825797188891 7.3.261 +b6c7e75eff8c8be855f9edd6de76d2b9 7.3.262 +cdcd0dcc3d01f637631d1a0978ebbd16 7.3.263 +cec9db6615a9151e4c8198dcee8b24a7 7.3.264 +93a2c2ac7d15bec2bf9d6534dc502831 7.3.265 +f1898db88e6e05f22fa6aed6651d34ab 7.3.266" diff --git a/testing/gcc/APKBUILD b/testing/gcc/APKBUILD index a9600d2214..3126953de5 100644 --- a/testing/gcc/APKBUILD +++ b/testing/gcc/APKBUILD @@ -7,7 +7,7 @@ _specs_gcc_ver=4.4.3 _uclibc_abiver=0.9.32 -pkgrel=0 +pkgrel=2 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" @@ -28,6 +28,7 @@ if [ "$LANG_OBJC" != "off" ]; then fi if [ "$LANG_JAVA" != "off" ]; then subpackages="$subpackages $pkgname-java libgcj" + makedepends="$makedepends paxctl" fi source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2 @@ -165,7 +166,7 @@ build() { --build=${CBUILD} \ --host=${CHOST} \ --target=${CTARGET} \ - --with-pkgversion='Alpine' \ + --with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \ --disable-altivec \ --disable-checking \ --disable-fixed-point \ @@ -277,6 +278,7 @@ libgomp() { java() { pkgdesc="Java support for GCC" + paxctl -c -p -e -m "$pkgdir"/usr/libexec/gcc/*/*/ecj1 || return 1 mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib cd "$pkgdir"/usr/bin mv gcj gcj-dbtool gjavah gcjh jcf-dump "$subpkgdir"/usr/bin/ diff --git a/testing/graphviz/0001-clone-nameclash.patch b/testing/graphviz/0001-clone-nameclash.patch new file mode 100644 index 0000000000..6222238d8d --- /dev/null +++ b/testing/graphviz/0001-clone-nameclash.patch @@ -0,0 +1,87 @@ +From cb8bbbd3a48fa1f41965617852d11e02eb20b1f0 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 26 Jul 2011 12:41:21 +0000 +Subject: [PATCH] clone nameclash + +--- + lib/gvpr/actions.c | 6 +++--- + lib/gvpr/actions.h | 2 +- + lib/gvpr/compile.c | 2 +- + lib/gvpr/gvpr.c | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c +index 05bfcd1..b3b4a60 100644 +--- a/lib/gvpr/actions.c ++++ b/lib/gvpr/actions.c +@@ -380,7 +380,7 @@ Agraph_t *cloneG(Agraph_t * g, char* name) + * graph. Otherwise, create a clone subgraph of g. + * Assume obj != NULL. + */ +-Agobj_t *clone(Agraph_t * g, Agobj_t * obj) ++Agobj_t *cloneO(Agraph_t * g, Agobj_t * obj) + { + Agobj_t *nobj = 0; + Agedge_t *e; +@@ -415,8 +415,8 @@ Agobj_t *clone(Agraph_t * g, Agobj_t * obj) + case AGINEDGE: + case AGOUTEDGE: + e = (Agedge_t *) obj; +- t = (Agnode_t *) clone(g, OBJ(agtail(e))); +- h = (Agnode_t *) clone(g, OBJ(aghead(e))); ++ t = (Agnode_t *) cloneO(g, OBJ(agtail(e))); ++ h = (Agnode_t *) cloneO(g, OBJ(aghead(e))); + name = agnameof (AGMKOUT(e)); + nobj = (Agobj_t *) openEdge(g, t, h, name); + if (nobj) +diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h +index 5c62a3b..4223c52 100644 +--- a/lib/gvpr/actions.h ++++ b/lib/gvpr/actions.h +@@ -22,7 +22,7 @@ extern "C" { + #include "expr.h" + + extern void nodeInduce(Agraph_t * selected); +- extern Agobj_t *clone(Agraph_t * g, Agobj_t * obj); ++ extern Agobj_t *cloneO(Agraph_t * g, Agobj_t * obj); + extern Agraph_t *cloneG(Agraph_t * g, char* name); + extern Agobj_t *copy(Agraph_t * g, Agobj_t * obj); + extern int copyAttr(Agobj_t * obj, Agobj_t * obj1); +diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c +index c157572..0914210 100644 +--- a/lib/gvpr/compile.c ++++ b/lib/gvpr/compile.c +@@ -1087,7 +1087,7 @@ getval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref, + error(ERROR_WARNING, "NULL object passed to clone()"); + v.integer = 0; + } else +- v.integer = PTR2INT(clone(gp, objp)); ++ v.integer = PTR2INT(cloneO(gp, objp)); + break; + case F_cloneG: + gp = INT2PTR(Agraph_t *, args[0].integer); +diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c +index 0d47d70..9a1bfd1 100644 +--- a/lib/gvpr/gvpr.c ++++ b/lib/gvpr/gvpr.c +@@ -803,7 +803,7 @@ addOutputGraph (Gpr_t* state, gvpropts* uopts) + Agraph_t* g = state->outgraph; + + if ((agroot(g) == state->curgraph) && !uopts->ingraphs) +- g = (Agraph_t*)clone (0, (Agobj_t *)g); ++ g = (Agraph_t*)cloneO (0, (Agobj_t *)g); + + uopts->n_outgraphs++; + uopts->outgraphs = oldof(uopts->outgraphs,Agraph_t*,uopts->n_outgraphs,0); +@@ -988,7 +988,7 @@ int gvpr (int argc, char *argv[], gvpropts * uopts) + + /* begin graph */ + if (incoreGraphs && (opts->compflags & CLONE)) +- state->curgraph = (Agraph_t*)clone (0, (Agobj_t*)(state->curgraph)); ++ state->curgraph = (Agraph_t*)cloneO (0, (Agobj_t*)(state->curgraph)); + state->curobj = (Agobj_t *) state->curgraph; + state->tvroot = 0; + if (bp->begg_stmt) +-- +1.7.6 + diff --git a/testing/graphviz/APKBUILD b/testing/graphviz/APKBUILD new file mode 100644 index 0000000000..03b33aaccf --- /dev/null +++ b/testing/graphviz/APKBUILD @@ -0,0 +1,101 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=graphviz +pkgver=2.28.0 +pkgrel=0 +pkgdesc="Graph Visualization Tools" +url="http://www.graphviz.org/" +arch="all" +license="EPL" +depends="" +depends_dev="zlib-dev libpng-dev jpeg-dev expat-dev freetype-dev bison m4 flex + fontconfig-dev libtool libsm-dev libxext-dev cairo-dev pango-dev + gmp-dev lua-dev gtk+-dev swig python-dev" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev $pkgname-doc py-$pkgname:py lua-$pkgname:_lua + $pkgname-gtk $pkgname-graphs" +source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar.gz + 0001-clone-nameclash.patch" + +_builddir="$srcdir"/graphviz-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + # use /usr/lib instead of /usr/lib64 + sed -i -e 's/LIBPOSTFIX="64"/LIBPOSTFIX=/' configure || return 1 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + --disable-static \ + --disable-dependency-tracking \ + --enable-lua=yes \ + --without-mylibgd \ + --with-ipsepcola \ + --with-pangocairo \ + --with-gdk-pixbuf \ + --with-png \ + --with-jpeg \ + || return 1 + if [ "$CARCH" = "x86_64" ]; then + # the configure script thinks we have sincos. we dont. + sed -i -e '/HAVE_SINCOS/d' config.h || return 1 + fi + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" \ + pkgconfigdir=/usr/lib/pkgconfig \ + install || return 1 + mkdir -p "$pkgdir"/usr/share/doc + mv "$pkgdir"/usr/share/graphviz/doc "$pkgdir"/usr/share/doc/graphviz || return 1 + rm -f "$pkgdir"/usr/lib/*.la \ + "$pkgdir"/usr/lib/graphviz/*.la \ + "$pkgdir"/usr/lib/graphviz/*/*.la \ + || return 1 +} + +py() { + pkgdesc="Python extension for graphviz" + mkdir -p "$subpkgdir"/usr/lib/graphviz \ + "$subpkgdir"/usr/lib || return 1 + mv "$pkgdir"/usr/lib/graphviz/python* \ + "$subpkgdir"/usr/lib/graphviz || return 1 + mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ +} + +_lua() { + pkgdesc="Lua extension for graphviz" + mkdir -p "$subpkgdir"/usr/lib/graphviz \ + "$subpkgdir"/usr/lib/lua || return 1 + mv "$pkgdir"/usr/lib/graphviz/lua \ + "$subpkgdir"/usr/lib/graphviz || return 1 + mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/ +} + +gtk() { + pkgdesc="Gtk extension for graphviz" + mkdir -p "$subpkgdir"/usr/lib/graphviz || return 1 + mv "$pkgdir"/usr/lib/graphviz/libgvplugin_g?k* \ + "$subpkgdir"/usr/lib/graphviz || return 1 +} + +graphs() { + pkgdesc="Demo graphs for graphviz" + mkdir -p "$subpkgdir"/usr/share/graphviz || return 1 + mv "$pkgdir"/usr/share/graphviz/graphs \ + "$subpkgdir"/usr/share/graphviz/ +} +md5sums="8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz +bce8a9ae4c3a8c52c1bcf0e03d5ce364 0001-clone-nameclash.patch" diff --git a/testing/joe/APKBUILD b/testing/joe/APKBUILD new file mode 100644 index 0000000000..6ee1013bd9 --- /dev/null +++ b/testing/joe/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Danilo Godec <danilo.godec@agenda.si> +# Maintainer: +pkgname=joe +pkgver=3.7 +pkgrel=0 +pkgdesc="Full featured terminal-based screen editor" +url="http://joe-editor.sourceforge.net/" +arch="all" +license="GPL" +depends="" +makedepends="ncurses-dev" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +md5sums="66de1b073e869ba12abbfcde3885c577 joe-3.7.tar.gz" + diff --git a/testing/libc6/APKBUILD b/testing/libc6/APKBUILD new file mode 100644 index 0000000000..2eb91a2192 --- /dev/null +++ b/testing/libc6/APKBUILD @@ -0,0 +1,117 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=libc6 +pkgver=2.14 +pkgrel=0 +svnrev=14663 +pkgdesc="Embedded GNU C Library" +url="http://eglibc.org/" +arch="" +license="LGPL" +depends= +depends_dev="linux-headers>=2.6.18" +provides="libiconv" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev + $pkgname-doc + + gconv-modules:gconv + locales + nscd" +options="!strip" +source="http://dev.alpinelinux.org/~nenolod/eglibc-${pkgver}.r${svnrev}.tar.gz + + glibc-2.12-hardened-pie.patch + glibc-2.10-hardened-configure-picdefault.patch + glibc-2.10-hardened-inittls-nosysenter.patch + + chk_fail.c + stack_chk_fail.c + + nscd.initd" + +_srcdir="$srcdir"/eglibc-$pkgver +_builddir="$srcdir"/eglibc-build +prepare() { + local i + cd "$_srcdir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + echo "slibdir=/lib" >> configparms + + cp "$srcdir"/chk_fail.c "$_srcdir"/debug/chk_fail.c + cp "$srcdir"/stack_chk_fail.c "$_srcdir"/debug/stack_chk_fail.c + + mkdir "$_builddir" +} + +build() { + cd "$_builddir" + + export CFLAGS="$CFLAGS -fno-stack-protector" + + "$_srcdir"/configure --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --with-headers=/usr/include \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --enable-kernel=2.6.18 \ + --enable-add-ons=nptl,libidn \ + --disable-profile \ + --enable-bind-now \ + --with-tls \ + --with-__thread \ + --without-zoneinfo \ + --without-cvs \ + --without-gd \ + --with-pkgversion="Alpine EGLIBC ${pkgver}-r${pkgrel} [svn r${svnrev}]" \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make install_root="$pkgdir" install || return 1 +} + +gconv() { + pkgdesc="GNU iconv character modules" + + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/iconv "$subpkgdir"/usr/lib +} + +locales() { + pkgdesc="Common files for locale support" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/* "$subpkgdir"/usr/share +} + +nscd() { + pkgdesc="Cache daemon for NIS/DNS" + + mkdir -p "$subpkgdir"/var/db/nscd + mkdir -p "$subpkgdir"/var/run/nscd + + install -Dm 755 "$srcdir"/nscd.initd "$subpkgdir"/etc/init.d/nscd + install -Dm 644 "$srcdir"/libc/nscd/nscd.conf "$subpkgdir"/etc/nscd.conf + + mkdir -p "$subpkgdir"/usr/sbin + mv "$pkgdir"/usr/sbin/nscd "$subpkgdir"/usr/sbin +} + +md5sums="c6de1455fcef3487ee42c14349a72cf4 eglibc-2.14.r14663.tar.gz +03ffc414f8eb9f1fcb93325008f5ecd7 glibc-2.12-hardened-pie.patch +8bca42eb8f6d117107ab8e356566b805 glibc-2.10-hardened-configure-picdefault.patch +d3b50eec50099791bf2f0c10b605ff7c glibc-2.10-hardened-inittls-nosysenter.patch +1b31d2c7a39298da10e3840076514823 chk_fail.c +6a6b9992c76a9bece219eb00a16d7549 stack_chk_fail.c +ff0b0069eeb662145d287d7f98c79447 nscd.initd" diff --git a/testing/libc6/nscd.initd b/testing/libc6/nscd.initd new file mode 100644 index 0000000000..949c49e82a --- /dev/null +++ b/testing/libc6/nscd.initd @@ -0,0 +1,18 @@ +#!/sbin/runscript + +DAEMON=/usr/sbin/nscd + +start() { + ebegin "Starting nscd" + # remove stale files + rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null + start-stop-daemon --start --exec $DAEMON + eend $? +} + +stop () { + ebegin "Stopping nscd" + start-stop-daemon --stop --quiet \ + --pidfile=/var/run/nscd/nscd.pid + eend $? +} diff --git a/testing/llvm/APKBUILD b/testing/llvm/APKBUILD index fb96a8c547..92f70b9231 100644 --- a/testing/llvm/APKBUILD +++ b/testing/llvm/APKBUILD @@ -1,10 +1,10 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=llvm -pkgver=2.8 +pkgver=2.9 pkgrel=0 pkgdesc="low level virtual machine compiler system" -arch="all" +arch="x86" url="http://llvm.org/" license="UOI-NCSA" depends= @@ -13,7 +13,7 @@ install= subpackages="$pkgname-dev $pkgname-doc" source="http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - llvm-uclibc-errno-fsckery.patch" + " _builddir="$srcdir"/build @@ -44,6 +44,11 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info + + # configure gets it wrong. We do have error_t + sed -i -e 's/.*undef HAVE_ERROR_T.*/#define HAVE_ERROR_T 1/' \ + -e '/define error_t/d' \ + ./include/llvm/Config/config.h || return 1 make || return 1 } @@ -52,6 +57,5 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="220d361b4d17051ff4bb21c64abe05ba llvm-2.8.tgz -10e14c901fc3728eecbd5b829e011b59 clang-2.8.tgz -089441aa2369c90a0fd0edaa311cb7d6 llvm-uclibc-errno-fsckery.patch" +md5sums="793138412d2af2c7c7f54615f8943771 llvm-2.9.tgz +634de18d04b7a4ded19ec4c17d23cfca clang-2.9.tgz" diff --git a/testing/llvm/llvm-uclibc-errno-fsckery.patch b/testing/llvm/llvm-uclibc-errno-fsckery.patch deleted file mode 100644 index a7335f2684..0000000000 --- a/testing/llvm/llvm-uclibc-errno-fsckery.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- llvm-2.8/lib/Support/CommandLine.cpp -+++ llvm-2.8.mod/lib/Support/CommandLine.cpp -@@ -31,7 +31,10 @@ - #include "llvm/ADT/StringMap.h" - #include "llvm/ADT/Twine.h" - #include "llvm/Config/config.h" --#include <cerrno> -+ -+#include <asm-generic/errno-base.h> -+extern __thread int errno; -+ - #include <cstdlib> - using namespace llvm; - using namespace cl; ---- llvm-2.8/lib/Support/raw_ostream.cpp -+++ llvm-2.8.mod/lib/Support/raw_ostream.cpp -@@ -22,7 +22,10 @@ - #include "llvm/System/Signals.h" - #include "llvm/ADT/STLExtras.h" - #include <cctype> --#include <cerrno> -+ -+#include <asm-generic/errno-base.h> -+extern __thread int errno; -+ - #include <sys/stat.h> - #include <sys/types.h> - ---- llvm-2.8/lib/System/Errno.cpp -+++ llvm-2.8.mod/lib/System/Errno.cpp -@@ -14,13 +14,11 @@ - #include "llvm/System/Errno.h" - #include "llvm/Config/config.h" // Get autoconf configuration settings - -+extern __thread int errno; -+ - #if HAVE_STRING_H - #include <string.h> - --#if HAVE_ERRNO_H --#include <errno.h> --#endif -- - //===----------------------------------------------------------------------===// - //=== WARNING: Implementation here must contain only TRULY operating system - //=== independent code. -@@ -29,11 +27,9 @@ - namespace llvm { - namespace sys { - --#if HAVE_ERRNO_H - std::string StrError() { - return StrError(errno); - } --#endif // HAVE_ERRNO_H - - std::string StrError(int errnum) { - const int MaxErrStrLen = 2000; ---- llvm-2.8/lib/System/Unix/Unix.h -+++ llvm-2.8.mod/lib/System/Unix/Unix.h -@@ -24,7 +24,10 @@ - #include <cstdlib> - #include <cstdio> - #include <cstring> --#include <cerrno> -+ -+#include <asm-generic/errno-base.h> -+extern __thread int errno; -+ - #include <string> - #include <algorithm> - ---- llvm-2.8/utils/TableGen/TGLexer.cpp -+++ llvm-2.8.mod/utils/TableGen/TGLexer.cpp -@@ -19,7 +19,10 @@ - #include <cstdio> - #include <cstdlib> - #include <cstring> --#include <cerrno> -+ -+#include <asm-generic/errno-base.h> -+extern __thread int errno; -+ - using namespace llvm; - - TGLexer::TGLexer(SourceMgr &SM) : SrcMgr(SM) { diff --git a/testing/pastebinc/APKBUILD b/testing/pastebinc/APKBUILD new file mode 100644 index 0000000000..d40962f0b7 --- /dev/null +++ b/testing/pastebinc/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> +# Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> +pkgname=pastebinc +pkgver=0.9 +pkgrel=0 +pkgdesc="utility to pipe data into a paste on pastebin.com or a similar site" +url="https://github.com/jthomerson/pastebinc" +arch="all" +license="ASL 2.0" +depends= +depends_dev= +makedepends="wget glib-dev curl-dev" +install="" +subpackages="" +source="saveas-https://github.com/jthomerson/pastebinc/tarball/RELEASE_0.9-BETA/$pkgname-$pkgver-$pkgrel.tar.gz" +_builddir="$srcdir/jthomerson-pastebinc-8dbb86b" + +makeparams="VERSION=$pkgver-$pkgrel CONFDIR=/etc/pastebinc" + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + make $makeparams clean || return 1 + make $makeparams || return 1 +} + +package() { + cd "$_builddir" + make $makeparams DESTDIR="$pkgdir" install || return 1 +} + +md5sums="a1620a9d04ecb79f42ede3768987567a pastebinc-0.9-0.tar.gz" diff --git a/testing/xfce4-cpugraph-plugin/APKBUILD b/testing/xfce4-cpugraph-plugin/APKBUILD new file mode 100644 index 0000000000..a69bd26683 --- /dev/null +++ b/testing/xfce4-cpugraph-plugin/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=xfce4-cpugraph-plugin +pkgver=1.0.1 +pkgrel=0 +pkgdesc="CPU monitor for the Xfce panel" +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +arch="all" +license="GPLv2+" +depends="" +makedepends="libxfcegui4-dev xfce4-panel-dev" +install="" +subpackages="" +source="http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/xfce4-cpugraph-plugin-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="ff551087b1f61c47b8746e8687c572aa xfce4-cpugraph-plugin-1.0.1.tar.bz2" |