diff options
Diffstat (limited to 'main')
54 files changed, 913 insertions, 244 deletions
diff --git a/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch b/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch deleted file mode 100644 index 4ca284d00a..0000000000 --- a/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f24e997104849f4a7cf9e2f73a3cc66a83624fcb Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 31 Aug 2009 09:12:04 +0000 -Subject: [PATCH] abuild: strip versions from dependencies when building recursively - ---- - abuild.in | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/abuild.in b/abuild.in -index b718a67..23c9f96 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -712,7 +712,11 @@ depparse_aports() { - } - - deptrace() { -- local deps="$@" -+ local deps= i= -+ # strip versions from deps -+ for i in "$@"; do -+ deps="$deps ${i%[<>=]*}" -+ done - [ -z "$deps" ] && return 0 - ( depparse_aports - if [ -z "$upgrade" ]; then --- -1.6.4 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 108bab1ddf..fe69174948 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,11 +1,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.0_rc8 -pkgrel=1 +pkgver=2.0_rc9 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - 0001-abuild-strip-versions-from-dependencies-when-buildin.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -13,11 +12,9 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../0001-abuild-strip-versions-from-dependencies-when-buildin.patch || return 1 make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="869b37120781d7295a5fdea783086d8b abuild-2.0_rc8.tar.bz2 -60d2a6c0b7b3a33ed4adf3c7154e5c01 0001-abuild-strip-versions-from-dependencies-when-buildin.patch" +md5sums="025f8dfa4114cf6432fdf52f14c2fc5c abuild-2.0_rc9.tar.bz2" diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD index f912b0db28..007c203a5e 100644 --- a/main/acf-alpine-baselayout/APKBUILD +++ b/main/acf-alpine-baselayout/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-alpine-baselayout -pkgver=0.5.3 +pkgver=0.5.6 pkgrel=0 pkgdesc="A web-based system administration interface for alpine-baselayout" url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="e2f476665cfeb73cd3dbbab859c36d6f acf-alpine-baselayout-0.5.3.tar.bz2" +md5sums="fa412a754240f552e53dfdd0d3a39cb1 acf-alpine-baselayout-0.5.6.tar.bz2" diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD index 6d001a119a..fe84211c7b 100644 --- a/main/acf-apk-tools/APKBUILD +++ b/main/acf-apk-tools/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Mika Havela <mika.havela@gmail.com> pkgname=acf-apk-tools -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=0 pkgdesc="ACF module for apk" url="http://git.alpinelinux.org/cgit/acf-apk-tools" @@ -13,4 +13,4 @@ build() { make DESTDIR="$pkgdir" install } -md5sums="dbfc63cde1cbadbc2c971abce18e26fc acf-apk-tools-0.4.1.tar.bz2" +md5sums="8933db70c20850df5f1f86b7e2ba2320 acf-apk-tools-0.4.2.tar.bz2" diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD index da110e56c7..6c4b068cae 100644 --- a/main/acf-core/APKBUILD +++ b/main/acf-core/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acf-core -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=0 pkgdesc="A web-based system administration interface framework" url="http://git.alpinelinux.org/cgit/acf-core" @@ -12,4 +12,4 @@ build() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="11e69b2f67e0032aa2c3c4ef1d117470 acf-core-0.8.1.tar.bz2" +md5sums="56a4dee1083fcc194405b37598d01d10 acf-core-0.8.2.tar.bz2" diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD index 9a0f6d0e58..cc935cd702 100644 --- a/main/acf-weblog/APKBUILD +++ b/main/acf-weblog/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-weblog -pkgver=0.3.2 +pkgver=0.4.0 pkgrel=0 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles" url="http://git.alpinelinux.org/cgit/acf-weblog" license="GPL-2" depends="acf-core lua luasql-postgres wget postgresql-client" makedepends="" -install= +install="$pkgname.post-upgrade" subpackages="" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" @@ -17,4 +17,4 @@ build() { make DESTDIR="$pkgdir" install } -md5sums="a7145adf1bd0f6e7cd17e7ef89ff44ef acf-weblog-0.3.2.tar.bz2" +md5sums="70fa428318529560be3de665ee9d8ac7 acf-weblog-0.4.0.tar.bz2" diff --git a/main/acf-weblog/acf-weblog.post-upgrade b/main/acf-weblog/acf-weblog.post-upgrade new file mode 100644 index 0000000000..325f8cb320 --- /dev/null +++ b/main/acf-weblog/acf-weblog.post-upgrade @@ -0,0 +1,21 @@ +#!/bin/sh + +new=$1 +old=$2 + +if ! [ "$(apk version -t $old 0.4.0)" = "<" ]; then + exit 0 +fi + + +psql -U postgres -c "ALTER TABLE weblog ADD COLUMN shortreason text" \ + webproxylog +psql -U postgres -c "ALTER TABLE pubweblog ADD COLUMN shortreason text" \ + webproxylog +psql -U postgres -c "ALTER TABLE pubblocklog ADD COLUMN shortreason text" \ + webproxylog +psql -U postgres -c "ALTER TABLE blocklog ADD COLUMN shortreason text" \ + webproxylog + +exit 0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index f7c2aca9ad..d7dfc4e26d 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.0_rc2 +pkgver=2.0_rc3 pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname @@ -18,4 +18,4 @@ build() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="0fadddb30736fa49852a359a770e95d1 alpine-conf-2.0_rc2.tar.bz2" +md5sums="54810ee972f0d9c9a992f706af8feb43 alpine-conf-2.0_rc3.tar.bz2" diff --git a/main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch b/main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch new file mode 100644 index 0000000000..31bfc9a368 --- /dev/null +++ b/main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch @@ -0,0 +1,31 @@ +From d3861d70a88c6d2d3583fb90946aedb48a8d3e46 Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Fri, 4 Sep 2009 11:38:19 +0300 +Subject: [PATCH] version: --index output to stdout instead of stderr + +--- + src/ver.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/ver.c b/src/ver.c +index 3f85afc..a617bdb 100644 +--- a/src/ver.c ++++ b/src/ver.c +@@ -31,10 +31,10 @@ static int ver_indexes(struct apk_database *db, int argc, char **argv) + if (APK_BLOB_IS_NULL(repo->description)) + continue; + +- apk_message("%.*s [%s]", +- repo->description.len, +- repo->description.ptr, +- db->repos[i].url); ++ printf("%.*s [%s]\n", ++ repo->description.len, ++ repo->description.ptr, ++ db->repos[i].url); + } + + return 0; +-- +1.6.4.2 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index a29393b1eb..7729b17163 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.0_rc5 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= makedepends="zlib-dev openssl-dev pkgconfig" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-version-index-output-to-stdout-instead-of-stderr.patch " @@ -16,6 +17,7 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" sed -i -e 's:-Werror::' Make.rules + patch -p1 -i ../0001-version-index-output-to-stdout-instead-of-stderr.patch || return 1 make || return 1 make static || return 1 @@ -36,4 +38,5 @@ static() { "$subpkgdir"/sbin/apk.static } -md5sums="0d7507305586e2f4bcc4884cf6684977 apk-tools-2.0_rc5.tar.bz2" +md5sums="0d7507305586e2f4bcc4884cf6684977 apk-tools-2.0_rc5.tar.bz2 +5fafd1581c7d2bce26fc9531f4a128e7 0001-version-index-output-to-stdout-instead-of-stderr.patch" diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index ec4d449bdb..bcb5464a46 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.0.14 -pkgrel=1 +pkgver=1.6.0.15 +pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" @@ -88,7 +88,7 @@ tds() { _find_and_move '*_tds*' } -md5sums="0e6bbcd2467c030bdc041ebd66ee5d67 asterisk-1.6.0.14.tar.gz +md5sums="d319f52d8d1d70f69583901e56720c30 asterisk-1.6.0.15.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 929f740db7043b4553544ebcc7315c91 101-caps-uclibc.patch 97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD index 034613b725..679b87bdfa 100644 --- a/main/aumix/APKBUILD +++ b/main/aumix/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aumix pkgver=2.8 -pkgrel=0 +pkgrel=1 pkgdesc="A color text mode sound mixer" url="http://www.jpj.net/~trevor/aumix.html" license="GPL" -depends="uclibc ncurses ncurses-terminfo" +depends= makedepends="ncurses-dev" source="http://jpj.net/~trevor/aumix/aumix-$pkgver.tar.bz2 aumix-2.8-mute.patch diff --git a/main/beecrypt/APKBUILD b/main/beecrypt/APKBUILD index b11cba439f..eac2b30502 100644 --- a/main/beecrypt/APKBUILD +++ b/main/beecrypt/APKBUILD @@ -2,12 +2,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=beecrypt pkgver=4.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="general-purpose cryptography library" url="http://sourceforge.net/projects/beecrypt" license="LGPL" -# TODO: figure out why we link libgcc_s.so.1 and do something about gcc dep -depends="uclibc uclibc++ gcc" +depends= makedepends="uclibc++-dev libtool" subpackages="$pkgname-dev" @@ -17,7 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz build() { cd "$srcdir/$pkgname-$pkgver" - export CXX=g++-uc + export CXX=${CXX_UC:-g++-uc} for i in ../*.patch; do msg "Applying $i..." diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index 328d54dfde..7f5d9d9d49 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dnsmasq -pkgver=2.49 +pkgver=2.50 pkgrel=0 pkgdesc="Small forwarding DNS server" url="http://www.thekelleys.org.uk/dnsmasq/" @@ -32,6 +32,6 @@ build() { install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf } -md5sums="7ccc861d8a733474f9c0a0a127006ee9 dnsmasq-2.49.tar.gz +md5sums="f7b1e17c590e493039537434c57c9de7 dnsmasq-2.50.tar.gz fbea3f4a794a6a00cc6fe79c6d44606a dnsmasq.initd 5990c2d2cb92209feacf8f3a5a7d0831 dnsmasq.confd" diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD new file mode 100644 index 0000000000..8133127b47 --- /dev/null +++ b/main/enchant/APKBUILD @@ -0,0 +1,21 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=enchant +pkgver=1.5.0 +pkgrel=1 +pkgdesc="A wrapper library for generic spell checking" +url="http://www.abisource.com/enchant/" +license="LGPL" +subpackages="$pkgname-dev $pkgname-doc" +depends= +depends_dev="glib-dev" +makedepends="aspell-dev dbus-glib-dev hunspell-dev libiconv-dev gettext-dev" +source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr --disable-static || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="7dfaed14e142b4a0004b770c9568ed02 enchant-1.5.0.tar.gz" diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 3b6431840c..192267cfb0 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git pkgver=1.6.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -35,6 +35,7 @@ perl() { mkdir -p "$subpkgdir"/${f%/*} mv "$f" "$subpkgdir"/${f%/*} done + find "$pkgdir" -name perllocal.pod -delete } diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD new file mode 100644 index 0000000000..2a7609e0d6 --- /dev/null +++ b/main/guile/APKBUILD @@ -0,0 +1,23 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=guile +pkgver=1.8.7 +pkgrel=0 +pkgdesc="Guile is a portable, embeddable Scheme implementation written in C" +url="http://www.gnu.org/software/guile/" +license="GPL" +subpackages="$pkgname-dev $pkgname-doc" +makedepends="gmp-dev libtool ncurses-dev texinfo" +depends= +install= +source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-error-on-warning || return 1 + make LDFLAGS+="-lpthread" || return 1 + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="991b5b3efcbbc3f7507d05bc42f80a5e guile-1.8.7.tar.gz" diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD index 94f92a79ab..91e8c9cc12 100644 --- a/main/htop/APKBUILD +++ b/main/htop/APKBUILD @@ -1,11 +1,11 @@ # Maintainer:Carlo Landmeter pkgname=htop pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="An interactive process viewer for Linux" url="http://htop.sourceforge.net" license='GPL' -depends='ncurses-terminfo' +depends= makedepends="ncurses-dev" source="http://surfnet.dl.sourceforge.net/sourceforge/htop/$pkgname-$pkgver.tar.gz" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 1f25eb39de..7214268e97 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.5.4.10 -_pkgver=6.5.4-10 +pkgver=6.5.5.6 +_pkgver=6.5.5-6 pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" url="http://www.imagemagick.org/" @@ -32,4 +32,4 @@ build() { } -md5sums="3b0c0082cf29103b4868c674d73e918d ImageMagick-6.5.4-10.tar.gz" +md5sums="60a529f858561b865f71a764c4a5f871 ImageMagick-6.5.5-6.tar.gz" diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD new file mode 100644 index 0000000000..d8dd4fe890 --- /dev/null +++ b/main/imap/APKBUILD @@ -0,0 +1,41 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> + +# at this point its only php who wants this for imap support +# if more packages needs the c-client lib we might want to +# build it shared +pkgname=imap +pkgver=2007e +pkgrel=0 +pkgdesc="An IMAP/POP server" +url="http://www.washington.edu/imap" +license="APACHE" +subpackages="$pkgname-dev" +depends= +makedepends="openssl-dev" +source="ftp://ftp.cac.washington.edu/$pkgname/$pkgname-$pkgver.tar.gz" + +build () +{ + cd $srcdir/$pkgname-$pkgver + sed -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \ + -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \ + -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \ + -e "s:^CC=.*:CC=${CC:-cc}:" \ + -i src/osdep/unix/Makefile || return 1 + + export GCCCFLAGS="$CFLAGS" + make slx SPECIALAUTHENTICATORS=ssl || return 1 + + mkdir -p $pkgdir/usr/sbin + install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd + install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d + install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d + for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp osdep \ + env_unix env fs ftl nl tcp sslio utf8 utf8aux; do + install -D -m644 c-client/$i.h \ + "$pkgdir"/usr/include/imap/$i.h + done + install -D -m644 c-client/c-client.a "$pkgdir"/usr/lib/c-client.a + ln -sf c-client.a "$pkgdir"/usr/lib/libc-client.a +} +md5sums="7903800dc2604000016de070e0c55840 imap-2007e.tar.gz" diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD index 9c085710cb..e5e324c89a 100644 --- a/main/irssi/APKBUILD +++ b/main/irssi/APKBUILD @@ -2,11 +2,11 @@ pkgname=irssi pkgver=0.8.14 #_pkgver=0.8.14 -pkgrel=0 +pkgrel=1 pkgdesc="A modular textUI IRC client with IPv6 support" url="http://irssi.org/" license='GPL' -depends="glib ncurses ncurses-terminfo openssl" +depends= makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig" source="http://irssi.org/files/irssi-${pkgver}.tar.bz2" subpackages="$pkgname-doc $pkgname-dev $pkgname-perl" diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD new file mode 100644 index 0000000000..6c54212123 --- /dev/null +++ b/main/libetpan/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libetpan +pkgver=0.58 +pkgrel=0 +pkgdesc="a portable middleware for email access" +url="http://www.etpan.org/" +license="custom:etpan" +subpackages="$pkgname-dev $pkgname-doc" +makedepends="db-dev cyrus-sasl-dev curl-dev expat-dev" +depends= +depends_dev="cyrus-sasl-dev" +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + sed -e 's/db-4.4/db-4.7/g' -i configure || return 1 + ./configure --prefix=/usr \ + --disable-static + + make || return 1 + make DESTDIR="$pkgdir" install + install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt +} +md5sums="bf20b5c0548f06b94bc588afdf5b3436 libetpan-0.58.tar.gz" diff --git a/main/libmad/APKBUILD b/main/libmad/APKBUILD new file mode 100644 index 0000000000..72968faad7 --- /dev/null +++ b/main/libmad/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Sebastian Wicki <gandro@gmx.net> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libmad +pkgver=0.15.1b +pkgrel=0 +pkgdesc="A high-quality MPEG audio decoder" +url="http://www.underbit.com/products/mad/" +license="GPL" +subpackages="$pkgname-dev" +depends= +makedepends="autoconf automake libtool" +source="http://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.gz + libmad-0.15.1b-cflags-O2.patch + libmad-0.15.1b-cflags.patch + mad.pc + " + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + for i in ../*.patch; do + msg "Applying $i..." + patch -Np1 -i $i || return 1 + done + + aclocal && autoconf && ./missing --run automake --foreign \ + && libtoolize --force || return 1 + + ./configure --prefix=/usr \ + --enable-fpm=intel \ + --enable-accuracy + + make -j1 || return 1 + make DESTDIR="$pkgdir" install + install -D -m644 "$srcdir"/mad.pc "$pkgdir"/usr/lib/pkgconfig/mad.pc +} +md5sums="1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz +fbda7a1821e2038221deb3f476da034d libmad-0.15.1b-cflags-O2.patch +bcd6eab331fc316baf4e9c9882fe13f4 libmad-0.15.1b-cflags.patch +89806934195402446d21d1a83f523b11 mad.pc" diff --git a/main/libmad/libmad-0.15.1b-cflags-O2.patch b/main/libmad/libmad-0.15.1b-cflags-O2.patch new file mode 100644 index 0000000000..61b4b13bd7 --- /dev/null +++ b/main/libmad/libmad-0.15.1b-cflags-O2.patch @@ -0,0 +1,12 @@ +diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac +--- libmad-0.15.1b-orig/configure.ac 2007-07-01 12:58:13.000000000 -0600 ++++ libmad-0.15.1b/configure.ac 2007-07-01 12:59:13.000000000 -0600 +@@ -105,7 +105,7 @@ + shift + ;; + -O2) +- optimize="-O" ++ optimize="-O2" + shift + ;; + -fomit-frame-pointer) diff --git a/main/libmad/libmad-0.15.1b-cflags.patch b/main/libmad/libmad-0.15.1b-cflags.patch new file mode 100644 index 0000000000..2ec44e3445 --- /dev/null +++ b/main/libmad/libmad-0.15.1b-cflags.patch @@ -0,0 +1,146 @@ +diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac +--- libmad-0.15.1b-orig/configure.ac 2007-06-30 20:22:31.000000000 -0600 ++++ libmad-0.15.1b/configure.ac 2007-06-30 20:25:31.000000000 -0600 +@@ -122,74 +122,74 @@ + esac + done + +-if test "$GCC" = yes +-then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" +- optimize="$optimize -fforce-mem" +- optimize="$optimize -fforce-addr" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -fthread-jumps" +- optimize="$optimize -fcse-follow-jumps" +- optimize="$optimize -fcse-skip-blocks" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" +- optimize="$optimize -fregmove" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" +- optimize="$optimize -fschedule-insns2" +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac +-fi ++#if test "$GCC" = yes ++#then ++# if test -z "$arch" ++# then ++# case "$host" in ++# i386-*) ;; ++# i?86-*) arch="-march=i486" ;; ++# arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; ++# armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; ++# powerpc-*) ;; ++# mips*-agenda-*) arch="-mcpu=vr4100" ;; ++# mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; ++# esac ++# fi ++# ++# case "$optimize" in ++# -O|"-O "*) ++# optimize="-O" ++# optimize="$optimize -fforce-mem" ++# optimize="$optimize -fforce-addr" ++# : #x optimize="$optimize -finline-functions" ++# : #- optimize="$optimize -fstrength-reduce" ++# optimize="$optimize -fthread-jumps" ++# optimize="$optimize -fcse-follow-jumps" ++# optimize="$optimize -fcse-skip-blocks" ++# : #x optimize="$optimize -frerun-cse-after-loop" ++# : #x optimize="$optimize -frerun-loop-opt" ++# : #x optimize="$optimize -fgcse" ++# optimize="$optimize -fexpensive-optimizations" ++# optimize="$optimize -fregmove" ++# : #* optimize="$optimize -fdelayed-branch" ++# : #x optimize="$optimize -fschedule-insns" ++# optimize="$optimize -fschedule-insns2" ++# : #? optimize="$optimize -ffunction-sections" ++# : #? optimize="$optimize -fcaller-saves" ++# : #> optimize="$optimize -funroll-loops" ++# : #> optimize="$optimize -funroll-all-loops" ++# : #x optimize="$optimize -fmove-all-movables" ++# : #x optimize="$optimize -freduce-all-givs" ++# : #? optimize="$optimize -fstrict-aliasing" ++# : #* optimize="$optimize -fstructure-noalias" ++# ++# case "$host" in ++# arm*-*) ++# optimize="$optimize -fstrength-reduce" ++# ;; ++# mips*-*) ++# optimize="$optimize -fstrength-reduce" ++# optimize="$optimize -finline-functions" ++# ;; ++# i?86-*) ++# optimize="$optimize -fstrength-reduce" ++# ;; ++# powerpc-apple-*) ++# # this triggers an internal compiler error with gcc2 ++# : #optimize="$optimize -fstrength-reduce" ++# ++# # this is really only beneficial with gcc3 ++# : #optimize="$optimize -finline-functions" ++# ;; ++# *) ++# # this sometimes provokes bugs in gcc 2.95.2 ++# : #optimize="$optimize -fstrength-reduce" ++# ;; ++# esac ++# ;; ++# esac ++#fi + + case "$host" in + mips*-agenda-*) diff --git a/main/libmad/mad.pc b/main/libmad/mad.pc new file mode 100644 index 0000000000..14a66f5525 --- /dev/null +++ b/main/libmad/mad.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: mad +Description: MPEG Audio Decoder +Requires: +Version: 0.15.0b +Libs: -L${libdir} -lmad -lm +Cflags: -I${includedir} diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD index 8cfbf96871..13fc7688e1 100644 --- a/main/libogg/APKBUILD +++ b/main/libogg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libogg -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Ogg bitstream and framing library" url="http://xiph.org/ogg/" @@ -22,4 +22,4 @@ build() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="eaf7dc6ebbff30975de7527a80831585 libogg-1.1.3.tar.gz" +md5sums="10200ec22543841d9d1c23e0aed4e5e9 libogg-1.1.4.tar.gz" diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD index c4c0713435..07c2fc4d00 100644 --- a/main/libvorbis/APKBUILD +++ b/main/libvorbis/APKBUILD @@ -1,18 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libvorbis -pkgver=1.2.0 +pkgver=1.2.3 pkgrel=0 pkgdesc="Vorbis codec library" url="http://www.xiph.org/ogg/vorbis/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="libogg uclibc" -makedepends="libogg-dev g++" +depends= +makedepends="libogg-dev" #source="http://people.xiph.org/~giles/2008/$pkgname-$pkgver.tar.gz" -source="http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz" +source="http://downloads.xiph.org/releases/vorbis/libvorbis-$pkgver.tar.gz" -build () -{ +build () +{ cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --disable-static || return 1 @@ -20,4 +20,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="478646358c49f34aedcce58948793619 libvorbis-1.2.0.tar.gz" +md5sums="5aa77f55c0e0aab8eb8ed982335daac8 libvorbis-1.2.3.tar.gz" diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD index 8f6ce29380..93f8bea08b 100644 --- a/main/libxslt/APKBUILD +++ b/main/libxslt/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxslt pkgver=1.1.24 -pkgrel=0 +pkgrel=1 pkgdesc="XML stylesheet transformation library" url="http://xmlsoft.org/XSLT/" license="custom" -depends="libxml2 libgcrypt libgpg-error" +depends= makedepends="libxml2-dev libgcrypt-dev libgpg-error-dev python" subpackages="$pkgname-dev $pkgname-doc" source="ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD index 4f7167e709..6bce99530d 100644 --- a/main/mini_httpd/APKBUILD +++ b/main/mini_httpd/APKBUILD @@ -1,16 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mini_httpd pkgver=1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Small forking webserver with ssl and ipv6 support" url="http://www.acme.com/software/mini_httpd/" license="BSD" -depends= +depends="logrotate" makedepends="openssl-dev" subpackages="$pkgname-doc" source="http://www.acme.com/software/mini_httpd/$pkgname-$pkgver.tar.gz $pkgname.conf.sample $pkgname.initd + $pkgname.logrotate " build() { @@ -35,8 +36,12 @@ build() { install -D -m644 ../mini_httpd.conf.sample \ "$pkgdir"/etc/mini_httpd.conf install -D -m755 ../mini_httpd.initd "$pkgdir"/etc/init.d/mini_httpd + install -D -m644 ../mini_httpd.logrotate \ + "$pkgdir"/etc/logrotate.d/mini_httpd + install -d "$pkgdir"/var/run/mini_httpd "$pkgdir"/var/log/mini_httpd } md5sums="7c68293ad265ecfe2edea917912f6f1f mini_httpd-1.19.tar.gz -ec656aadd4751a3f4f6e8c788a5237f2 mini_httpd.conf.sample -804e5cba1537bddac195e64b5b50d609 mini_httpd.initd" +bca5b3b1cdc00cf31f0b54797518b893 mini_httpd.conf.sample +7cfcf81d75be204ecb60eb18fa4d96a7 mini_httpd.initd +915683e9c7e1cef7ce9b1bbaa31ab680 mini_httpd.logrotate" diff --git a/main/mini_httpd/mini_httpd.conf.sample b/main/mini_httpd/mini_httpd.conf.sample index 397a331ad3..002f4f0c7e 100644 --- a/main/mini_httpd/mini_httpd.conf.sample +++ b/main/mini_httpd/mini_httpd.conf.sample @@ -27,7 +27,9 @@ dir=/var/www/localhost/htdocs chroot #nochroot ## -logfile=/var/log/mini_httpd.log +## The init.d script will override logfile here, so you need to set the +## MINI_HTTPD_OPTS in /etc/conf.d/ in order to enable the logfile option here +#logfile=/var/log/mini_httpd/mini_httpd.log ## #charset=iso-8859-1 ## diff --git a/main/mini_httpd/mini_httpd.initd b/main/mini_httpd/mini_httpd.initd index 4460a539ef..b55340ac5d 100644 --- a/main/mini_httpd/mini_httpd.initd +++ b/main/mini_httpd/mini_httpd.initd @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.2 2007/08/26 21:20:21 bangert Exp $ -pidfile=/var/run/${SVCNAME}.pid +pidfile=/var/run/mini_httpd/${SVCNAME}.pid depend() { need net @@ -13,7 +13,7 @@ start() { ebegin "Starting $SVCNAME" start-stop-daemon --quiet --start --exec /usr/sbin/mini_httpd \ --pidfile $pidfile -- -i $pidfile \ - ${MINI_HTTPD_OPTS:--C /etc/${SVCNAME}.conf} + ${MINI_HTTPD_OPTS:--C /etc/${SVCNAME}.conf -l /var/log/mini_httpd/${SVCNAME}.log} eend $? } diff --git a/main/mini_httpd/mini_httpd.logrotate b/main/mini_httpd/mini_httpd.logrotate new file mode 100644 index 0000000000..bbd448b80a --- /dev/null +++ b/main/mini_httpd/mini_httpd.logrotate @@ -0,0 +1,16 @@ +/var/log/mini_httpd/*.log { + weekly + missingok + copytruncate + rotate 7 + compress + notifempty + sharedscripts + postrotate + for i in /var/run/mini_httpd*.pid /var/run/mini_httpd/*.pid; do \ + if [ -f "$i" ]; then \ + /etc/init.d/$(basename $i .pid) restart > /dev/null 2>&1 || true ; \ + fi; \ + done; + endscript +} diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index ab2a8bfc56..02b0dbb998 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD @@ -3,11 +3,11 @@ pkgname=nano pkgver=2.0.9 pkgmaj=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor." url="http://www.nano-editor.org/" license="GPL" -depends="ncurses uclibc ncurses-terminfo" +depends= makedepends="ncurses-dev" install= subpackages="$pkgname-doc" @@ -25,9 +25,6 @@ build() { --disable-speller make || return 1 make DESTDIR="$pkgdir" install - - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } md5sums="2be94dc43fb60fff4626a2401a977220 nano-2.0.9.tar.gz" diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD index 6bd01f640d..9ae623a5b9 100644 --- a/main/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -1,28 +1,40 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ncurses pkgver=5.7 -pkgrel=0 +pkgrel=1 pkgdesc="Console display library" url="http://www.gnu.org/software/ncurses/" license=MIT depends= - -source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - " - +source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" subpackages="$pkgname-dev $pkgname-doc $pkgname-terminfo" build() { cd "$srcdir/$pkgname-$pkgver" - ./configure \ + ./configure \ --mandir=/usr/share/man \ --disable-ada \ --without-cxx-binding \ + --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ --with-shared - make || return 1 - make install DESTDIR=$pkgdir/ + make || return 1 + make install DESTDIR="$pkgdir" + + # Install basic terms in /etc/terminfo + for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \ + vt200 vt220 xterm xterm-color xterm-xfree86; do + local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) + local basedir=$(basename $(dirname "$termfile")) + + [ -z "$termfile" ] && continue + + install -d "$pkgdir"/etc/terminfo/$basedir + mv ${termfile} "$pkgdir"/etc/terminfo/$basedir/ + ln -s ../../../../etc/terminfo/$basedir/$i \ + "$pkgdir"/usr/share/terminfo/$basedir/$i + done } terminfo() { diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD index ac497cb9b3..5456efe95e 100644 --- a/main/net-snmp/APKBUILD +++ b/main/net-snmp/APKBUILD @@ -2,21 +2,24 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=net-snmp pkgver=5.4.2.1 -pkgrel=0 +pkgrel=2 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" license="GPL" depends= -makedepends="perl-dev" +makedepends="perl-dev openssl-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz -snmpd.initd -snmpd.confd -snmptrapd.initd -snmptrapd.confd" + snmpd.initd + snmpd.confd + snmptrapd.initd + snmptrapd.confd + CVE-2008-6123.patch + " build() { cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i ../CVE-2008-6123.patch || return 1 export lt_cv_sys_max_cmd_len=8192 @@ -30,8 +33,12 @@ build() { --with-logfile="/var/log/net-snmpd.log" \ --enable-ucd-snmp-compatibility \ --with-persistent-directory="/var/lib/net-snmp" \ + --with-openssl \ + --enable-ipv6 \ --enable-shared \ - --enable-as-needed + --enable-as-needed \ + --disable-embedded-perl + # embedded-perl seems to create TEXTREL's make -j1 || return 1 make -j1 DESTDIR="$pkgdir" install @@ -42,6 +49,7 @@ build() { install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example mkdir -p "$pkgdir"/var/lib/net-snmp + find "$pkgdir" -name perllocal.pod -delete } tools() { @@ -54,4 +62,5 @@ md5sums="984932520143f0c8bf7b7ce1fc9e1da1 net-snmp-5.4.2.1.tar.gz 941e257218aa773b33696a2c7222a14e snmpd.initd 96510a2f3bc9f21648b03f7e8d76c0d3 snmpd.confd c5198c350991637849595dba93019bda snmptrapd.initd -363f7728a76bdfc46e29b7e1f5cf4950 snmptrapd.confd" +363f7728a76bdfc46e29b7e1f5cf4950 snmptrapd.confd +e8eac801c76e03bca7e7bf6b267b0d3d CVE-2008-6123.patch" diff --git a/main/net-snmp/CVE-2008-6123.patch b/main/net-snmp/CVE-2008-6123.patch new file mode 100644 index 0000000000..b4b06f63e9 --- /dev/null +++ b/main/net-snmp/CVE-2008-6123.patch @@ -0,0 +1,19 @@ +diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c +--- snmplib.orig/snmpUDPDomain.c 2007-10-11 22:46:30.000000000 +0200 ++++ snmplib/snmpUDPDomain.c 2009-07-10 23:41:37.000000000 +0200 +@@ -104,12 +110,12 @@ + char tmp[64]; + to = (struct sockaddr_in *) &(addr_pair->remote_addr); + if (to == NULL) { +- sprintf(tmp, "UDP: [%s]->unknown", ++ sprintf(tmp, "UDP: unknown->[%s]", + inet_ntoa(addr_pair->local_addr)); + } else { +- sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr)); +- sprintf(tmp + strlen(tmp), "[%s]:%hd", ++ sprintf(tmp, "UDP: [%s]:%hu->", + inet_ntoa(to->sin_addr), ntohs(to->sin_port)); ++ sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr)); + } + return strdup(tmp); + } diff --git a/main/perl-io-socket-ssl/APKBUILD b/main/perl-io-socket-ssl/APKBUILD new file mode 100644 index 0000000000..2867a9e30e --- /dev/null +++ b/main/perl-io-socket-ssl/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=perl-io-socket-ssl +_realname=IO-Socket-SSL +pkgver=1.30 +pkgrel=0 +pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET" +url="http://search.cpan.org/dist/IO-Socket-SSL/" +license="GPL" +depends="perl perl-net-ssleay" +makedepends="perl-dev" +install= +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-$pkgver.tar.gz" + +build() { + cd "$srcdir/$_realname-$pkgver" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR="$pkgdir" install + # creates file collision among perl modules + find "$pkgdir" -name perllocal.pod -delete +} + +md5sums="374f74487ef6fedc9326e20ac1e20dc0 IO-Socket-SSL-1.30.tar.gz" diff --git a/main/perl-net-smtp-ssl/APKBUILD b/main/perl-net-smtp-ssl/APKBUILD new file mode 100644 index 0000000000..f5a6bcb3ac --- /dev/null +++ b/main/perl-net-smtp-ssl/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=perl-net-smtp-ssl +_realname=Net-SMTP-SSL +pkgver=1.01 +pkgrel=0 +pkgdesc="SSL support for Net::SMTP" +url="http://search.cpan.org/dist/Net-SMTP-SSL/" +license="GPL" +depends="perl perl-io-socket-ssl" +makedepends="perl-dev" +install= +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/C/CW/CWEST/Net-SMTP-SSL-$pkgver.tar.gz" + +build() { + cd "$srcdir/$_realname-$pkgver" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR="$pkgdir" install + # creates file collision among perl modules + find "$pkgdir" -name perllocal.pod -delete +} + +md5sums="ba039288ebf7a343feecacd374da8c1a Net-SMTP-SSL-1.01.tar.gz" diff --git a/main/perl-net-ssleay/APKBUILD b/main/perl-net-ssleay/APKBUILD new file mode 100644 index 0000000000..7a806c7ab5 --- /dev/null +++ b/main/perl-net-ssleay/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=perl-net-ssleay +_realname=Net-SSLeay +pkgver=1.35 +pkgrel=0 +pkgdesc="Perl extension for using OpenSSL" +url="http://search.cpan.org/dist/Net-SSLeay/" +license="GPL" +depends="perl" +makedepends="perl-dev openssl-dev zlib-dev" +install= +subpackages="$pkgname-doc" +source="http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-$pkgver.tar.gz" + +build() { + cd "$srcdir/$_realname-$pkgver" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR="$pkgdir" install + # creates file collision among perl modules + find "$pkgdir" -name perllocal.pod -delete +} + +md5sums="1e4ec37a4467eb66a62d3c090ac9029b Net-SSLeay-1.35.tar.gz" diff --git a/main/php-apc/APKBUILD b/main/php-apc/APKBUILD index d3460aaa56..67a225282d 100644 --- a/main/php-apc/APKBUILD +++ b/main/php-apc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=php-apc pkgver=3.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Alternative PHP Cache" url="http://pecl.php.net/package/APC" license="PHP" diff --git a/main/php/APKBUILD b/main/php/APKBUILD index b50e8932b5..05f709a187 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -2,7 +2,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=php pkgver=5.3.0 -pkgrel=0 +_suhosinver=${pkgver}-0.9.8-BETA-1 +pkgrel=1 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" license="PHP-3" @@ -10,84 +11,155 @@ depends= install="$pkgname.post-upgrade" makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev - sqlite-dev libtool libltdl postgresql-dev" -subpackages="$pkgname-doc $pkgname-dev $pkgname-bcmath $pkgname-bz2 - $pkgname-calendar $pkgname-curl $pkgname-exif $pkgname-ftp $pkgname-gd - $pkgname-iconv $pkgname-json $pkgname-mcrypt - $pkgname-mysql $pkgname-mysqli $pkgname-openssl $pkgname-pdo - $pkgname-pdo_mysql $pkgname-pdo_sqlite $pkgname-posix $pkgname-session - $pkgname-shmop $pkgname-soap $pkgname-sockets $pkgname-sqlite - $pkgname-sysvmsg $pkgname-sysvsem $pkgname-sysvshm $pkgname-xmlrpc - $pkgname-zip $pkgname-zlib $pkgname-postgresql $pkgname-pdo_pgsql" -source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" + sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev + enchant-dev gd-dev gmp-dev gettext-dev imap-dev aspell-dev + net-snmp-dev libxslt-dev cyrus-sasl-dev openldap-dev pkgconfig + libgcrypt-dev" +subpackages="$pkgname-dev $pkgname-doc + $pkgname-bcmath + $pkgname-bz2 + $pkgname-calendar + $pkgname-curl + $pkgname-dba + $pkgname-enchant + $pkgname-exif + $pkgname-ftp + $pkgname-gd + $pkgname-gettext + $pkgname-gmp + $pkgname-iconv + $pkgname-imap + $pkgname-intl + $pkgname-json + $pkgname-ldap + $pkgname-mcrypt + $pkgname-mysql + $pkgname-mysqli + $pkgname-odbc + $pkgname-openssl + $pkgname-pdo + $pkgname-pdo_mysql + $pkgname-pdo_odbc + $pkgname-pdo_pgsql + $pkgname-pdo_sqlite + $pkgname-pgsql + $pkgname-phar + $pkgname-posix + $pkgname-pspell + $pkgname-shmop + $pkgname-snmp + $pkgname-soap + $pkgname-sockets + $pkgname-sqlite + $pkgname-sqlite3 + $pkgname-sysvmsg + $pkgname-sysvsem + $pkgname-sysvshm + $pkgname-xml + $pkgname-xmlrpc + $pkgname-xsl + $pkgname-zip + $pkgname-zlib + " + +source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 + http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz + gd-info-segfault.patch + " build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \ - --prefix=/usr \ - --sysconfdir=/etc/php \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ - --disable-rpath \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - --with-openssl=shared \ - --with-zlib=shared \ - --enable-bcmath=shared \ - --with-bz2=shared \ + # apply suhosin patch + gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \ + | patch -p1 || return 1 + + # fix gd segfault; http://bugs.php.net/bug.php?id=49193 + patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1 + + phpextensions="--enable-bcmath=shared \ --enable-calendar=shared \ - --with-curl=shared \ + --enable-dba=shared \ --enable-exif=shared \ --enable-ftp=shared \ - --with-gd=shared \ - --with-jpeg-dir=shared,/usr \ - --with-png-dir=shared,/usr \ --enable-gd-native-ttf \ - --enable-mbstring=shared \ - --with-mcrypt=shared \ - --with-mysql=shared \ - --with-mysql-sock=/tmp/mysql.sock \ - --with-mysql=shared \ - --with-mysqli=shared \ - --with-pear=/usr/share/pear \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ --enable-pdo=shared \ - --with-pdo-mysql=shared \ - --with-pdo-sqlite=shared,/usr \ - --enable-fastcgi \ - --with-sqlite=shared \ - --enable-sqlite-utf8 \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ --enable-shmop=shared \ --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ --enable-sysvmsg=shared \ --enable-sysvsem=shared \ --enable-sysvshm=shared \ + --enable-xml=shared \ --enable-zip=shared \ - --enable-posix=shared \ - --enable-sockets=shared \ - --enable-xml \ - --with-ttf=shared \ - --enable-session=shared \ - --with-regex=php \ - --with-pcre-regex=/usr \ - --enable-mbstring=all \ - --enable-mbregex \ - --enable-json=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=shared \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared,/usr \ + --with-gettext=shared \ + --with-gmp=shared \ --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-mcrypt=shared \ + --with-mysql-sock=/tmp/mysql.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-unixODBC=shared,/usr \ --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib=shared \ + --without-db1 \ + --without-db2 \ + --without-db3 \ + --without-qdbm \ + " +# --with-tidy=shared \ + ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --enable-fastcgi \ --enable-cgi \ - --with-freetype-dir=shared,/usr \ - --with-fileinfo=shared \ + --disable-cli \ --enable-discard-path \ --enable-force-cgi-redirect \ - --disable-cli \ - --with-pgsql=shared \ - --with-pdo-pgsql=shared \ - --with-pic + --with-pic \ + $phpextensions make || return 1 make -j1 INSTALL_ROOT="$pkgdir" install || return 1 @@ -95,11 +167,10 @@ build() { } _mv_mod() { + pkgdesc="$1 php extension" local d=usr/lib/php/20090626 mkdir -p "$subpkgdir/$d" mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1 - # last one removed the dir - rmdir "$pkgdir/$d" 2>/dev/null return 0 } @@ -107,39 +178,56 @@ bcmath() { _mv_mod bcmath; } bz2() { _mv_mod bz2; } calendar() { _mv_mod calendar; } curl() { _mv_mod curl; } +dba() { _mv_mod dba; } +enchant() { _mv_mod enchant; } exif() { _mv_mod exif; } ftp() { _mv_mod ftp; } gd() { _mv_mod gd; } +gettext() { _mv_mod gettext; } +gmp() { _mv_mod gmp; } iconv() { _mv_mod iconv; } +imap() { _mv_mod imap; } +intl() { _mv_mod intl; } json() { _mv_mod json; } +ldap() { _mv_mod ldap; } mcrypt() { _mv_mod mcrypt; } -# mime_magic() { _mv_mod mime_magic; } mysql() { _mv_mod mysql; } mysqli() { _mv_mod mysqli; } +odbc() { _mv_mod odbc; } openssl() { _mv_mod openssl; } pdo() { _mv_mod pdo; } pdo_mysql() { _mv_mod pdo_mysql; } +pdo_odbc() { _mv_mod pdo_odbc; } +pdo_pgsql() { _mv_mod pdo_pgsql; } pdo_sqlite() { _mv_mod pdo_sqlite; } +phar() { _mv_mod phar; } posix() { _mv_mod posix; } -session() { _mv_mod session; } +pgsql() { _mv_mod pgsql; } +pspell() { _mv_mod pspell; } +#session() { _mv_mod session; } shmop() { _mv_mod shmop; } +snmp() { _mv_mod snmp; } soap() { _mv_mod soap; } sockets() { _mv_mod sockets; } sqlite() { _mv_mod sqlite; } +sqlite3() { _mv_mod sqlite3; } sysvmsg() { _mv_mod sysvmsg; } sysvsem() { _mv_mod sysvsem; } sysvshm() { _mv_mod sysvshm; } +xml() { _mv_mod xml; } xmlrpc() { _mv_mod xmlrpc; } +xsl() { _mv_mod xsl; } zip() { _mv_mod zip; } zlib() { _mv_mod zlib; } -postgresql() { _mv_mod pgsql; } -pdo_pgsql() { _mv_mod pdo_pgsql; } # devleoper package dev() { default_dev - mkdir -p "$subpkgdir"/usr/lib/php/ + mkdir -p "$subpkgdir"/usr/lib/php/ "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/lib/php/build "$subpkgdir"/usr/lib/php/ + mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/ } -md5sums="846760cd655c98dfd86d6d97c3d964b0 php-5.3.0.tar.bz2" +md5sums="846760cd655c98dfd86d6d97c3d964b0 php-5.3.0.tar.bz2 +62dc36545b86bf86e44ada1fccc17d0a suhosin-patch-5.3.0-0.9.8-BETA-1.patch.gz +1c1a50aae7207b12d27bdecd8967e7ce gd-info-segfault.patch" diff --git a/main/php/gd-info-segfault.patch b/main/php/gd-info-segfault.patch new file mode 100644 index 0000000000..846a19ef74 --- /dev/null +++ b/main/php/gd-info-segfault.patch @@ -0,0 +1,26 @@ +Index: ext/gd/libgd/gd_compat.c +=================================================================== +--- ext/gd/libgd/gd_compat.c (Revision 286947) ++++ ext/gd/libgd/gd_compat.c (Revision 286948) +@@ -14,7 +14,7 @@ + return JPEG_LIB_VERSION; + } + +-int gdJpegGetVersionString() ++const char * gdJpegGetVersionString() + { + switch(JPEG_LIB_VERSION) { + case 62: +Index: ext/gd/libgd/gd_compat.h +=================================================================== +--- ext/gd/libgd/gd_compat.h (Revision 286947) ++++ ext/gd/libgd/gd_compat.h (Revision 286948) +@@ -8,7 +8,7 @@ + #endif + + const char * gdPngGetVersionString(); +-int gdJpegGetVersionString(); ++const char * gdJpegGetVersionString(); + int gdJpegGetVersionInt(); + int overflow2(int a, int b); + diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index ffeb781502..06b33bbe8d 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -3,7 +3,7 @@ pkgname=ruby pkgver=1.8.7_p174 _pkgver=1.8.7-p174 -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/en/" license="Ruby" @@ -31,6 +31,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --enable-pthread \ --with-sitedir='/usr/local/lib/site_ruby' \ --with-extra-site-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \ --enable-shared diff --git a/main/ruby/test.db b/main/ruby/test.db new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/main/ruby/test.db diff --git a/main/rubygems/APKBUILD b/main/rubygems/APKBUILD index ba7e33a89d..7cda14f16d 100644 --- a/main/rubygems/APKBUILD +++ b/main/rubygems/APKBUILD @@ -2,22 +2,23 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=rubygems pkgver=1.3.5 -pkgrel=0 +pkgrel=1 pkgdesc="Ruby package manager" url="http://docs.rubygems.org" license="GPL" -depends="ruby" +depends="ruby-dev build-base" makedepends="ruby-dev" source="http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz - rubygems-1.3.1-setup.patch" + " build() { cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i "$srcdir"/rubygems-1.3.1-setup.patch - ruby setup.rb --prefix=/usr \ - --vendor \ - --destdir "$pkgdir" + + ruby setup.rb --prefix="$pkgdir"/usr + mkdir -p "$pkgdir"/usr/lib/ruby/1.8 + cd "$pkgdir"/usr/lib + mv rbconfig rubygems rubygems.rb ubygems.rb \ + "$pkgdir"/usr/lib/ruby/1.8 } -md5sums="6e317335898e73beab15623cdd5f8cff rubygems-1.3.5.tgz -40ef7562319ac6f82bbbe7315c78bdbb rubygems-1.3.1-setup.patch" +md5sums="6e317335898e73beab15623cdd5f8cff rubygems-1.3.5.tgz" diff --git a/main/rubygems/rubygems-1.3.1-setup.patch b/main/rubygems/rubygems-1.3.1-setup.patch deleted file mode 100644 index 3b76ad3f99..0000000000 --- a/main/rubygems/rubygems-1.3.1-setup.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- setup.rb.~1~ 2008-06-22 01:51:11.000000000 +0200 -+++ setup.rb 2008-06-28 09:05:54.923666929 +0200 -@@ -128,8 +128,8 @@ - lib_dir = Gem::ConfigMap[site_or_vendor] - bin_dir = Gem::ConfigMap[:bindir] - else -- lib_dir = File.join prefix, 'lib' -- bin_dir = File.join prefix, 'bin' -+ lib_dir = File.join prefix, Gem::ConfigMap[site_or_vendor] -+ bin_dir = File.join prefix, Gem::ConfigMap[:bindir] - end - end - -@@ -240,19 +240,6 @@ - end - end - --# Remove source caches --if install_destdir.empty? -- require 'rubygems/source_info_cache' -- -- user_cache_file = File.join(install_destdir, -- Gem::SourceInfoCache.user_cache_file) -- system_cache_file = File.join(install_destdir, -- Gem::SourceInfoCache.system_cache_file) -- -- rm_f user_cache_file if File.writable? File.dirname(user_cache_file) -- rm_f system_cache_file if File.writable? File.dirname(system_cache_file) --end -- - # install RDoc - - gem_doc_dir = File.join Gem.dir, 'doc' -@@ -262,10 +249,6 @@ - if File.writable? gem_doc_dir and - (not File.exist? rubygems_doc_dir or - File.writable? rubygems_doc_dir) then -- puts "Removing old RubyGems RDoc and ri" -- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir| -- rm_rf dir -- end - - def run_rdoc(*args) - begin -@@ -277,7 +260,7 @@ - - args << '--quiet' - args << '--main' << 'README' -- args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt' -+ args << '.' << 'README' - - r = RDoc::RDoc.new - r.document args diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index e12317f766..19555f8513 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=3.3.7 -pkgrel=2 +pkgrel=3 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" license="GPL3" @@ -72,7 +72,8 @@ winbind() { usr/bin/ntlm_auth \ usr/sbin/winbindd \ usr/lib/samba/idmap - install -d -g winbind "$subpkgdir"/var/cache/samba/winbindd_privileged + install -d -g winbind -m 750 \ + "$subpkgdir"/var/cache/samba/winbindd_privileged } common() { diff --git a/main/samba/winbind.post-install b/main/samba/winbind.post-install index 995f8e87a6..59abe0ff92 100644 --- a/main/samba/winbind.post-install +++ b/main/samba/winbind.post-install @@ -1,5 +1,6 @@ #!/bin/sh chgrp winbind /var/cache/samba/winbindd_privileged +chmod 750 /var/cache/samba/winbindd_privileged exit 0 diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index b965cc2a87..2fbea82647 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion -pkgver=1.6.4 +pkgver=1.6.5 pkgrel=0 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" @@ -32,7 +32,7 @@ build() { install -Dm755 "$srcdir"/svnserve.initd "$pkgdir"/etc/init.d/svnserve install -Dm644 "$srcdir"/svnserve.confd "$pkgdir"/etc/conf.d/svnserve } -md5sums="11e3fa838c9a558cadc378f2807572e2 subversion-1.6.4.tar.bz2 +md5sums="1a53a0e72bee0bf814f4da83a9b6a636 subversion-1.6.5.tar.bz2 d084a7558053784886bc858b94fa9186 svnserve.confd 06cf9328f63a935654971052a2c3594a svnserve.initd bfd0d890c07830f1a6010891dd25fa5c subversion.pre-install" diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD new file mode 100644 index 0000000000..21587995c5 --- /dev/null +++ b/main/swig/APKBUILD @@ -0,0 +1,20 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=swig +pkgver=1.3.39 +pkgrel=0 +pkgdesc="SWIG is a compiler that makes it easy to integrate C and C++ code with scripting languages" +url="http://www.swig.org/" +license="custom" +depends="guile" +makedepends="zlib-dev" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + +build () +{ + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} +md5sums="ac201d1b87f8659584534f9540d7ad24 swig-1.3.39.tar.gz" diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD index fd6555f124..4210b3e68a 100644 --- a/main/uclibc/APKBUILD +++ b/main/uclibc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uclibc pkgver=0.9.30.1 -pkgrel=15 +pkgrel=16 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -15,6 +15,7 @@ source="http://uclibc.org/downloads/$_mynamever.tar.bz2 uclibc-0.9.30.1-pthread_getattr_np.patch 0001-ldd-segfault-fix.patch 0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch + fstatat-fix-32bit.patch pthread-new-aliasing-fix.diff uclibc-resolv-cname-fix.diff uclibc-i386-floating-stacks.diff @@ -65,6 +66,7 @@ ea91460617601b6e084ead66bc3948f5 uclibc-0.9.30.1-resolv.patch cf80c0d44a41e02f389be427ee615d61 uclibc-0.9.30.1-pthread_getattr_np.patch 4079b20c763727863bc53408e4988434 0001-ldd-segfault-fix.patch bcd1c4c9c87f092fb4631559e6ec13ba 0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch +14d9fa172f67fee0257f0441b3b3bc13 fstatat-fix-32bit.patch 969187e1da84d0a0a5957b392a3d5a2b pthread-new-aliasing-fix.diff bbb8475963e791f596c34c81ef5583d7 uclibc-resolv-cname-fix.diff 0b3966ab7774ac42ecf34a7b596c661b uclibc-i386-floating-stacks.diff diff --git a/main/uclibc/fstatat-fix-32bit.patch b/main/uclibc/fstatat-fix-32bit.patch new file mode 100644 index 0000000000..536cd8b624 --- /dev/null +++ b/main/uclibc/fstatat-fix-32bit.patch @@ -0,0 +1,102 @@ +From 656167d89112171b2b7672676dc413c676a186f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 06 Sep 2009 16:12:12 +0000 +Subject: fstatat: fix up behavior on 32/64 bit hosts + +The fstatat() syscall is a little funky in that it sometimes changes name +between 32 and 64 bit hosts, but it should always operate on a 64bit stat +structure. So for the fstatat() function, make sure we convert it from a +64bit kstat to a 32bit stat. + +Along these lines, we need to restore the __xstat32_conv() function. + +Reported-by: Timo Teräs <timo.teras@iki.fi> +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- +diff --git a/libc/sysdeps/linux/common/fstatat.c b/libc/sysdeps/linux/common/fstatat.c +index 149c189..33daa7c 100644 +--- a/libc/sysdeps/linux/common/fstatat.c ++++ b/libc/sysdeps/linux/common/fstatat.c +@@ -10,15 +10,20 @@ + #include <sys/stat.h> + #include "xstatconv.h" + ++/* 64bit ports tend to favor newfstatat() */ ++#ifdef __NR_newfstatat ++# define __NR_fstatat64 __NR_newfstatat ++#endif ++ + #ifdef __NR_fstatat64 + int fstatat(int fd, const char *file, struct stat *buf, int flag) + { + int ret; +- struct kernel_stat kbuf; ++ struct kernel_stat64 kbuf; + + ret = INLINE_SYSCALL(fstatat64, 4, fd, file, &kbuf, flag); + if (ret == 0) +- __xstat_conv(&kbuf, buf); ++ __xstat32_conv(&kbuf, buf); + + return ret; + } +diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c +index 5ae1fad..95627af 100644 +--- a/libc/sysdeps/linux/common/fstatat64.c ++++ b/libc/sysdeps/linux/common/fstatat64.c +@@ -12,6 +12,11 @@ + + #ifdef __UCLIBC_HAS_LFS__ + ++/* 64bit ports tend to favor newfstatat() */ ++#ifdef __NR_newfstatat ++# define __NR_fstatat64 __NR_newfstatat ++#endif ++ + #ifdef __NR_fstatat64 + int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) + { +diff --git a/libc/sysdeps/linux/common/xstatconv.c b/libc/sysdeps/linux/common/xstatconv.c +index 2a82458..deef392 100644 +--- a/libc/sysdeps/linux/common/xstatconv.c ++++ b/libc/sysdeps/linux/common/xstatconv.c +@@ -44,6 +44,25 @@ void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) + buf->st_ctim = kbuf->st_ctim; + } + ++void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) ++{ ++ /* Convert to current kernel version of `struct stat64'. */ ++ memset(buf, 0x00, sizeof(*buf)); ++ buf->st_dev = kbuf->st_dev; ++ buf->st_ino = kbuf->st_ino; ++ buf->st_mode = kbuf->st_mode; ++ buf->st_nlink = kbuf->st_nlink; ++ buf->st_uid = kbuf->st_uid; ++ buf->st_gid = kbuf->st_gid; ++ buf->st_rdev = kbuf->st_rdev; ++ buf->st_size = kbuf->st_size; ++ buf->st_blksize = kbuf->st_blksize; ++ buf->st_blocks = kbuf->st_blocks; ++ buf->st_atime = kbuf->st_atime; ++ buf->st_mtime = kbuf->st_mtime; ++ buf->st_ctime = kbuf->st_ctime; ++} ++ + #ifdef __UCLIBC_HAS_LFS__ + + void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) +diff --git a/libc/sysdeps/linux/common/xstatconv.h b/libc/sysdeps/linux/common/xstatconv.h +index 57c8bcb..7568da8 100644 +--- a/libc/sysdeps/linux/common/xstatconv.h ++++ b/libc/sysdeps/linux/common/xstatconv.h +@@ -26,6 +26,7 @@ + #include <bits/kernel_stat.h> + + extern void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) attribute_hidden; ++extern void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) attribute_hidden; + #if defined __UCLIBC_HAS_LFS__ + extern void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) attribute_hidden; + #endif +-- +cgit v0.8.2.1 diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index a6ce2f6220..9f81a9a441 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -3,11 +3,11 @@ pkgname=vim _srcver=7.2 _patchver=245 pkgver=$_srcver.$_patchver -pkgrel=1 +pkgrel=2 pkgdesc="advanced text editor" url="http://www.vim.org" license='GPL' -depends="ncurses-terminfo" +depends= makedepends="ncurses-dev" subpackages="$pkgname-doc" |