diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2009-07-31 07:44:14 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@gmail.com> | 2009-07-31 07:44:14 +0000 |
| commit | 93669b2538b2cdfde3f6c288fba9a88668a7500a (patch) | |
| tree | 7271ed80c6328b5156211a2ac24d3dce1d214b65 | |
| parent | c66164b230fc33d7a903bbd1da6f803c2cadd0e2 (diff) | |
| parent | de25f1da2b2c5f49e7917971b2e324cb0773fa30 (diff) | |
| download | aports-93669b2538b2cdfde3f6c288fba9a88668a7500a.tar.bz2 aports-93669b2538b2cdfde3f6c288fba9a88668a7500a.tar.xz | |
Merge branch 'master' of git://dev.alpinelinux.org/aports
44 files changed, 562 insertions, 408 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index ee03901af5..49de04f2ac 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,20 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.0_rc2 -pkgrel=0 +pkgver=2.0_rc3 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 + dynamic-deps-fix.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" -makedepends="openssl-dev" +makedepends="openssl-dev pkgconfig" license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../dynamic-deps-fix.patch || return 1 make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="d6d0de5791cd8bbb468b1da1dbac8138 abuild-2.0_rc2.tar.bz2" +md5sums="e9ff5f028c69b1cb1e3a6c2fbd6e43a9 abuild-2.0_rc3.tar.bz2 +3ab5ff884b5a52a4870df9604e3adef8 dynamic-deps-fix.patch" diff --git a/main/abuild/dynamic-deps-fix.patch b/main/abuild/dynamic-deps-fix.patch new file mode 100644 index 0000000000..df89cc6ae0 --- /dev/null +++ b/main/abuild/dynamic-deps-fix.patch @@ -0,0 +1,13 @@ +diff --git a/abuild.in b/abuild.in +index a121dc5..bf3f505 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -415,7 +415,7 @@ trace_apk_deps() { + error "Could not find dependency for $i" + return 1 + fi +- if grep -w "^depend = $found" "$dir"/.PKGINFO >/dev/null ; then ++ if grep -w "^depend = ${found}$" "$dir"/.PKGINFO >/dev/null ; then + warning "You can remove '$found' from depends" + continue + fi diff --git a/main/apk-tools/0001-db-fix-checksum-storing-to-db.patch b/main/apk-tools/0001-db-fix-checksum-storing-to-db.patch new file mode 100644 index 0000000000..c54fe73b48 --- /dev/null +++ b/main/apk-tools/0001-db-fix-checksum-storing-to-db.patch @@ -0,0 +1,73 @@ +From c1fe6d08f3ba77bf13b098216fc5e5bcd4ba23f7 Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Thu, 30 Jul 2009 11:55:59 +0300 +Subject: [PATCH] db: fix checksum storing to db + +also take precautions in audit code if the db is missing the +checksum. +--- + src/audit.c | 7 +++---- + src/database.c | 8 ++++++-- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/src/audit.c b/src/audit.c +index 31965df..76bd492 100644 +--- a/src/audit.c ++++ b/src/audit.c +@@ -69,10 +69,9 @@ static int audit_directory(apk_hash_item item, void *ctx) + } else { + dbf = apk_db_file_query(db, bdir, APK_BLOB_STR(de->d_name)); + if (dbf != NULL) { +- if (apk_file_get_info(tmp, dbf->csum.type, &fi) < 0) +- continue; +- +- if (apk_checksum_compare(&fi.csum, &dbf->csum) == 0) ++ if (dbf->csum.type != APK_CHECKSUM_NONE && ++ apk_file_get_info(tmp, dbf->csum.type, &fi) == 0 && ++ apk_checksum_compare(&fi.csum, &dbf->csum) == 0) + continue; + + reason = 'U'; +diff --git a/src/database.c b/src/database.c +index 968d55e..16ae94b 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -1458,6 +1458,7 @@ static int apk_db_install_archive_entry(void *_ctx, + diri->dir->name, file->name); + r = apk_archive_entry_extract(ae, is, alt_name, + extract_cb, ctx); ++ memcpy(&file->csum, &ae->csum, sizeof(file->csum)); + } else { + if (apk_verbosity >= 3) + apk_message("%s", ae->name); +@@ -1502,7 +1503,8 @@ static void apk_db_purge_pkg(struct apk_database *db, struct apk_package *pkg, + hash = apk_blob_hash_seed(key.filename, diri->dir->hash); + if (!(diri->dir->flags & APK_DBDIRF_PROTECTED) || + (apk_flags & APK_PURGE) || +- (apk_file_get_info(name, file->csum.type, &fi) == 0 && ++ (file->csum.type != APK_CHECKSUM_NONE && ++ apk_file_get_info(name, file->csum.type, &fi) == 0 && + apk_checksum_compare(&file->csum, &fi.csum) == 0)) + unlink(name); + if (apk_verbosity >= 3) +@@ -1565,6 +1567,7 @@ static void apk_db_migrate_files(struct apk_database *db, + if ((diri->dir->flags & APK_DBDIRF_PROTECTED) && + (r == 0) && + (ofile == NULL || ++ ofile->csum.type == APK_CHECKSUM_NONE || + apk_checksum_compare(&ofile->csum, &fi.csum) != 0)) { + /* Protected directory, with file without + * db entry, or local modifications. +@@ -1575,7 +1578,8 @@ static void apk_db_migrate_files(struct apk_database *db, + ofile->csum.type != file->csum.type) + apk_file_get_info(name, file->csum.type, &fi); + if ((apk_flags & APK_CLEAN_PROTECTED) || +- apk_checksum_compare(&file->csum, &fi.csum) == 0) ++ (file->csum.type != APK_CHECKSUM_NONE && ++ apk_checksum_compare(&file->csum, &fi.csum) == 0)) + unlink(tmpname); + } else { + /* Overwrite the old file */ +-- +1.6.3.3 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 2f8bd959cb..96d7d35b23 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,11 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.0_pre15 -pkgrel=0 +pkgver=2.0_pre17 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" depends= makedepends="zlib-dev openssl-dev pkgconfig" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-db-fix-checksum-storing-to-db.patch " @@ -15,6 +16,7 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" sed -i -e 's:-Werror::' Make.rules + patch -p1 -i ../0001-db-fix-checksum-storing-to-db.patch || return 1 make || return 1 make DESTDIR="$pkgdir" install @@ -27,4 +29,5 @@ build() { ln -s apk apk_version } -md5sums="58d42ef75bbc8bf3cb2d7fab0fa4e583 apk-tools-2.0_pre15.tar.bz2" +md5sums="4d31c9ae51b357a8514e99a8750af0b6 apk-tools-2.0_pre17.tar.bz2 +d7944308cefe6f5fc45a24e1840d087e 0001-db-fix-checksum-storing-to-db.patch" diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD index 8244254923..1049f271b5 100644 --- a/main/clamsmtp/APKBUILD +++ b/main/clamsmtp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=clamsmtp pkgver=1.10 -pkgrel=3 +pkgrel=4 pkgdesc="An SMTP Virus Filter" url="http://memberwebs.com/stef/software/clamsmtp/" license="as-is" @@ -26,8 +26,8 @@ build() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 doc/clamsmtpd.conf "$pkgdir"/etc/clamsmtpd.conf - install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -Dm755 "$srcdir"/clamsmtpd.initd "$pkgdir"/etc/init.d/clamsmtpd + install -Dm644 "$srcdir"/clamsmtpd.confd "$pkgdir"/etc/conf.d/clamsmtpd install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index 01bb25e91d..284e15eeea 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD @@ -2,14 +2,14 @@ pkgname=dhcp pkgver=4.1.0_p1 _realver=4.1.0p1 -pkgrel=0 +pkgrel=1 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" url="https://www.isc.org/" license="GPL" depends= makedepends= -install="dhcp.pre-upgrade dhcp.post-upgrade" -subpackages="$pkgname-doc $pkgname-dev" +install="dhcp.pre-install dhcp.pre-upgrade dhcp.post-upgrade" +subpackages="$pkgname-doc $pkgname-dev dhclient" source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz $install dhcpd.confd @@ -19,7 +19,14 @@ build() { cd "$srcdir/$pkgname-$_realver" ./configure --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/dhcp \ + --with-cli-pid-file=/var/run/dhcp/dhclient.pid \ + --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \ + --with-srv-pid-file=/var/run/dhcp/dhcpd.pid \ + --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ + --with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \ + --enable-dhcpv6 \ + --enable-paranoia \ --mandir=/usr/share/man \ --infodir=/usr/share/info make || return 1 @@ -27,10 +34,23 @@ build() { install -m755 -D "$srcdir"/dhcpd.initd "$pkgdir"/etc/init.d/dhcpd install -m644 -D "$srcdir"/dhcpd.confd "$pkgdir"/etc/conf.d/dhcpd + install -d "$pkgdir"/var/lib/dhcp + install -d "$pkgdir"/var/run/dhcp +} + +dhclient() { + pkgdesc="ISC dhcp client" + install -d "$subpkgdir"/var/lib/dhcp + install -d "$subpkgdir"/var/run/dhcp + install -d "$subpkgdir"/usr/sbin + install -d "$subpkgdir"/etc/dhcp + mv "$pkgdir"/usr/sbin/dhclient "$subpkgdir"/usr/sbin/ + mv "$pkgdir"/etc/dhcp/dhclient.conf "$subpkgdir"/etc/dhcp/ } md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz +19b28380eaae7d26027c29b623aeee07 dhcp.pre-install 6cc49497f3c30ccd37fc7c032f7810c6 dhcp.pre-upgrade -a7b81948ceab73dd10de275ebc00e7eb dhcp.post-upgrade +36d562e5b0e55a36e4224fd7cb843f6a dhcp.post-upgrade df32707f5bbe5363306420b5dc6e6b40 dhcpd.confd -5df9a87539bedc98a1cbc7e38b290928 dhcpd.initd" +6ed5ddba2b445ef60d27a8b7f5a0ee0b dhcpd.initd" diff --git a/main/dhcp/dhcp.post-install b/main/dhcp/dhcp.post-install new file mode 100644 index 0000000000..01195dbd34 --- /dev/null +++ b/main/dhcp/dhcp.post-install @@ -0,0 +1,5 @@ +#!/bin/sh + +chown dhcp:dhcp var/run/dhcp var/lib/dhcp +exit 0 + diff --git a/main/dhcp/dhcp.post-upgrade b/main/dhcp/dhcp.post-upgrade index b16fea6b4a..19df74a47b 100644 --- a/main/dhcp/dhcp.post-upgrade +++ b/main/dhcp/dhcp.post-upgrade @@ -5,7 +5,8 @@ moved= for i in /etc/runlevel/*/dhcp; do if [ -L "$i" ]; then - mv ${i} ${i}d + rm $i + ln -s /etc/init.d/clamsmtpd ${i}d moved=1 fi done diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install new file mode 100644 index 0000000000..9c623bfb9e --- /dev/null +++ b/main/dhcp/dhcp.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +adduser -h /var/lib/dhcp -s /bin/false -D dhcp 2>/dev/null +exit 0 + diff --git a/main/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd index cc9727fc7c..82cb26e779 100644 --- a/main/dhcp/dhcpd.initd +++ b/main/dhcp/dhcpd.initd @@ -1,7 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.5 2007/04/02 12:34:01 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init2,v 1.1 2009/07/09 14:45:22 chainsaw Exp $ + +opts="configtest" DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf} @@ -15,6 +17,23 @@ get_var() { "${DHCPD_CHROOT}/${DHCPD_CONF}" } +checkconfig() { + /usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected a syntax error in your configuration files:" + /usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t + fi + + return $ret +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + start() { # Work out our cffile if it's on our DHCPD_OPTS case " ${DHCPD_OPTS} " in @@ -32,6 +51,8 @@ start() { return 1 fi + checkconfig || return 1 + local leasefile="$(get_var lease-file-name)" leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}" if [ ! -f "${leasefile}" ] ; then @@ -63,10 +84,11 @@ start() { stop() { local chroot="$(get_options chroot)" + + checkconfig || return 1 ebegin "Stopping ${chroot:+chrooted }${SVCNAME}" start-stop-daemon --stop --exec /usr/sbin/dhcpd \ --pidfile "${chroot}/$(get_options pidfile)" eend $? } - diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD index 0596907a79..297f99ac80 100644 --- a/main/djbdns/APKBUILD +++ b/main/djbdns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=djbdns pkgver=1.05 -pkgrel=26 +pkgrel=27 pkgdesc="Excellent high-performance DNS services" url="http://cr.yp.to/djbdns.html" license="public-domain" @@ -82,5 +82,5 @@ c7be73fe2fb4ae02d5096fa2c1f55a68 1.05-errno.patch e8a84fc4ee5ff1525b4f74889422e93c tinydns.initd 7dcf6674c07d46c736b3c25d9c92384a tinydns.confd e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install -e368a86ddc320937d663dd47684ba410 dnscache.initd +1f6d29a29382e0bb7e865aede9e07c9d dnscache.initd e2938593277d7a87806e70e145a90c3f dnscache.confd" diff --git a/main/djbdns/dnscache.initd b/main/djbdns/dnscache.initd index 481022496e..986094a1f0 100755 --- a/main/djbdns/dnscache.initd +++ b/main/djbdns/dnscache.initd @@ -3,17 +3,17 @@ # written for alpine linux - NBA April 2007 # -- Statrup variables -UID=$( grep dnscache /etc/passwd | cut -f3 -d: ) -GID=$( grep dnscache /etc/group | cut -f3 -d: ) ROOT=/etc/dnscache DAEMON=/usr/bin/dnscache -VARRUN=/var/run/dnscache +PIDFILE=/var/run/dnscache.pid #----------------------------------------------------------------- # Main program start() { + UID=$( grep dnscache /etc/passwd | cut -f3 -d: ) + GID=$( grep dnscache /etc/group | cut -f3 -d: ) ebegin "Starting dnscache" if [ -z "$UID" ] || [ -z "$GID" ]; then @@ -21,39 +21,17 @@ start() { return 1 fi - # if its already running, just report it is - if [ -e ${VARRUN}.pid ] && [ -d /proc/$( cat ${VARRUN}.pid ) ]; then - eend 0 - return 0 - fi - - ( - export UID GID ROOT - [ -n "$IPSEND" ] && export IPSEND - [ -n "$IP" ] && export IP - [ -n "$HIDETTL" ] && export HIDETTL - [ -n "$IPSEND" ] && export IPSEND - [ -n "$CACHESIZE" ] && export CACHESIZE - [ -n "$FORWARDONLY" ] && export FORWARDONLY - - $DAEMON </dev/urandom >/dev/null 2>/dev/null & - pid=$! - sleep 1 - # Check if its still running - if ! [ -d /proc/$pid ]; then - $DAEMON </dev/urandom - return 1 - fi - echo $pid > ${VARRUN}.pid - eend $? - return 0 - ) + start-stop-daemon --start --env "UID=$UID" --env "GID=$GID" \ + --env "ROOT=$ROOT" --env "IP=$IP" --env "IPSEND=$IPSEND" \ + --env "HIDETTL=$HIDETTL" --env "CACHESIZE=$CACHESIZE" \ + --env "FORWARDONLY=$FORWARDONLY" --pidfile $PIDFILE \ + --background --make-pidfile --exec $DAEMON + eend $? } stop() { ebegin "Stopping dnscache" - start-stop-daemon --stop -m --pidfile ${VARRUN}.pid --oknodo \ - --exec $DAEMON && rm ${VARRUN}.pid - eend $? + start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON + eend $? } diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index d6dda34715..6cd2f734f8 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=1.7 +pkgver=1.9 pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs @@ -13,4 +13,4 @@ build() { make make install DESTDIR="$pkgdir" || return 1 } -md5sums="56ab75d5f094e75ef242394280d7ecd1 mkinitfs-1.7.tar.bz2" +md5sums="73d4b39bb7d7ad61c609d1fb295897a3 mkinitfs-1.9.tar.bz2" diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD index 4a13dea81a..88cc30b0f1 100644 --- a/main/mpg123/APKBUILD +++ b/main/mpg123/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpg123 pkgver=1.8.1 -pkgrel=0 +pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" url="http://sourceforge.net/projects/mpg123" license="GPL2 LGPL2" @@ -22,4 +22,11 @@ build() { make || return 1 make DESTDIR="$pkgdir" install || return 1 } + +# mpg123 needs the output_*.la files so we move them back from -dev package +dev() { + default_dev + mv "$subpkgdir"/usr/lib/mpg123/output_* "$pkgdir"/usr/lib/mpg123/ +} + md5sums="856893f14b29b1cddf4aba32469860b4 mpg123-1.8.1.tar.bz2" diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 46d1e064b4..d394f10392 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssl pkgver=0.9.8k -pkgrel=3 +pkgrel=5 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url=http://openssl.org depends= @@ -44,4 +44,4 @@ md5sums="e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz 04a6a88c2ee4badd4f8649792b73eaf3 openssl-0.9.8g-fix_manpages-1.patch c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch c838eb8488896cfeb7de957a0cbe04ae openssl-0.9.8k-quote-cc.patch -4c4f8c1482fb61aed5bd0fdec344d721 openssl-0.9.8k-padlock-sha.patch" +86b7f1bf50e1f3ba407ec62001a51a0d openssl-0.9.8k-padlock-sha.patch" diff --git a/main/openssl/openssl-0.9.8k-padlock-sha.patch b/main/openssl/openssl-0.9.8k-padlock-sha.patch index 63b27cea36..b2e7e954d6 100644 --- a/main/openssl/openssl-0.9.8k-padlock-sha.patch +++ b/main/openssl/openssl-0.9.8k-padlock-sha.patch @@ -6,8 +6,8 @@ # Index: openssl-0.9.8k/crypto/engine/eng_padlock.c =================================================================== ---- openssl-0.9.8k.orig/crypto/engine/eng_padlock.c 2009-07-12 19:24:42.000000000 +0300 -+++ openssl-0.9.8k/crypto/engine/eng_padlock.c 2009-07-13 13:07:26.000000000 +0300 +--- openssl-0.9.8k.orig/crypto/engine/eng_padlock.c 2009-07-27 16:18:20.000000000 +0300 ++++ openssl-0.9.8k/crypto/engine/eng_padlock.c 2009-07-30 22:02:54.000000000 +0300 @@ -1,10 +1,13 @@ -/* +/* @@ -147,14 +147,14 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c #ifndef OPENSSL_NO_AES - (padlock_use_ace && !ENGINE_set_ciphers (e, padlock_ciphers)) || + || (PADLOCK_HAVE_ACE && !ENGINE_set_ciphers (e, padlock_ciphers)) -+#endif + #endif +- (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) { +#ifndef OPENSSL_NO_SHA + || (PADLOCK_HAVE_PHE && !ENGINE_set_digests (e, padlock_digests)) +#endif +#ifndef PADLOCK_NO_RNG + || (PADLOCK_HAVE_RNG && !ENGINE_set_RAND (e, &padlock_rand)) - #endif -- (padlock_use_rng && !ENGINE_set_RAND (e, &padlock_rand))) { ++#endif + ) { return 0; } @@ -206,11 +206,11 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0); + padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0); + padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0); -+ -+ return padlock_flags; -+} - return padlock_use_ace + padlock_use_rng; ++ return padlock_flags; ++} ++ +static inline void +padlock_htonl_block(uint32_t *data, size_t count) +{ @@ -287,31 +287,35 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c encryption function itself. This function is not AES-specific. */ static int padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, -@@ -1157,6 +1214,470 @@ +@@ -1157,6 +1214,514 @@ #endif /* OPENSSL_NO_AES */ +#ifndef OPENSSL_NO_SHA + ++#define DIGEST_DATA(ctx) ((struct padlock_digest_data *)(ctx->md_data)) ++#define PADLOCK_SHA_ALIGN(dd) (uint32_t*)(((uintptr_t)(dd) + 15) & ~15) ++#define PADLOCK_SHA_PAGES 14 ++#define PADLOCK_SHA_BUFFER (512 - sizeof(size_t) - 4*sizeof(void*)) ++#define PADLOCK_SHA_INITVECTOR_SIZE (8 * sizeof(uint32_t)) ++ +struct padlock_digest_data { -+ unsigned char output[128+16]; -+ uint64_t total; -+ -+ unsigned char *buffer; -+ size_t used; -+ size_t size; -+ -+ void (*hash)(struct padlock_digest_data *data, -+ const void *buf, size_t len); -+ int (*update)(EVP_MD_CTX *ctx, -+ const void *buffer, size_t len); -+ int (*final)(EVP_MD_CTX *ctx, unsigned char *buffer); ++ union { ++ unsigned char smallbuffer[PADLOCK_SHA_BUFFER]; ++ struct { ++ unsigned char padlockctx[128+16]; ++ unsigned char *buffer; ++ size_t mmap_size; ++ uint64_t total; ++ }; ++ }; ++ void *initvector; ++ size_t used; ++ void (*hash)(void *padlockctx, const void *buf, size_t len); ++ int (*update)(EVP_MD_CTX *ctx, const void *buffer, size_t len); ++ int (*final)(EVP_MD_CTX *ctx, unsigned char *buffer); +}; + -+#define DIGEST_DATA(ctx) ((struct padlock_digest_data *)(ctx->md_data)) -+#define DIGEST_DATA_OUTPUT(dd) (uint32_t*)(((uintptr_t)(dd->output) + 15) & ~15) -+#define PADLOCK_BUFFER_PAGES 14 -+ +static inline void * +padlock_atomic_xchg(volatile void **mem, void *fixed) +{ @@ -327,22 +331,20 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c +} + +static void -+padlock_do_sha1(struct padlock_digest_data *data, const void *buf, size_t len) ++padlock_do_sha1(void *padlockctx, const void *buf, size_t len) +{ -+ uint32_t *output = DIGEST_DATA_OUTPUT(data); + asm volatile ( + "xsha1" -+ : "+S"(buf), "+D"(output) ++ : "+S"(buf), "+D"(padlockctx) + : "c"(len), "a"(0)); +} + +static void -+padlock_do_sha256(struct padlock_digest_data *data, const void *buf, size_t len) ++padlock_do_sha256(void *padlockctx, const void *buf, size_t len) +{ -+ uint32_t *output = DIGEST_DATA_OUTPUT(data); + asm volatile ( + "xsha256" -+ : "+S"(buf), "+D"(output) ++ : "+S"(buf), "+D"(padlockctx) + : "c"(len), "a"(0)); +} + @@ -350,7 +352,6 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c +handle_sigsegv(int sig, siginfo_t *info, void *uctxp) +{ + ucontext_t *uctx = uctxp; -+ + uctx->uc_mcontext.gregs[14] += 4; +} + @@ -360,8 +361,8 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + struct sigaction act, oldact; + size_t bofs = 0; + -+ if (data->used != data->size) { -+ bofs = data->size - data->used; ++ if (data->used != data->mmap_size) { ++ bofs = data->mmap_size - data->used; + memmove(&data->buffer[bofs], data->buffer, data->used); + } + @@ -369,7 +370,8 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + act.sa_sigaction = handle_sigsegv; + act.sa_flags = SA_SIGINFO; + sigaction(SIGSEGV, &act, &oldact); -+ data->hash(data, &data->buffer[bofs], data->used + 64); ++ data->hash(PADLOCK_SHA_ALIGN(data->padlockctx), ++ &data->buffer[bofs], data->used + 64); + sigaction(SIGSEGV, &oldact, NULL); +} + @@ -377,8 +379,9 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c +padlock_free_buffer(void *buf) +{ + buf = padlock_atomic_xchg(&padlock_cached_sha_buffer, buf); -+ if (buf != NULL) -+ munmap(buf, (PADLOCK_BUFFER_PAGES + 1) * getpagesize()); ++ if (buf != NULL) { ++ munmap(buf, (PADLOCK_SHA_PAGES + 1) * getpagesize()); ++ } +} + +static void * @@ -392,7 +395,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + if (buf != NULL) + goto ret; + -+ size = (PADLOCK_BUFFER_PAGES + 1) * page; ++ size = (PADLOCK_SHA_PAGES + 1) * page; + buf = mmap(0, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); + if (buf == NULL) @@ -402,13 +405,13 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + * we are over quota. */ + mlock(buf, size); + -+ if (mprotect(buf + PADLOCK_BUFFER_PAGES * page, page, PROT_NONE) < 0) { ++ if (mprotect(buf + PADLOCK_SHA_PAGES * page, page, PROT_NONE) < 0) { + munmap(buf, size); + return NULL; + } + +ret: -+ *maxsize = PADLOCK_BUFFER_PAGES * page - 64; ++ *maxsize = PADLOCK_SHA_PAGES * page - 64; + + return buf; +} @@ -419,24 +422,23 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); + size_t chunk_size; + -+ if (ddata->buffer == NULL) { -+ ddata->buffer = padlock_allocate_buffer(&ddata->size); -+ } ++ if (ddata->buffer == NULL) ++ ddata->buffer = padlock_allocate_buffer(&ddata->mmap_size); + + while (len) { -+ if (ddata->used + len < ddata->size) { ++ if (ddata->used + len < ddata->mmap_size) { + memcpy(&ddata->buffer[ddata->used], data, len); + ddata->used += len; + ddata->total += len; + return 1; + } + -+ chunk_size = ddata->size - ddata->used; ++ chunk_size = ddata->mmap_size - ddata->used; + memcpy(&ddata->buffer[ddata->used], data, chunk_size); + + data += chunk_size; + len -= chunk_size; -+ ddata->used = ddata->size; ++ ddata->used = ddata->mmap_size; + ddata->total += chunk_size; + padlock_sha_nonfinalizing(ddata); + ddata->used = 0; @@ -450,10 +452,23 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c +{ + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); + size_t size = EVP_MD_CTX_size(ctx); -+ uint32_t *output = DIGEST_DATA_OUTPUT(ddata); + -+ padlock_htonl_block(output, size / sizeof(uint32_t)); -+ memcpy(md, output, size); ++ memcpy(md, PADLOCK_SHA_ALIGN(ddata->padlockctx), size); ++ return 1; ++} ++ ++static int ++padlock_copy_final(EVP_MD_CTX *ctx, unsigned char *md) ++{ ++ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); ++ char padlockctx[128+16]; ++ void *aligned = PADLOCK_SHA_ALIGN(padlockctx); ++ size_t size = EVP_MD_CTX_size(ctx); ++ ++ memcpy(aligned, ddata->initvector, PADLOCK_SHA_INITVECTOR_SIZE); ++ ddata->hash(aligned, ddata->smallbuffer, ddata->used); ++ padlock_htonl_block(aligned, size / sizeof(uint32_t)); ++ memcpy(md, aligned, size); + + return 1; +} @@ -463,10 +478,12 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c +{ + static const char padding[64] = { 0x80, }; + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); ++ size_t mdsize = EVP_MD_CTX_size(ctx); ++ void *aligned = PADLOCK_SHA_ALIGN(ddata->padlockctx); + + if (ddata->used == ddata->total) { + /* Sweet, everything fits in one buffer. */ -+ ddata->hash(ddata, ddata->buffer, ddata->used); ++ ddata->hash(aligned, ddata->buffer, ddata->used); + } else { + /* Hardware already hashed some buffers. + * Do finalizing manually */ @@ -492,95 +509,119 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + /* And finally calculate it */ + padlock_sha_nonfinalizing(ddata); + } ++ padlock_htonl_block(aligned, mdsize / sizeof(uint32_t)); ++ memcpy(md, aligned, mdsize); + -+ return padlock_oneshot_final(ctx, md); ++ return 1; +} + +static int -+padlock_oneshot_update(EVP_MD_CTX *ctx, const void *data, size_t length) ++padlock_copy_update(EVP_MD_CTX *ctx, const void *data, size_t len) +{ + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); + -+ /* Oneshot update is only possible if context flags indicate so */ -+ if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { ++ if (ddata->used + len > sizeof(ddata->smallbuffer)) { + ddata->update = padlock_multi_update; + ddata->final = padlock_multi_final; -+ return padlock_multi_update(ctx, data, length); ++ ++ if (ddata->used != 0) { ++ void *buffer; ++ size_t mmap_size; ++ ++ buffer = padlock_allocate_buffer(&mmap_size); ++ memcpy(buffer, ddata->smallbuffer, ddata->used); ++ ddata->buffer = buffer; ++ ddata->total = ddata->used; ++ ddata->mmap_size = mmap_size; ++ } else { ++ ddata->buffer = NULL; ++ ddata->total = 0; ++ } ++ ++ memcpy(PADLOCK_SHA_ALIGN(ddata->padlockctx), ddata->initvector, ++ PADLOCK_SHA_INITVECTOR_SIZE); ++ ++ return padlock_multi_update(ctx, data, len); + } + -+ ddata->hash(ddata, data, length); ++ memcpy(&ddata->smallbuffer[ddata->used], data, len); ++ ddata->used += len; ++ + return 1; +} + -+static void ++static int ++padlock_oneshot_update(EVP_MD_CTX *ctx, const void *data, size_t len) ++{ ++ struct padlock_digest_data *ddata = DIGEST_DATA(ctx); ++ void *aligned = PADLOCK_SHA_ALIGN(ddata->padlockctx); ++ size_t mdsize = EVP_MD_CTX_size(ctx); ++ ++ /* Oneshot update is only possible if context flags indicate so */ ++ if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { ++ ddata->update = padlock_copy_update; ++ ddata->final = padlock_copy_final; ++ return padlock_copy_update(ctx, data, len); ++ } ++ ++ memcpy(aligned, ddata->initvector, PADLOCK_SHA_INITVECTOR_SIZE); ++ ddata->hash(aligned, data, len); ++ padlock_htonl_block(aligned, mdsize / sizeof(uint32_t)); ++ ddata->used += len; ++ ++ return 1; ++} ++ ++static int +padlock_sha_init(struct padlock_digest_data *ddata) +{ -+ ddata->total = 0; -+ ddata->buffer = NULL; -+ ddata->used = 0; -+ ddata->size = 0; -+ ddata->update = padlock_oneshot_update; -+ ddata->final = padlock_oneshot_final; ++ ddata->used = 0; ++ ddata->update = padlock_oneshot_update; ++ ddata->final = padlock_oneshot_final; ++ ++ return 1; +} + +static int +padlock_sha1_init(EVP_MD_CTX *ctx) +{ ++ static uint32_t sha1_initvector[8] = { ++ 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, ++ 0xC3D2E1F0 ++ }; + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ uint32_t *output = DIGEST_DATA_OUTPUT(ddata); + -+ output[0] = 0x67452301; -+ output[1] = 0xEFCDAB89; -+ output[2] = 0x98BADCFE; -+ output[3] = 0x10325476; -+ output[4] = 0xC3D2E1F0; -+ -+ padlock_sha_init(ddata); + ddata->hash = padlock_do_sha1; -+ -+ return 1; ++ ddata->initvector = sha1_initvector; ++ return padlock_sha_init(ddata); +} + +static int +padlock_sha224_init(EVP_MD_CTX *ctx) +{ ++ static uint32_t sha224_initvector[] = { ++ 0xC1059ED8, 0x367CD507, 0x3070DD17, 0xF70E5939, ++ 0xFFC00B31, 0x68581511, 0x64F98FA7, 0xBEFA4FA4, ++ }; + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ uint32_t *output = DIGEST_DATA_OUTPUT(ddata); -+ -+ output[0] = 0xC1059ED8UL; -+ output[1] = 0x367CD507UL; -+ output[2] = 0x3070DD17UL; -+ output[3] = 0xF70E5939UL; -+ output[4] = 0xFFC00B31UL; -+ output[5] = 0x68581511UL; -+ output[6] = 0x64F98FA7UL; -+ output[7] = 0xBEFA4FA4UL; -+ -+ padlock_sha_init(ddata); -+ ddata->hash = padlock_do_sha256; + -+ return 1; ++ ddata->hash = padlock_do_sha256; ++ ddata->initvector = sha224_initvector; ++ return padlock_sha_init(ddata); +} + +static int +padlock_sha256_init(EVP_MD_CTX *ctx) +{ ++ static uint32_t sha256_initvector[] = { ++ 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, ++ 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 ++ }; + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); -+ uint32_t *output = DIGEST_DATA_OUTPUT(ddata); -+ -+ output[0] = 0x6A09E667; -+ output[1] = 0xBB67AE85; -+ output[2] = 0x3C6EF372; -+ output[3] = 0xA54FF53A; -+ output[4] = 0x510E527F; -+ output[5] = 0x9B05688C; -+ output[6] = 0x1F83D9AB; -+ output[7] = 0x5BE0CD19; -+ -+ padlock_sha_init(ddata); -+ ddata->hash = padlock_do_sha256; + -+ return 1; ++ ddata->hash = padlock_do_sha256; ++ ddata->initvector = sha256_initvector; ++ return padlock_sha_init(ddata); +} + +static int @@ -601,25 +642,29 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c + struct padlock_digest_data *dfrom = DIGEST_DATA(from); + struct padlock_digest_data *dto = DIGEST_DATA(to); + -+ /* Copy the internal state */ -+ memcpy(DIGEST_DATA_OUTPUT(dto), DIGEST_DATA_OUTPUT(dfrom), 128); -+ dto->total = dfrom->total - dfrom->used; -+ dto->hash = dfrom->hash; -+ dto->used = 0; -+ -+ /* Try using oneshot update if possible */ -+ if (dfrom->used == dfrom->total) { -+ dto->update = padlock_oneshot_update; -+ dto->final = padlock_oneshot_final; -+ } else { -+ dto->update = padlock_multi_update; -+ dto->final = padlock_multi_final; ++ /* When we get here, dto is already a memcpied from dfrom, ++ * it's ok for all other cases except when data is on a separate ++ * mmapped area. It would be nice if we had a flag, if this is ++ * a "finalization copy", so we could do finalizing SHA here and ++ * store the result to *to precalculated. But there's no such ++ * flag as to is reset on copy. */ ++ ++ if (dfrom->update != padlock_copy_update) { ++ /* Recopy the context, as they might have different alignment */ ++ memcpy(PADLOCK_SHA_ALIGN(dto->padlockctx), ++ PADLOCK_SHA_ALIGN(dfrom->padlockctx), ++ PADLOCK_SHA_INITVECTOR_SIZE); + } + -+ /* Copy pending data - one oneshot destination, this means finalizing -+ * the contents if we are still on the first iteration. */ -+ if (dfrom->buffer != NULL) -+ padlock_sha_update(to, dfrom->buffer, dfrom->used); ++ if (dfrom->update == padlock_multi_update) { ++ /* Update total, and copy the buffer */ ++ dto->total = dfrom->total - dfrom->used; ++ dto->buffer = NULL; ++ dto->used = 0; ++ dto->mmap_size = 0; ++ if (dfrom->used != 0) ++ padlock_sha_update(to, dfrom->buffer, dfrom->used); ++ } + + return 1; +} @@ -629,9 +674,8 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c +{ + struct padlock_digest_data *ddata = DIGEST_DATA(ctx); + -+ if (ddata->buffer != NULL) ++ if (ddata->update == padlock_multi_update && ddata->buffer != NULL) + padlock_free_buffer(ddata->buffer); -+ ddata->buffer = NULL; + + return 1; +} @@ -758,7 +802,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c /* ===== Random Number Generator ===== */ /* * This code is not engaged. The reason is that it does not comply -@@ -1164,7 +1685,7 @@ +@@ -1164,7 +1729,7 @@ * (posted at http://www.via.com.tw/en/viac3/c3.jsp) nor does it * provide meaningful error control... */ @@ -767,7 +811,7 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c the raw PadLock RNG */ static int padlock_rand_bytes(unsigned char *output, int count) -@@ -1212,6 +1733,7 @@ +@@ -1212,6 +1777,7 @@ padlock_rand_bytes, /* pseudorand */ padlock_rand_status, /* rand status */ }; @@ -775,123 +819,3 @@ Index: openssl-0.9.8k/crypto/engine/eng_padlock.c #endif /* COMPILE_HW_PADLOCK */ -Index: openssl-0.9.8k/crypto/evp/p_sign.c -=================================================================== ---- openssl-0.9.8k.orig/crypto/evp/p_sign.c 2009-07-13 11:01:02.000000000 +0300 -+++ openssl-0.9.8k/crypto/evp/p_sign.c 2009-07-13 11:01:45.000000000 +0300 -@@ -5,21 +5,21 @@ - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. -- * -+ * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). -- * -+ * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. -- * -+ * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: -@@ -34,10 +34,10 @@ - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). -- * 4. If you include any Windows specific code (or a derivative thereof) from -+ * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" -- * -+ * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -@@ -49,7 +49,7 @@ - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. -- * -+ * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence -@@ -105,6 +105,7 @@ - return(0); - } - EVP_MD_CTX_init(&tmp_ctx); -+ M_EVP_MD_CTX_set_flags(&tmp_ctx,EVP_MD_CTX_FLAG_ONESHOT); - EVP_MD_CTX_copy_ex(&tmp_ctx,ctx); - if (ctx->digest->flags & EVP_MD_FLAG_SVCTX) - { -Index: openssl-0.9.8k/crypto/evp/p_verify.c -=================================================================== ---- openssl-0.9.8k.orig/crypto/evp/p_verify.c 2009-07-13 11:01:06.000000000 +0300 -+++ openssl-0.9.8k/crypto/evp/p_verify.c 2009-07-13 11:02:11.000000000 +0300 -@@ -5,21 +5,21 @@ - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. -- * -+ * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). -- * -+ * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. -- * -+ * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: -@@ -34,10 +34,10 @@ - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). -- * 4. If you include any Windows specific code (or a derivative thereof) from -+ * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" -- * -+ * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -@@ -49,7 +49,7 @@ - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. -- * -+ * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence -@@ -92,7 +92,8 @@ - } - - EVP_MD_CTX_init(&tmp_ctx); -- EVP_MD_CTX_copy_ex(&tmp_ctx,ctx); -+ M_EVP_MD_CTX_set_flags(&tmp_ctx,EVP_MD_CTX_FLAG_ONESHOT); -+ EVP_MD_CTX_copy_ex(&tmp_ctx,ctx); - if (ctx->digest->flags & EVP_MD_FLAG_SVCTX) - { - EVP_MD_SVCTX sctmp; diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index aaa3fc64d0..51497f0653 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga pkgver=0.99.13 -pkgrel=0 +pkgrel=1 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" license="GPL-2" @@ -73,7 +73,7 @@ cc109a746273bc0d6aee9d758e7524ab bgpd.initd 89b0cf4e70172bfcd195b2869cae28da ospfd.initd 39b8cb21b55de53af38c94c2f5d85917 ripd.initd 120ab1b53975ec86e78266f31e935ab6 ripngd.initd -3490a10510e416ab83d5b4d767136de8 zebra.initd -c38e884372406e9e59616e436cd26388 zebra.confd +6d51e9fca8d206a6d9d1d9fde793b48f zebra.initd +34e06a1d2bc602ce691abc9ed169dd15 zebra.confd 44b4c3684e4c7300665bf90fa4520af9 quagga.pre-install d2181a6401280478b8700cfcee32794e quagga.post-install" diff --git a/main/quagga/zebra.confd b/main/quagga/zebra.confd index a5256acd04..d2deb114e5 100644 --- a/main/quagga/zebra.confd +++ b/main/quagga/zebra.confd @@ -1,7 +1,7 @@ # Additional command-line parameters to run zebra with: # -k, --keep_kernel Don't delete old routes which installed by zebra. -# -l, --log_mode number Set verbose log mode flag # -A, --vty_addr addr Set vty's bind address # -P, --vty_port port Set vty's port number # -r, --retain When program terminates, retain added route by zebra. -ZEBRA_OPTS="-l 255" +# -s, --nl-bufsize Set netlink receive buffer size +ZEBRA_OPTS="" diff --git a/main/quagga/zebra.initd b/main/quagga/zebra.initd index f0cc008432..5ca8ef58c0 100644 --- a/main/quagga/zebra.initd +++ b/main/quagga/zebra.initd @@ -17,7 +17,7 @@ checkconfig() { cleanup() { ebegin "Cleaning up stale zebra routes..." - /usr/sbin/ip route flush proto zebra + ip route flush proto zebra eend $? } diff --git a/main/rubygems/APKBUILD b/main/rubygems/APKBUILD index 8ba7c48834..ba7e33a89d 100644 --- a/main/rubygems/APKBUILD +++ b/main/rubygems/APKBUILD @@ -1,21 +1,23 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=rubygems -pkgver=1.3.1 +pkgver=1.3.5 pkgrel=0 pkgdesc="Ruby package manager" url="http://docs.rubygems.org" license="GPL" depends="ruby" makedepends="ruby-dev" -source="http://rubyforge.org/frs/download.php/45905/${pkgname}-${pkgver}.tgz -rubygems-1.3.1-setup.patch" +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 --destdir "$pkgdir" + ruby setup.rb --prefix=/usr \ + --vendor \ + --destdir "$pkgdir" } -md5sums="a04ee6f6897077c5b75f5fd1e134c5a9 rubygems-1.3.1.tgz +md5sums="6e317335898e73beab15623cdd5f8cff rubygems-1.3.5.tgz 40ef7562319ac6f82bbbe7315c78bdbb rubygems-1.3.1-setup.patch" diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD index c21385550a..36cd3d6fb0 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=12 +pkgrel=13 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -20,6 +20,7 @@ source="http://uclibc.org/downloads/$_mynamever.tar.bz2 uclibc-i386-floating-stacks.diff ppoll.patch uclibc-fork-hook.diff + uclibc-getaddrinfo-netlink.diff uclibcconfig " # backport openat funcs @@ -68,7 +69,8 @@ bbb8475963e791f596c34c81ef5583d7 uclibc-resolv-cname-fix.diff 0b3966ab7774ac42ecf34a7b596c661b uclibc-i386-floating-stacks.diff 60738298e377295d359768a09adac0bb ppoll.patch 55bb709f5efd937df323f0d39a202cfd uclibc-fork-hook.diff +a7310494a8073ebd43e1d437657532ef uclibc-getaddrinfo-netlink.diff +0a87f57d3e5001027f43b7c959d96319 uclibcconfig 329b92fec717c8808c3fa9ffd68f2dfb 0001-first-pass-at-implementing-at-funcs.patch 7ffa41082d9de2bc512b4bed9577bdf9 0002-add-hidden-aliases-for-openat-funcs.patch -e12c647716eef19dd4ad08602dcc435b 0003-remove-libc_hidden_def-mknodat.patch -0a87f57d3e5001027f43b7c959d96319 uclibcconfig" +e12c647716eef19dd4ad08602dcc435b 0003-remove-libc_hidden_def-mknodat.patch" diff --git a/main/uclibc/uclibc-getaddrinfo-netlink.diff b/main/uclibc/uclibc-getaddrinfo-netlink.diff new file mode 100644 index 0000000000..d2de3c6298 --- /dev/null +++ b/main/uclibc/uclibc-getaddrinfo-netlink.diff @@ -0,0 +1,23 @@ +Fix for netlink code that causes crashes with e.g. ppp or tun +interfaces. + +Basically a back port of c40b05b4c4226b2c4323a9ba5b096377931682ef: + +Author: Denis Vlasenko <vda.linux@googlemail.com> +Date: Tue Dec 9 00:16:11 2008 +0000 + + getaddrinfo: runp->ifa_addr indeed can be NULL, don't dereference it + +Index: uClibc-0.9.30.1/libc/inet/getaddrinfo.c +=================================================================== +--- uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c 2009-07-29 08:54:52.000000000 +0300 ++++ uClibc-0.9.30.1/libc/inet/getaddrinfo.c 2009-07-29 08:55:16.000000000 +0300 +@@ -187,6 +187,8 @@ + } + + for (runp = ifa; runp != NULL; runp = runp->ifa_next) { ++ if (runp->ifa_addr == NULL) ++ continue; + #if defined __UCLIBC_HAS_IPV4__ + if (runp->ifa_addr->sa_family == PF_INET) + seen |= SEEN_IPV4; diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index 3dee6bda28..b4ecb2a1d9 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -3,7 +3,7 @@ pkgname=vim _srcver=7.2 _patchver=234 pkgver=$_srcver.$_patchver -pkgrel=0 +pkgrel=1 pkgdesc="advanced text editor" url="http://www.vim.org" license='GPL' diff --git a/testing/asterisk/APKBUILD b/testing/asterisk/APKBUILD index 209a93d0d0..b3f290bd58 100644 --- a/testing/asterisk/APKBUILD +++ b/testing/asterisk/APKBUILD @@ -3,7 +3,7 @@ pkgname=asterisk pkgver=1.6.3.0_pre20090623 _basever=1.6.2.0-beta3 -pkgrel=1 +pkgrel=2 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" @@ -102,5 +102,5 @@ c37928e95ebef36aad097accfdbbfcb8 asterisk-05-1.6.1-glob-uclibc.patch cc6a11b73f3ba7e98a621540c8e71542 asterisk-07-issue14068.patch b4a97cb1ec3cc3f71a10ce8c067ab430 asterisk.pre-install 62ecffc90b6714b85f377d1fac73c58b asterisk.post-install -bbcd152417bb7c838b25cb6007db91da asterisk.initd +c618b7fdf4a9edf4cde6d8ccd1e32ee6 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd" diff --git a/testing/asterisk/asterisk.initd b/testing/asterisk/asterisk.initd index dc69aacf4f..864a96b3cf 100644 --- a/testing/asterisk/asterisk.initd +++ b/testing/asterisk/asterisk.initd @@ -2,11 +2,16 @@ opts="${opts} forcestop reload" +depend() { + need net + use nscd dns zaptel mysql postgresql slapd capi +} + is_running() { if [ -z "$(pidof asterisk)" ]; then return 1 else - PID="$(cat /var/run/asterisk/asterisk.pid)" + PID="$(cat /var/run/asterisk/asterisk.pid 2>/dev/null)" for x in $(pidof asterisk); do if [ "${x}" = "${PID}" ]; then return 0 diff --git a/x11/mesa/APKBUILD b/x11/mesa/APKBUILD index 110d141461..93bf51d81f 100644 --- a/x11/mesa/APKBUILD +++ b/x11/mesa/APKBUILD @@ -1,21 +1,31 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa pkgver=7.5 -pkgrel=0 -pkgdesc="Mesa DRI OpenGL library and drivers" +pkgrel=1 +pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" license="LGPL" depends= -subpackages="$pkgname-dev" +subpackages="$pkgname-dev + $pkgname-dri-ati:ati $pkgname-dri-ffb:ffb $pkgname-dri-intel:intel + $pkgname-dri-trident:trident $pkgname-dri-mach64:mach64 + $pkgname-dri-mga:mga $pkgname-dri-r128:r128 $pkgname-dri-s3v:s3v + $pkgname-dri-savage:savage $pkgname-dri-sis:sis + $pkgname-dri-tdfx:tdfx $pkgname-dri-unichrome:unichrome + " + makedepends="pkgconfig libdrm-dev libxxf86vm-dev libxdamage-dev expat-dev dri2proto xextproto libx11-dev glproto" source="http://downloads.sourceforge.net/mesa3d/MesaLib-$pkgver.tar.bz2 mesa-7.1-link-shared.patch + intel-revert-vbl.patch mesa-7.4-parallel.patch" depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev libxdamage-dev libxfixes-dev libxcb-dev" +_dri_driverdir=/usr/lib/xorg/modules/dri + build () { cd "$srcdir"/Mesa-$pkgver @@ -26,12 +36,11 @@ build () ${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs export GCC_SPECS="$srcdir"/gcc-specs +# --with-dri-drivers=swrast \ ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=swrast \ + --with-dri-driverdir=$_dri_driverdir \ --disable-asm \ --disable-glx-tls \ - --disable-ttm-api \ --with-driver=dri \ --enable-xcb \ --enable-glu \ @@ -42,6 +51,33 @@ build () install -m755 -d "$pkgdir"/usr/lib/xorg/modules/extensions ln -sf libglx.xorg "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so || return 1 } + + +_mv_dri() { + pkgdesc="Mesa DRI driver for $@" + install -d "$subpkgdir"/$_dri_driverdir + + while [ $# -gt 0 ]; do + mv "$pkgdir"/$_dri_driverdir/${1}.so \ + "$subpkgdir"/$_dri_driverdir/ || return 1 + shift + done +} + +ati() { _mv_dri radeon_dri r200_dri r300_dri; } +ffb() { _mv_dri ffb_dri; } +intel() { _mv_dri i810_dri i915_dri i965_dri EGL_i915; } +mach64() { _mv_dri mach64_dri; } +mga() { _mv_dri mga_dri; } +r128() { _mv_dri r128_dri; } +s3v() { _mv_dri s3v_dri; } +savage() { _mv_dri savage_dri; } +sis() { _mv_dri sis_dri; } +tdfx() { _mv_dri tdfx_dri; } +trident() { _mv_dri trident_dri; } +unichrome() { _mv_dri unichrome_dri; } + md5sums="459f332551f6ebb86f384d21dd15e1f0 MesaLib-7.5.tar.bz2 9eddc02e23ec08295822911e726ae89a mesa-7.1-link-shared.patch +a111f4dc82e894f8801bc3fa129af7af intel-revert-vbl.patch 75e1bb69f384e9d60544fa03c15cc0ec mesa-7.4-parallel.patch" diff --git a/x11/mesa/intel-revert-vbl.patch b/x11/mesa/intel-revert-vbl.patch new file mode 100644 index 0000000000..0394414736 --- /dev/null +++ b/x11/mesa/intel-revert-vbl.patch @@ -0,0 +1,21 @@ +commit 532d2051245a1d8afe7ca236f1d966d555bb121a +Author: Dave Airlie <airlied@linux.ie> +Date: Fri Sep 12 17:21:25 2008 +1000 + + Revert "intel: sync to vblank by default" + + This reverts commit e9bf3e4cc9a7e4bcd4c45bd707541d26ecdf0409. + +diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c +index c193830..f02192d 100644 +--- a/src/mesa/drivers/dri/intel/intel_screen.c ++++ b/src/mesa/drivers/dri/intel/intel_screen.c +@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] = + DRI_CONF_BEGIN + DRI_CONF_SECTION_PERFORMANCE + DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) +- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC) ++ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0) + /* Options correspond to DRI_CONF_BO_REUSE_DISABLED, + * DRI_CONF_BO_REUSE_ALL + */ diff --git a/x11/xf86-video-ati/APKBUILD b/x11/xf86-video-ati/APKBUILD index 1fedb1bfcf..5a7ca0c402 100644 --- a/x11/xf86-video-ati/APKBUILD +++ b/x11/xf86-video-ati/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ati pkgver=6.12.2 -pkgrel=2 +pkgrel=3 pkgdesc="ATI video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="mesa-dri-ati" makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev xineramaproto diff --git a/x11/xf86-video-glint/APKBUILD b/x11/xf86-video-glint/APKBUILD index f0405f3376..1e9efddc71 100644 --- a/x11/xf86-video-glint/APKBUILD +++ b/x11/xf86-video-glint/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-glint -pkgver=1.2.2 -pkgrel=1 +pkgver=1.2.3 +pkgrel=0 pkgdesc="GLINT/Permedia video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto xf86dgaproto glproto" +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto xf86dgaproto glproto libdrm-dev xf86driproto + mesa-dev" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +23,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="4295a46a75fa98470c6dfb0e1a4f7e9f xf86-video-glint-1.2.2.tar.bz2" +md5sums="639a327ad7d75f62cdf6ad28a37c934e xf86-video-glint-1.2.3.tar.bz2" diff --git a/x11/xf86-video-i128/APKBUILD b/x11/xf86-video-i128/APKBUILD index 0d2c7757e3..1ba78039e7 100644 --- a/x11/xf86-video-i128/APKBUILD +++ b/x11/xf86-video-i128/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-i128 -pkgver=1.3.1 -pkgrel=1 +pkgver=1.3.2 +pkgrel=0 pkgdesc="Number 9 I128 video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="3b170a6df5114420cd4021a057918a09 xf86-video-i128-1.3.1.tar.bz2" +md5sums="41a0ece4150033b4f392e3f10dca7b7a xf86-video-i128-1.3.2.tar.bz2" diff --git a/x11/xf86-video-i740/APKBUILD b/x11/xf86-video-i740/APKBUILD index de5d2f7596..28cd3db7cd 100644 --- a/x11/xf86-video-i740/APKBUILD +++ b/x11/xf86-video-i740/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-i740 -pkgver=1.3.0 -pkgrel=1 +pkgver=1.3.1 +pkgrel=0 pkgdesc="Intel i740 video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="f99791d389373850cc435ac0dd45f460 xf86-video-i740-1.3.0.tar.bz2" +md5sums="cab8e93321d63f16a473a889c0417cd9 xf86-video-i740-1.3.1.tar.bz2" diff --git a/x11/xf86-video-intel/APKBUILD b/x11/xf86-video-intel/APKBUILD index 5d6c698fba..b83559629a 100644 --- a/x11/xf86-video-intel/APKBUILD +++ b/x11/xf86-video-intel/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-intel -pkgver=2.7.0 +pkgver=2.7.99.902 pkgrel=1 pkgdesc="X.Org driver for Intel cards" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto glproto" +depends="mesa-dri-intel" +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto glproto xineramaproto libdrm-dev xf86driproto + mesa-dev" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +23,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="5832172ac69b9a066a202e1578a5d3c8 xf86-video-intel-2.7.0.tar.bz2" +md5sums="182cd2d39a2e938c63e71731a5b88c79 xf86-video-intel-2.7.99.902.tar.bz2" diff --git a/x11/xf86-video-mach64/APKBUILD b/x11/xf86-video-mach64/APKBUILD index 69ce2012bf..a6d7668aeb 100644 --- a/x11/xf86-video-mach64/APKBUILD +++ b/x11/xf86-video-mach64/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-mach64 -pkgver=6.8.0 +pkgver=6.8.1 pkgrel=1 pkgdesc="ATI Mach64 video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto" +depends="mesa-dri-mach64" +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto xineramaproto libdrm-dev xf86driproto glproto + mesa-dev + " source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +24,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="6081b8fa50c689d51f85c2fbaf93867e xf86-video-mach64-6.8.0.tar.bz2" +md5sums="0856d9c8435cf4350b68fbd57ca6d4fc xf86-video-mach64-6.8.1.tar.bz2" diff --git a/x11/xf86-video-nv/APKBUILD b/x11/xf86-video-nv/APKBUILD index 343124dce7..2991c62c8c 100644 --- a/x11/xf86-video-nv/APKBUILD +++ b/x11/xf86-video-nv/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-nv -pkgver=2.1.13 -pkgrel=1 +pkgver=2.1.14 +pkgrel=0 pkgdesc="Nvidia video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -23,4 +23,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="c3231c8808a11eb4ca066e43e0f1a273 xf86-video-nv-2.1.13.tar.bz2" +md5sums="118637515155624f8846c481a637c8c2 xf86-video-nv-2.1.14.tar.bz2" diff --git a/x11/xf86-video-openchrome/APKBUILD b/x11/xf86-video-openchrome/APKBUILD index 18d5dfdfae..6e939cff04 100644 --- a/x11/xf86-video-openchrome/APKBUILD +++ b/x11/xf86-video-openchrome/APKBUILD @@ -6,9 +6,9 @@ pkgdesc="X.Org driver for VIA/S3G cards" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc libxvmc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev libxvmc-dev fontsproto - randrproto videoproto renderproto xf86driproto mesa-dev" +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev libxvmc-dev fontsproto + randrproto videoproto renderproto xf86driproto mesa-dev glproto" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" diff --git a/x11/xf86-video-r128/APKBUILD b/x11/xf86-video-r128/APKBUILD index b5bae42703..c0fc28d5aa 100644 --- a/x11/xf86-video-r128/APKBUILD +++ b/x11/xf86-video-r128/APKBUILD @@ -1,23 +1,27 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-r128 pkgver=6.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="ATI Rage128 video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto" +depends="mesa-dri-r128" +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto xineramaproto libdrm-dev xf86driproto glproto + mesa-dev expat-dev + " -source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build () { cd "$srcdir"/$pkgname-$pkgver ${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs export GCC_SPECS="$srcdir"/gcc-specs - ./configure --prefix=/usr || return 1 + ./configure --prefix=/usr \ + --enable-dri \ + || return 1 make || return 1 make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING diff --git a/x11/xf86-video-rendition/APKBUILD b/x11/xf86-video-rendition/APKBUILD index 784c4128b5..9d1e2f2802 100644 --- a/x11/xf86-video-rendition/APKBUILD +++ b/x11/xf86-video-rendition/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-rendition -pkgver=4.2.1 -pkgrel=1 +pkgver=4.2.2 +pkgrel=0 pkgdesc="Rendition video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="c6b49b99586cc0955295cb1ca93fcac7 xf86-video-rendition-4.2.1.tar.bz2" +md5sums="562955e5c0abb19e5f050a100be2c920 xf86-video-rendition-4.2.2.tar.bz2" diff --git a/x11/xf86-video-s3/APKBUILD b/x11/xf86-video-s3/APKBUILD index 924ab86fa5..edd3483b43 100644 --- a/x11/xf86-video-s3/APKBUILD +++ b/x11/xf86-video-s3/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-s3 -pkgver=0.6.1 -pkgrel=1 +pkgver=0.6.2 +pkgrel=0 pkgdesc="X.Org driver for s3 cards" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="a5f1f2f93a50e56bd3aeed009c407337 xf86-video-s3-0.6.1.tar.bz2" +md5sums="723f9fc2de66805c1984a37c6d41580e xf86-video-s3-0.6.2.tar.bz2" diff --git a/x11/xf86-video-s3virge/APKBUILD b/x11/xf86-video-s3virge/APKBUILD index 531c672c7b..d9cadabbfb 100644 --- a/x11/xf86-video-s3virge/APKBUILD +++ b/x11/xf86-video-s3virge/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-s3virge -pkgver=1.10.2 -pkgrel=1 +pkgver=1.10.3 +pkgrel=0 pkgdesc="S3 ViRGE video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="69784e4964d75487d81be4eae3d467dd xf86-video-s3virge-1.10.2.tar.bz2" +md5sums="e59625871ac71bc2555bd784b539ef88 xf86-video-s3virge-1.10.3.tar.bz2" diff --git a/x11/xf86-video-savage/APKBUILD b/x11/xf86-video-savage/APKBUILD index 425efa3fa2..888e580835 100644 --- a/x11/xf86-video-savage/APKBUILD +++ b/x11/xf86-video-savage/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-savage -pkgver=2.2.1 +pkgver=2.3.0 pkgrel=1 pkgdesc="S3 Savage video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto" +depends="mesa-dri-savage" +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto + " source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +23,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="62b8aba48b54eaefeae87df502bf219c xf86-video-savage-2.2.1.tar.bz2" +md5sums="fc21c0b76c9403fc2cdc7d924abaa461 xf86-video-savage-2.3.0.tar.bz2" diff --git a/x11/xf86-video-siliconmotion/APKBUILD b/x11/xf86-video-siliconmotion/APKBUILD index 49bef91827..64c8b0f25d 100644 --- a/x11/xf86-video-siliconmotion/APKBUILD +++ b/x11/xf86-video-siliconmotion/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-siliconmotion -pkgver=1.7.0 -pkgrel=1 +pkgver=1.7.2 +pkgrel=0 pkgdesc="Silicon Motion video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="f9acffba89d8be200f91bab3d1df80da xf86-video-siliconmotion-1.7.0.tar.bz2" +md5sums="432791bfe9dde2d78ce7410b2cb420bb xf86-video-siliconmotion-1.7.2.tar.bz2" diff --git a/x11/xf86-video-sunffb/APKBUILD b/x11/xf86-video-sunffb/APKBUILD index e4e07d9d2a..ad347a921a 100644 --- a/x11/xf86-video-sunffb/APKBUILD +++ b/x11/xf86-video-sunffb/APKBUILD @@ -1,16 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-sunffb pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="SUNFFB video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto" +depends="mesa-dri-ffb" +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev + xineramaproto" -source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build () { diff --git a/x11/xf86-video-tdfx/APKBUILD b/x11/xf86-video-tdfx/APKBUILD index 082213ce7c..7cef201628 100644 --- a/x11/xf86-video-tdfx/APKBUILD +++ b/x11/xf86-video-tdfx/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-tdfx -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="3Dfx video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto - videoproto renderproto" +depends="mesa-dri-tdfx" +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto + videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto + " source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +23,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="59acf2a4f721f9b7abbd121748467b16 xf86-video-tdfx-1.4.1.tar.bz2" +md5sums="abc1e272ab184edf3cd51daa1b91ddcf xf86-video-tdfx-1.4.2.tar.bz2" diff --git a/x11/xf86-video-tseng/APKBUILD b/x11/xf86-video-tseng/APKBUILD index 733a3832ad..de9726f97d 100644 --- a/x11/xf86-video-tseng/APKBUILD +++ b/x11/xf86-video-tseng/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-tseng -pkgver=1.2.1 -pkgrel=1 +pkgver=1.2.2 +pkgrel=0 pkgdesc="Tseng Labs video driver" url="http://xorg.freedesktop.org/" license="custom" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" -makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto +depends= +makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" @@ -22,4 +22,4 @@ build () make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="2f687eddae5dafa5dcc05116561e267c xf86-video-tseng-1.2.1.tar.bz2" +md5sums="f55df4cb0e6cffcd3721164f35dfc88d xf86-video-tseng-1.2.2.tar.bz2" |