diff options
237 files changed, 5207 insertions, 2369 deletions
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD index 169d514926..c04a8db09a 100644 --- a/main/arpon/APKBUILD +++ b/main/arpon/APKBUILD @@ -6,18 +6,17 @@ pkgrel=0 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects" url="http://arpon.sourceforge.net/" arch="all" -license="GPL" +license="BSD" depends="" makedepends="libdnet-dev libpcap-dev libnet-dev cmake" -install= +install="" subpackages="$pkgname-doc" source="http://arpon.sourceforge.net/tarball/ArpON-$pkgver.tar.gz - arpon.initd - arpon.confd - " + arpon.initd + arpon.confd + " _builddir="$srcdir"/ArpON-$pkgver/build - prepare() { mkdir -p "$_builddir" cd "$_builddir" @@ -31,7 +30,7 @@ build() { package() { cd "$_builddir" - make install DESTDIR="$pkgdir" + make install DESTDIR="$pkgdir" || return 1 install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname diff --git a/main/bsnes/APKBUILD b/main/bsnes/APKBUILD index edcdf87119..ec7fa66edc 100644 --- a/main/bsnes/APKBUILD +++ b/main/bsnes/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.91 _x=${pkgver%.*} _y=${pkgver#*.} _pkgver="v${_x}${_y}" -pkgrel=0 +pkgrel=1 pkgdesc="high accuracy SNES emulator" url="http://byuu.org/bsnes/" arch="all" diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD index 79913027d3..34adeb874d 100644 --- a/main/cegui06/APKBUILD +++ b/main/cegui06/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cegui06 pkgver=0.6.2b -pkgrel=6 +pkgrel=7 pkgdesc="CEGUI library 0.6 for apps which need this specific version" url="http://www.cegui.org.uk" arch="all" diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD index d775632099..ac9de77ca8 100644 --- a/main/collectd/APKBUILD +++ b/main/collectd/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=collectd -pkgver=5.2.0 +pkgver=5.2.1 pkgrel=0 pkgdesc="The system statistics collection daemon" url="http://collectd.org" arch="all" -license="GPL" +license="GPL2" depends= makedepends="pkgconfig curl-dev net-snmp-dev postgresql-dev perl-dev libgcrypt-dev mysql-dev zlib-dev openssl-dev iptables-dev rrdtool-dev" @@ -90,5 +90,9 @@ mysql() { _plugin mysql; } network() { _plugin network; } rrdtool() { _plugin rrdtool; } -md5sums="d8544f3881937c21ab3409dd3f6449f4 collectd-5.2.0.tar.bz2 +md5sums="350934cfea62d37e10191816744f0eb7 collectd-5.2.1.tar.bz2 13a36ae2f92634b5619ab94224e1b77d collectd.initd" +sha256sums="d82a5c302d2cfa0c3f7a3c7b7e37fb3faf42b17d2addae036cb819b6b25b9d98 collectd-5.2.1.tar.bz2 +418d43a5ab08a8097dd2ac5c1e839df64032e96c295f89fa3b8df08a08c3dc35 collectd.initd" +sha512sums="f97c9367ed45dc01f187ee8ec2cfdb27e26380b1369383c4d2b5569fc13ec660ffaf074a4b2929c1fb6633ad97aef87ef2fe2a633da5527bb26703f8ca625736 collectd-5.2.1.tar.bz2 +fd3ba6914d1e95f255f43165f7d38405736799037d08300378678fa3a9c628b14b6a867d8e0367798cd488105547ef8eca4bef7e4b7de1814a12aa0072e4cbee collectd.initd" diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD index 5bb3f90e9d..c573aef53c 100644 --- a/main/conntrack-tools/APKBUILD +++ b/main/conntrack-tools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conntrack-tools -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="Connection tracking userspace tools" url="http://conntrack-tools.netfilter.org" @@ -33,6 +33,12 @@ package() { install -Dm644 doc/stats/conntrackd.conf \ "$pkgdir"/etc/conntrackd/conntrackd.conf } -md5sums="ee737c774e01349f75e935228a2d851b conntrack-tools-1.4.0.tar.bz2 +md5sums="3cc4703d883c6f07085e29bdc993222b conntrack-tools-1.4.1.tar.bz2 a97e0b7f1339d93caf929fb4767141e1 conntrackd.initd 8ebf3838b69d20e6bb4a173844502039 conntrackd.confd" +sha256sums="d4b0f42a9e814e9f2c95bb5dbaa7bd02a418114e019d6fa85d6b22ff20c95b6a conntrack-tools-1.4.1.tar.bz2 +290b25d9947d02b4b3d79a57af2818a5c18ff3e13e50b6507ce6346326bbe730 conntrackd.initd +6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7 conntrackd.confd" +sha512sums="57ca11c212aa836c65d6c2d1393e27f8a54077228686e00687abfa87a206d9412f0ffe7704f275450254c58fc2d17957681495b103079a29834ecb52c52f716f conntrack-tools-1.4.1.tar.bz2 +7eabe6fed8030a7fb18409795fe179a030d3210743d2b4bb1e9ff370c50cb53d2cff0f60f6f99db3e7e382c473594de617969e674e99d449239d1e7ec4cfec09 conntrackd.initd +fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f conntrackd.confd" diff --git a/main/crystalhd-git-grsec/APKBUILD b/main/crystalhd-git-grsec/APKBUILD index dd66f691e3..4a2e0856d0 100644 --- a/main/crystalhd-git-grsec/APKBUILD +++ b/main/crystalhd-git-grsec/APKBUILD @@ -7,7 +7,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _mypkgrel=0 _date=20121126 diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 9bd7ca2d75..8475c78233 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _mypkgrel=0 # verify the kernel version before entering chroot diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD index 4b3577d2a9..6de06f052c 100644 --- a/main/dansguardian/APKBUILD +++ b/main/dansguardian/APKBUILD @@ -1,32 +1,44 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dansguardian -pkgver=2.10.1.1 -pkgrel=9 +pkgver=2.12.0.3 +pkgrel=1 pkgdesc="Web content filter" url="http://dansguardian.org" arch="all" license="GPL" depends="logrotate" makedepends="zlib-dev pcre-dev pkgconfig libiconv-dev" -install="$pkgname.pre-install $pkgname.post-install" +install="$pkgname.pre-install" subpackages="$pkgname-doc" -source="http://dansguardian.org/downloads/2/Stable/$pkgname-$pkgver.tar.gz +pkgusers="dansguar" +pkggroups="dansguar" +source="http://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkgver.tar.bz2 dansguardian.initd dansguardian.logrotate ftp-credential.patch - dansguardian-2.10.1.1-gcc44.patch - gcc4.6.patch" - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../ftp-credential.patch || return 1 - patch -p1 -i ../dansguardian-2.10.1.1-gcc44.patch || return 1 - patch -p1 -i ../gcc4.6.patch || return 1 + dansguardian-2.10.1.1-pcre830.patch + " +_builddir="$srcdir"/dansguardian-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done # do not block "microsoft...clustimg=..." and similar - sed -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist + sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist \ + || return 1 + + # bind to 127.0.0.1 by default + sed -i -e 's:^filterip =.*:filterip = 127.0.0.1:' \ + configs/dansguardian.conf.in || return 1 +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -37,15 +49,30 @@ build() { --with-piddir=/var/run/ \ --enable-ntlm make || return 1 - make DESTDIR="$pkgdir" install +} - install -D -m 755 ../dansguardian.initd "$pkgdir"/etc/init.d/dansguardian - install -D -m 644 ../dansguardian.logrotate "$pkgdir"/etc/logrotate.d/dansguardian +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -D -m 755 "$srcdir"/dansguardian.initd \ + "$pkgdir"/etc/init.d/dansguardian || return 1 + install -D -m 644 "$srcdir"/dansguardian.logrotate \ + "$pkgdir"/etc/logrotate.d/dansguardian || return 1 + install -d -o dansguar -g dansguar "$pkgdir"/var/log/dansguardian } -md5sums="0987a1c9bfbdf398118386f10279611a dansguardian-2.10.1.1.tar.gz +md5sums="2a88d0392cd28eaec02b7ee727b2e253 dansguardian-2.12.0.3.tar.bz2 feaa8582f8c0251a4bff76b5e05c9369 dansguardian.initd 85b6de01c9508e8ceff5ebb55752f8d3 dansguardian.logrotate 475c46026e8553181d293d5a4feaf6d9 ftp-credential.patch -2c78b5c7346b8fcb3dee352e0c53cb5a dansguardian-2.10.1.1-gcc44.patch -858ea94750a9b32e7715f3da8ef4ae3c gcc4.6.patch" +594ca48a3753684151c2012ee371d15b dansguardian-2.10.1.1-pcre830.patch" +sha256sums="c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 dansguardian-2.12.0.3.tar.bz2 +8f4cc18fe5b9f6db1148dbb24c8fa9a3e7832fba63ba1b87a0ea92b1ab093171 dansguardian.initd +d105f5084dcd6ef87ec7bc7c1bc94cb875cdc9c0405bba5f6e2585c300e43b0c dansguardian.logrotate +1eba74871d5ffbb574d49eb0857cb9d43b292c1a27578736e0e883d58b2a7bb4 ftp-credential.patch +8686b5d845642ff74f4706559c770f027de38dd12982dd0a6573d946bb85aa87 dansguardian-2.10.1.1-pcre830.patch" +sha512sums="37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b dansguardian-2.12.0.3.tar.bz2 +d35100d255014e04f84d174e593a5a3a61687a3416e23c1112c201b2adeeb98ed5456da250693054e42b9b6bb5288b99b7498832be014005202199ac89dafb34 dansguardian.initd +cc23178755365a3cceff08d9eb5c26dd440648b22af15377a30d2032f71cf0bd8ed3ab59c8a671f2cc3f4cdcaebff5d6c9e412f2271b00ac6ce1be5178a32087 dansguardian.logrotate +07b62441363534f39a1400389c702bbd5a53317526a18b3fc929f00bd854706c56b891d7fecb4151e200448f8ba012729e712e9cfdbbd683a3d2634fdc095bd1 ftp-credential.patch +d3d9af038ff5a91d1f9dc6cf4175b0da2a791386ca624f4a639338ed189a274eba720e9771986e7ded517e2623185e8b61ef3689414197c47a6ae3220be99d57 dansguardian-2.10.1.1-pcre830.patch" diff --git a/main/dansguardian/dansguardian-2.10.1.1-gcc44.patch b/main/dansguardian/dansguardian-2.10.1.1-gcc44.patch deleted file mode 100644 index 4ea4ff9ef6..0000000000 --- a/main/dansguardian/dansguardian-2.10.1.1-gcc44.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nru dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp dansguardian-2.10.1.1/src/ConnectionHandler.cpp ---- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100 -+++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-07-05 01:15:52.000000000 +0200 -@@ -44,6 +44,7 @@ - #include <istream> - - #ifdef ENABLE_ORIG_IP -+#include <limits.h> - #include <linux/types.h> - #include <linux/netfilter_ipv4.h> - #endif -diff -Nru dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp ---- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100 -+++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-07-05 01:15:12.000000000 +0200 -@@ -26,6 +26,7 @@ - #include "../HTMLTemplate.hpp" - #include "../ConnectionHandler.hpp" - -+#include <stdio.h> - #include <syslog.h> - #include <sys/time.h> - #include <sys/types.h> -diff -Nru dansguardian-2.10.1.1.orig/src/String.cpp dansguardian-2.10.1.1/src/String.cpp ---- dansguardian-2.10.1.1.orig/src/String.cpp 2009-01-16 11:44:28.000000000 +0100 -+++ dansguardian-2.10.1.1/src/String.cpp 2009-07-05 01:15:12.000000000 +0200 -@@ -164,9 +164,9 @@ - return 0; - off_t t = 0; - if (sizeof(off_t) == 4) -- sscanf(this->c_str(), "%d", &t); -+ sscanf(this->c_str(), "%d", (long *)&t); - else if (sizeof(off_t) == 8) -- sscanf(this->c_str(), "%lld", &t); -+ sscanf(this->c_str(), "%lld", (long long*)&t); - return t; - } - diff --git a/main/dansguardian/dansguardian-2.10.1.1-pcre830.patch b/main/dansguardian/dansguardian-2.10.1.1-pcre830.patch new file mode 100644 index 0000000000..0f96c3a9e2 --- /dev/null +++ b/main/dansguardian/dansguardian-2.10.1.1-pcre830.patch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_fix_libcre3_max_sub_expression_allocation.dpatch by Russell Coker +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: libpcre3 sets reg.re_nsub to an exreme large value and dansguardian +## DP: tries to allocate memory for all records which lets malloc fail. +## DP: this patch limits the allocation to 1024 records. (#667664) + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-dansguardian~/src/RegExp.cpp pkg-dansguardian/src/RegExp.cpp +--- pkg-dansguardian~/src/RegExp.cpp 2011-10-29 14:16:31.000000000 +0200 ++++ pkg-dansguardian/src/RegExp.cpp 2012-06-23 11:02:48.821473711 +0200 +@@ -161,14 +161,17 @@ + offsets.clear(); + lengths.clear(); + imatched = false; +- regmatch_t *pmatch = new regmatch_t[reg.re_nsub + 1]; // to hold result ++ int num_sub_expressions = MAX_SUB_EXPRESSIONS; ++ if(reg.re_nsub < num_sub_expressions) ++ num_sub_expressions = reg.re_nsub; ++ regmatch_t *pmatch = new regmatch_t[num_sub_expressions + 1]; // to hold result + if (!pmatch) { // if it failed + delete[]pmatch; + imatched = false; + return false; + // exception? + } +- if (regexec(®, pos, reg.re_nsub + 1, pmatch, 0)) { // run regex ++ if (regexec(®, pos, num_sub_expressions + 1, pmatch, 0)) { // run regex + delete[]pmatch; + imatched = false; + // #ifdef DGDEBUG +@@ -182,7 +185,7 @@ + int error = 0; + while (error == 0) { + largestoffset = 0; +- for (i = 0; i <= (signed) reg.re_nsub; i++) { ++ for (i = 0; i <= (signed) num_sub_expressions; i++) { + if (pmatch[i].rm_so != -1) { + matchlen = pmatch[i].rm_eo - pmatch[i].rm_so; + submatch = new char[matchlen + 1]; +@@ -199,7 +202,7 @@ + } + if (largestoffset > 0) { + pos += largestoffset; +- error = regexec(®, pos, reg.re_nsub + 1, pmatch, REG_NOTBOL); ++ error = regexec(®, pos, num_sub_expressions + 1, pmatch, REG_NOTBOL); + } else { + error = -1; + } +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-dansguardian~/src/RegExp.hpp pkg-dansguardian/src/RegExp.hpp +--- pkg-dansguardian~/src/RegExp.hpp 2011-10-29 14:16:31.000000000 +0200 ++++ pkg-dansguardian/src/RegExp.hpp 2012-06-23 11:02:48.821473711 +0200 +@@ -22,6 +22,7 @@ + #ifndef __HPP_REGEXP + #define __HPP_REGEXP + ++#define MAX_SUB_EXPRESSIONS 1024 + + // INCLUDES + diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install index 2d06f3a6f6..f5c8bbf968 100644 --- a/main/dansguardian/dansguardian.pre-install +++ b/main/dansguardian/dansguardian.pre-install @@ -1,5 +1,9 @@ #!/bin/sh -adduser -h /var/log/dansguardian -s /bin/false -D dansguar 2>/dev/null -exit 0 +addgroup -S dansguar 2>/dev/null +adduser -S -D -H \ + -h /var/log/dansguardian \ + -s /sbin/nologin \ + -G dansguar \ + dansguar 2>/dev/null || true diff --git a/main/dansguardian/gcc4.6.patch b/main/dansguardian/gcc4.6.patch deleted file mode 100644 index e9f533e0d5..0000000000 --- a/main/dansguardian/gcc4.6.patch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 70-gcc4.6.dpatch by Daniel T Chen <crimsun@ubuntu.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix FTBFS by including cstddef for size_t - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dansguardian-2.10.1.1~/src/authplugins/ntlm.cpp dansguardian-2.10.1.1/src/authplugins/ntlm.cpp ---- dansguardian-2.10.1.1~/src/authplugins/ntlm.cpp 2008-11-18 06:27:04.000000000 -0500 -+++ dansguardian-2.10.1.1/src/authplugins/ntlm.cpp 2011-08-25 16:37:38.000000000 -0400 -@@ -27,6 +27,8 @@ - #include "../FDTunnel.hpp" - #include "../OptionContainer.hpp" - -+#include <cstddef> -+ - #include <syslog.h> - - #include <iconv.h> diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD index 817359b44c..31779a00f6 100644 --- a/main/dosfstools/APKBUILD +++ b/main/dosfstools/APKBUILD @@ -1,28 +1,30 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dosfstools -pkgver=3.0.15 +pkgver=3.0.16 pkgrel=0 pkgdesc="DOS filesystem utilities" url="http://www.daniel-baumann.ch/software/dosfstools/" arch="all" -license="GPL-2" -depends= +license="GPL3+" +depends="" makedepends="libiconv-dev" subpackages="$pkgname-doc" -source="http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" +source="http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz" +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make OPTFLAGS="$CFLAGS" LDFLAGS="-liconv $LDFLAGS" || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make PREFIX="$pkgdir" \ MANDIR="$pkgdir"/usr/share/man \ DOCDIR="$pkgdir"/usr/share/doc \ - install + install || return 1 } -md5sums="64d2020bd8e92105dfad30feee72a3ec dosfstools_3.0.15.orig.tar.xz" -sha256sums="bbbeabd630f20c9d10592b2cc974926b15e8e010e29d49f308d5464528e2dfc1 dosfstools_3.0.15.orig.tar.xz" -sha512sums="3b18601cfbea254c2f650f1b65caf08d4bcc8a08c6812802898afed93e70652f7cd2d93a5e83d836ffe2f5563b5c067c784dddd7fdd643879143a3c7d00e296d dosfstools_3.0.15.orig.tar.xz" + +md5sums="27aca18aeb8bb0851ccaeb47e7416a6e dosfstools-3.0.16.orig.tar.xz" +sha256sums="450b422d89a305bcca76b1af076c51944a5cc0f1707727ee8ef64e969dd4e956 dosfstools-3.0.16.orig.tar.xz" +sha512sums="09bf955e1c693addad5991dbf18ef3ac39ea194585397a80a1f39c3d5d87e2af6f4ed4775f2c78986bce9a853c89ff1e6fccccf096764282edf7df4c5f188b70 dosfstools-3.0.16.orig.tar.xz" diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index fa32d1f3c4..8c1f1db4cf 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=19.0.1 _pkgver=$pkgver _xulver=$pkgver -pkgrel=0 +pkgrel=2 pkgdesc="firefox web browser" url="http://www.firefox.com" arch="all" @@ -50,6 +50,7 @@ source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver mozconfig firefox-5.0-asciidel.patch duckduckgo.patch + vendor.js firefox.desktop firefox-safe.desktop" @@ -117,23 +118,30 @@ package() { exec $_mozappdir/firefox "\$@" __EOF__ chmod 755 "$pkgdir"/usr/bin/firefox + + # install our vendor prefs + install -Dm644 "$srcdir"/vendor.js \ + "$pkgdir"/$_mozappdir/defaults/preferences/vendor.js } md5sums="3a9824f323b4d31f492294582006d430 firefox-19.0.1.source.tar.bz2 98bcd8b2d33037f12ca513882fc5d831 mozconfig 2328df219e042f6aaec361cbf83cf9e9 firefox-5.0-asciidel.patch 7341e290faecd9a827c4d580142699a5 duckduckgo.patch +1515663477ce427cbdc42f04d8d5ca4e vendor.js ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" sha256sums="1e41aa0b4b0a1a3e6719d69c045f2cb2a473e6d4e8a31e34d4f4723ca10952d2 firefox-19.0.1.source.tar.bz2 0988b03a0532293fbacfd995cdc93df2a10b873cebf4912e1a96cb86f2321312 mozconfig e1e5b6ab3337a6af5c74be392d32fccfa315191191c622dac4f660157ebf4e7a firefox-5.0-asciidel.patch 034587def9ddd665cc67ebf03db1aae25749ed646e7e8d5758e1278fc75a0f8e duckduckgo.patch +d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46 vendor.js b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" sha512sums="5a970abf235d5bd54b9d881d5b00f3718eb3eb52bfdc150008b417c73d2a7178986aa500cc9bbcd7c0c94ad93da215ceda59ca15f189f9e2b47a1618ae4538d8 firefox-19.0.1.source.tar.bz2 f5a3842a04d3fbf433f70fbbbefbf8ee2fce2f25fa041bf4920f99c8842c8a16e0aeaf44e64af14cffcb743c8816ba7aebbbe13e07d0b17ee6a50dbad8f7f645 mozconfig 9ccc74883fa4f3861a5ddde1af9c3c0d151fda8ff64df979ee0565ecd2013a875894e5670a0c1d0a28fbb81fb88759777ce7fcb196e582caeb903c760859a1b1 firefox-5.0-asciidel.patch d6907d87c14647e3670aef7d55140990e9132f852a097cdc82f4f6f3c6676f1cb6b4ec5aba40d6bec8e9ad45af5e90c9572c1d11c22f2e96bb1bbf3e1bbbefb0 duckduckgo.patch +93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8 vendor.js f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/main/firefox/vendor.js b/main/firefox/vendor.js new file mode 100644 index 0000000000..2ef8b0d5b2 --- /dev/null +++ b/main/firefox/vendor.js @@ -0,0 +1,3 @@ +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + diff --git a/main/freeglut/APKBUILD b/main/freeglut/APKBUILD index d99cf193d6..4c08a7d529 100644 --- a/main/freeglut/APKBUILD +++ b/main/freeglut/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=freeglut pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="free reimplementation of OpenGL Utility Toolkit (GLUT) library" url="http://freeglut.sourceforge.net/" arch="all" diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD index 266bd95719..7c166b1533 100644 --- a/main/gettext/APKBUILD +++ b/main/gettext/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=gettext -pkgver=0.18.2 +pkgver=0.18.2.1 pkgrel=0 pkgdesc="GNU locale utilities" url="http://www.gnu.org/software/gettext/gettext.html" @@ -58,4 +58,6 @@ libintl() { fi } -md5sums="0c86e5af70c195ab8bd651d17d783928 gettext-0.18.2.tar.gz" +md5sums="034c8103b14654ebd300fadac44d6f14 gettext-0.18.2.1.tar.gz" +sha256sums="32fc1b85fc249ab81bfc37b942a992c7a34f2e1101357ce0d4591341b9164a0a gettext-0.18.2.1.tar.gz" +sha512sums="9290efb692c25f0469fa2aec66e382603d2eb5e6873be30b3f6fea73c1c4ae99250a5d3292100316873dd7e3c791be834655ac3659e36100e8ecb128100a4235 gettext-0.18.2.1.tar.gz" diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 5ebaa1b767..b6f6ab3a67 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.8.1.4 +pkgver=1.8.1.5 pkgrel=0 pkgdesc="A distributed version control system" url="http://git.or.cz/" @@ -72,15 +72,15 @@ svn() { mv "$pkgdir"/usr/libexec/git-core/git-svn "$subpkgdir"/usr/libexec/git-core } -md5sums="60f32ef4a6b3fa2143b81a28704333ed git-1.8.1.4.tar.gz +md5sums="ce168861c23a700b40ffe94475bb1d9e git-1.8.1.5.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" -sha256sums="cbb88cfab66c88189ac93a9cfdeebdd2b2fdf833848fbec0c566278889c17de1 git-1.8.1.4.tar.gz +sha256sums="f8b0be6e53e866f83cde64fa947011ebac56077bd1273c2e894038878986b955 git-1.8.1.5.tar.gz cb6319f47d81605e199771350154cbed0a6e85ef9042a689f2b405c64039f49c bb-tar.patch 46725cf0f7feeb55eb07ccb39667aefb261fa9ea45f290f8bae09efd01f0cd1a git-daemon.initd aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e git-daemon.confd" -sha512sums="8dda2ba44fcc92014b73d9a459ffaf826b940f1ea55498923968b437ce4a9d1d1bca3904b85731bd8d2ae79b36cdc382288ea46e9c981a4d7e14afbece68ea6c git-1.8.1.4.tar.gz +sha512sums="19ee4c76c66595f24d5093648202840f39356c111124017beeb32a4d79e8ce362d901ff4a09ad67c1392c5d1e48068a3a4634ad2865d8231e70b197a1cf0fdd3 git-1.8.1.5.tar.gz 6fa088a753c2a697e8dbef2032ed63e8c2a0553a41cff2fcff893c2f35c51d2c697054cc921c23ee606f77b93d0f340df85220b15e1c470bd352f7fba3986cd0 bb-tar.patch 3f3c658321a9f50b68109972cc1920e07a7a1ad94977c7e21a2b7ee764895e0f6af2d125c5fbbed95ec65981de562962caa57f4ae9f3969ac9dc1e5f60bc521e git-daemon.initd 9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509 git-daemon.confd" diff --git a/main/glew/APKBUILD b/main/glew/APKBUILD index bdfa485053..08d5da703c 100644 --- a/main/glew/APKBUILD +++ b/main/glew/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glew pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" diff --git a/main/glu/APKBUILD b/main/glu/APKBUILD index c386104bd8..48b117ee59 100644 --- a/main/glu/APKBUILD +++ b/main/glu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glu pkgver=9.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mesa OpenGL Utility library" url="http://cgit.freedesktop.org/mesa/glu/" arch="all" diff --git a/main/gmime/APKBUILD b/main/gmime/APKBUILD index e21c43ccd9..2e48f9608d 100644 --- a/main/gmime/APKBUILD +++ b/main/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=gmime -pkgver=2.6.13 +pkgver=2.6.15 pkgrel=0 pkgdesc="glib mime library" url="http://spruce.sourceforge.net/gmime/" @@ -38,4 +38,6 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="ef6c1260c26ebf9f083cb06905fc7315 gmime-2.6.13.tar.xz" +md5sums="a139ee5870ec4c0bf28fcff8ac0af444 gmime-2.6.15.tar.xz" +sha256sums="b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a gmime-2.6.15.tar.xz" +sha512sums="536ddc4e7e65335be05262626bfe15c70b53f9bd4771dce9f9ddad86ca7ef4af3a320e31f964dc33232ebd44b4a971350eaf5abfd8e345055092af0f83972f3d gmime-2.6.15.tar.xz" diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD index e5afdebb60..0d93778dd9 100644 --- a/main/gnutls/APKBUILD +++ b/main/gnutls/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnutls -pkgver=3.1.8 -pkgrel=1 +pkgver=3.1.9 +pkgrel=0 pkgdesc="A TLS protocol implementation" url="http://www.gnutls.org/" arch="all" @@ -47,4 +47,6 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -md5sums="ffac9e22aba66057d5155ad0e3b62485 gnutls-3.1.8.tar.xz" +md5sums="0674032fe6de0d90d08eed81fcac2e1d gnutls-3.1.9.tar.xz" +sha256sums="0900c4ae2e026a4c714d88e1aa134db2e0be9ecddf0be9641ade5dafcf877c3e gnutls-3.1.9.tar.xz" +sha512sums="53a68240ca6e01fdcb4907a72a7ed574b02f9a0bcde26199d17c9468323ab21aed1e7b0be0a196ac55c0a8831328292142c2a46583f839232ffedb7b6723e618 gnutls-3.1.9.tar.xz" diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD index ef5a867d75..d5cf0096aa 100644 --- a/main/graphviz/APKBUILD +++ b/main/graphviz/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=graphviz -pkgver=2.28.0 -pkgrel=3 +pkgver=2.30.1 +pkgrel=0 pkgdesc="Graph Visualization Tools" url="http://www.graphviz.org/" arch="all" @@ -98,5 +98,9 @@ graphs() { mv "$pkgdir"/usr/share/graphviz/graphs \ "$subpkgdir"/usr/share/graphviz/ } -md5sums="8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz +md5sums="8130785a8f1fb8a57f6b839b617e85fa graphviz-2.30.1.tar.gz bce8a9ae4c3a8c52c1bcf0e03d5ce364 0001-clone-nameclash.patch" +sha256sums="775fb996987032d2eca2f1502c6f913e0b02fe640c124723e45db11daf46aec8 graphviz-2.30.1.tar.gz +2b6c8186bf2799658494428d68597f63b91799f37809cbe59d8adcab60c27363 0001-clone-nameclash.patch" +sha512sums="e489997ba2a4a34f4ab25597f485aeff31615736853ef18d8b32887e8963b9a6fd4b99b80f2d4c1e47d924f48f4eedda3fa79351f8aade269580a36af1f545c8 graphviz-2.30.1.tar.gz +aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" diff --git a/main/gtk-vnc/APKBUILD b/main/gtk-vnc/APKBUILD index 8e073650ba..13e668e32c 100644 --- a/main/gtk-vnc/APKBUILD +++ b/main/gtk-vnc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk-vnc -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=0 pkgdesc="A VNC viewer widget for GTK" url="http://live.gnome.org/gtk-vnc" @@ -43,4 +43,6 @@ py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -md5sums="626f919138b8362ba82faa969fa371f3 gtk-vnc-0.5.1.tar.xz" +md5sums="591f5c0efff931336cba5b56e0c64e0d gtk-vnc-0.5.2.tar.xz" +sha256sums="b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f gtk-vnc-0.5.2.tar.xz" +sha512sums="e58a0bbb4c5d1802d51936d5869ccad55cd405f6939f49445e224863866a33173e47e055d88f50e60b3f864a7e393faf0c78a219a08ee8a8c1fc8fe108f9824a gtk-vnc-0.5.2.tar.xz" diff --git a/main/gtkglext/APKBUILD b/main/gtkglext/APKBUILD index 46b33ef530..adee233d10 100644 --- a/main/gtkglext/APKBUILD +++ b/main/gtkglext/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=gtkglext pkgver=1.2.0 -pkgrel=9 +pkgrel=10 pkgdesc="GTK+ OpenGL Extension" url="http://projects.gnome.org/gtkglext/" arch="all" diff --git a/main/inputproto/APKBUILD b/main/inputproto/APKBUILD index ef9f27c0bd..94775c1e5f 100644 --- a/main/inputproto/APKBUILD +++ b/main/inputproto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=inputproto -pkgver=2.2 +pkgver=2.3 pkgrel=0 pkgdesc="X11 Input extension wire protocol" url="http://xorg.freedesktop.org/" @@ -20,4 +20,6 @@ package() { install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="13c8aedaf98a92e282b7e456c0a5bed9 inputproto-2.2.tar.bz2" +md5sums="94db391e60044e140c9854203d080654 inputproto-2.3.tar.bz2" +sha256sums="7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f inputproto-2.3.tar.bz2" +sha512sums="4bc3986a49273777850342cfa086641eeba0fd95ad428a2f025bd44e9ea04516cb6e190b3fd2a99fe21c63d9fe4010bebe57aefe3807050d00f8b301289ec43a inputproto-2.3.tar.bz2" diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD index f08730b4ba..8147165ec7 100644 --- a/main/libgpg-error/APKBUILD +++ b/main/libgpg-error/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgpg-error -pkgver=1.10 +pkgver=1.11 pkgrel=0 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" @@ -30,4 +30,6 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -md5sums="736a03daa9dc5873047d4eb4a9c22a16 libgpg-error-1.10.tar.bz2" +md5sums="b9fa55b71cae73cb2e44254c2acc4e2c libgpg-error-1.11.tar.bz2" +sha256sums="ae3376480a073b120c7add08f1e6cfcc08500648ccf22461cd42db6224a218c0 libgpg-error-1.11.tar.bz2" +sha512sums="1c05dec32bba0a3ff9b238559161cfe5ea70fdcf0b7d2e645ac8afcade125711c1e369fcfb385835d42ce78cbbec75e3ea99573adfb371689e440a799ae8b848 libgpg-error-1.11.tar.bz2" diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD index ff50b64553..9d453383c0 100644 --- a/main/libgsf/APKBUILD +++ b/main/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgsf -pkgver=1.14.25 +pkgver=1.14.26 pkgrel=0 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats." url="http://www.gnome.org/" @@ -33,4 +33,6 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -md5sums="a66a2c6fc327bc62bebe3f988c4f45f3 libgsf-1.14.25.tar.xz" +md5sums="3c5a4fbd16a727c36974078e6d0e9575 libgsf-1.14.26.tar.xz" +sha256sums="8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5 libgsf-1.14.26.tar.xz" +sha512sums="793cc06ab5228439a6e18f9db224d5f47ea9869d0fc2f0fdb3dc2240230f8b22f0e1aab5d00a34819316e6e9426c676db010d20fd87833502af5bdb4f8e9c3b9 libgsf-1.14.26.tar.xz" diff --git a/main/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD index f7d3663df6..83bba7515a 100644 --- a/main/libnetfilter_acct/APKBUILD +++ b/main/libnetfilter_acct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: # Maintainer: Leonardo Arena <larena@alpinelinux.org> pkgname=libnetfilter_acct -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="Userspace library providing interface to extended accounting infrastructure." url="http://www.netfilter.org/projects/libnetfilter_conntrack/" @@ -28,4 +28,6 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="4755429cbd46ad0ed32bb30f84da0dee libnetfilter_acct-1.0.1.tar.bz2" +md5sums="2118d9514c079839ebd9cb3144ad2ad7 libnetfilter_acct-1.0.2.tar.bz2" +sha256sums="0128f19c3419fbd84f7e6d46b13a33ef7bda9b9f5e493bc5ae1882d087514b71 libnetfilter_acct-1.0.2.tar.bz2" +sha512sums="6bd299d509736ce3335e051137851d7f1a3751eafa380b55e9c73a25afb5d45c904ce9acefd4f934f1d21f2ff85b06faed4b072dc74d74e3a8b93342d59f5cdf libnetfilter_acct-1.0.2.tar.bz2" diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD index 69794b196d..376e79e465 100644 --- a/main/libnetfilter_conntrack/APKBUILD +++ b/main/libnetfilter_conntrack/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnetfilter_conntrack -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="programming interface (API) to the in-kernel connection tracking state table" url="http://www.netfilter.org/projects/libnetfilter_conntrack/" @@ -28,4 +28,6 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="447114b5d61bb9a9617ead3217c3d3ff libnetfilter_conntrack-1.0.2.tar.bz2" +md5sums="73394a3d8d0cfecc6abb6027b4792d52 libnetfilter_conntrack-1.0.3.tar.bz2" +sha256sums="fc1710854d26d527087dbbefb110193650d9aae1876f90cb64b8d5c0a8dd95a4 libnetfilter_conntrack-1.0.3.tar.bz2" +sha512sums="9949d3b3352e2cad3310128089de024950a1178a2a42c7a0ecec026dfe3b51b9b1b658d291d95d1a7d2ea038608ada4f77b9b8b2c72f9e887fb6211a1e25f628 libnetfilter_conntrack-1.0.3.tar.bz2" diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD index 545cefd351..d5f1ed15d6 100644 --- a/main/libpng/APKBUILD +++ b/main/libpng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpng -pkgver=1.5.13 +pkgver=1.5.14 pkgrel=0 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" @@ -36,5 +36,9 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="9c5a584d4eb5fe40d0f1bc2090112c65 libpng-1.5.13.tar.gz -23c8765aa6ca188c0575386d5ea8fe70 libpng-1.5.13-apng.patch.gz" +md5sums="27e76e0223d654093ffeb2f3daa56cc3 libpng-1.5.14.tar.gz +89fbc11f19ec1f181587bdde1dd9402f libpng-1.5.14-apng.patch.gz" +sha256sums="22007f80f6b6d6ad2b5d37bc135dce6701a17a4d64aee6d46edd3898bfbb1018 libpng-1.5.14.tar.gz +b7900ae045f7598f79bd5e6b4ca355bf83c3da8dea7b2c51cd9a78addb5c98ed libpng-1.5.14-apng.patch.gz" +sha512sums="c30a308dea913a3a000eeee87813a9e5afd9547f04d5eacbda9a83b4db6eb22c8f479d89b222fb1f8cb9e5518ac6b3686c984a1c4aa5a33e42c23ae73073bfcc libpng-1.5.14.tar.gz +dfa26d3f79b1346261cad055e4cd3779cc4314bf40b3723cfec25fc48e9148a979e03b9dbcb9ec247e1b67d5006016d82c7e210c5d290f2b61b6151ac7609eb6 libpng-1.5.14-apng.patch.gz" diff --git a/main/libtxc_dxtn/APKBUILD b/main/libtxc_dxtn/APKBUILD index 519aeb4c70..13dd5142bc 100644 --- a/main/libtxc_dxtn/APKBUILD +++ b/main/libtxc_dxtn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libtxc_dxtn pkgver=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="S3TC texture decompression helper library" url="http://dri.freedesktop.org/wiki/S3TC" arch="all" diff --git a/main/libva/APKBUILD b/main/libva/APKBUILD index f7e856faaf..32cb554870 100644 --- a/main/libva/APKBUILD +++ b/main/libva/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libva pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" url="http://freedesktop.org/wiki/Software/vaapi" arch="all" diff --git a/main/libvirt/0001-Fix-missing-error-constants-in-libvirt-python-module.patch b/main/libvirt/0001-Fix-missing-error-constants-in-libvirt-python-module.patch deleted file mode 100644 index b9afb51031..0000000000 --- a/main/libvirt/0001-Fix-missing-error-constants-in-libvirt-python-module.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 25ea8e47e74def560bf89cd94dd54b75ca5ff4d6 Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" <berrange@redhat.com> -Date: Tue, 5 Feb 2013 12:55:09 +0000 -Subject: [PATCH] Fix missing error constants in libvirt python module - -The previous change to the generator, changed too much - only -the functions are in 'virerror.c', the constants remained in -'virerror.h' which could not be renamed for API compat reasons. - -Add a test case to sanity check the generated python bindings - -Signed-off-by: Daniel P. Berrange <berrange@redhat.com> ---- - python/Makefile.am | 5 +++++ - python/generator.py | 4 +++- - python/sanitytest.py | 31 +++++++++++++++++++++++++++++++ - 3 files changed, 39 insertions(+), 1 deletion(-) - create mode 100644 python/sanitytest.py - -diff --git a/python/Makefile.am b/python/Makefile.am -index dd69600..ef3c3eb 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -119,6 +119,11 @@ $(libvirtmod_la_OBJECTS): $(GENERATED) - $(libvirtmod_qemu_la_OBJECTS): $(QEMU_GENERATED) - $(libvirtmod_lxc_la_OBJECTS): $(LXC_GENERATED) - -+EXTRA_DIST += sanitytest.py -+ -+check-local: -+ $(AM_V_GEN)PYTHONPATH=$(abs_topbuilddir):$(abs_topbuilddir)/.libs $(PYTHON) $(srcdir)/sanitytest.py -+ - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pyexecdir) - $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) -diff --git a/python/generator.py b/python/generator.py -index 71ca883..ceade6b 100755 ---- a/python/generator.py -+++ b/python/generator.py -@@ -122,8 +122,9 @@ class docParser(xml.sax.handler.ContentHandler): - if attrs.has_key('field'): - self.function_return_field = attrs['field'] - elif tag == 'enum': -+ # enums come from header files, hence virterror.h - if (attrs['file'] == "libvirt" or -- attrs['file'] == "virerror"): -+ attrs['file'] == "virterror"): - enum(attrs['type'],attrs['name'],attrs['value']) - elif attrs['file'] == "libvirt-lxc": - lxc_enum(attrs['type'],attrs['name'],attrs['value']) -@@ -134,6 +135,7 @@ class docParser(xml.sax.handler.ContentHandler): - if debug: - print "end %s" % tag - if tag == 'function': -+ # fuctions come from source files, hence 'virerror.c' - if self.function != None: - if (self.function_module == "libvirt" or - self.function_module == "virevent" or -diff --git a/python/sanitytest.py b/python/sanitytest.py -new file mode 100644 -index 0000000..047450b ---- /dev/null -+++ b/python/sanitytest.py -@@ -0,0 +1,31 @@ -+#!/usr/bin/python -+ -+import libvirt -+ -+globals = dir(libvirt) -+ -+# Sanity test that the generator hasn't gone wrong -+ -+# Look for core classes -+assert("virConnect" in globals) -+assert("virDomain" in globals) -+assert("virDomainSnapshot" in globals) -+assert("virInterface" in globals) -+assert("virNWFilter" in globals) -+assert("virNodeDevice" in globals) -+assert("virNetwork" in globals) -+assert("virSecret" in globals) -+assert("virStoragePool" in globals) -+assert("virStorageVol" in globals) -+assert("virStream" in globals) -+assert("VIR_CONNECT_RO" in globals) -+ -+# Error related bits -+assert("libvirtError" in globals) -+assert("VIR_ERR_AUTH_FAILED" in globals) -+assert("virGetLastError" in globals) -+ -+# Some misc methods -+assert("virInitialize" in globals) -+assert("virEventAddHandle" in globals) -+assert("virEventRegisterDefaultImpl" in globals) --- -1.7.11.7 - diff --git a/main/libvirt/0001-complete-virterror-virerror-name-change.patch b/main/libvirt/0001-complete-virterror-virerror-name-change.patch deleted file mode 100644 index c16b009df2..0000000000 --- a/main/libvirt/0001-complete-virterror-virerror-name-change.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a6b8bae5a6a4752926eba409202ec061d81c6c8a Mon Sep 17 00:00:00 2001 -From: Serge Hallyn <serge.hallyn@canonical.com> -Date: Wed, 30 Jan 2013 21:05:45 -0600 -Subject: [PATCH] complete virterror->virerror name change - -Without these two string changes in generator.py, the -virGetLastError wrapper does not get created in -/usr/share/pyshared/libvirt.py. Noticed when running -tests with virt-install. - -Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> ---- - python/generator.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/generator.py b/python/generator.py -index 5d27f66..71ca883 100755 ---- a/python/generator.py -+++ b/python/generator.py -@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler): - self.function_return_field = attrs['field'] - elif tag == 'enum': - if (attrs['file'] == "libvirt" or -- attrs['file'] == "virterror"): -+ attrs['file'] == "virerror"): - enum(attrs['type'],attrs['name'],attrs['value']) - elif attrs['file'] == "libvirt-lxc": - lxc_enum(attrs['type'],attrs['name'],attrs['value']) -@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler): - if self.function != None: - if (self.function_module == "libvirt" or - self.function_module == "virevent" or -- self.function_module == "virterror"): -+ self.function_module == "virerror"): - function(self.function, self.function_descr, - self.function_return, self.function_args, - self.function_file, self.function_module, --- -1.8.1 - diff --git a/main/libvirt/0001-net-support-set-public-ip-range-for-forward-mode-nat.patch b/main/libvirt/0001-net-support-set-public-ip-range-for-forward-mode-nat.patch deleted file mode 100644 index 789bd9bda3..0000000000 --- a/main/libvirt/0001-net-support-set-public-ip-range-for-forward-mode-nat.patch +++ /dev/null @@ -1,487 +0,0 @@ -From 18d50f3bc920d70a65e2c3b1f08826db91d8ae2e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Sun, 3 Feb 2013 12:18:36 +0100 -Subject: [PATCH 1/2] net: support set public ip range for forward mode nat - -Support setting which public ip to use for NAT via attribute -address in subelement <nat> in <forward>: - -... - <forward mode='nat'> - <address start='1.2.3.4' end='1.2.3.10'/> - </forward> -... - -This will construct an iptables line using: - - '-j SNAT --to-source <start>-<end>' - -instead of: - - '-j MASQUERADE' - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - docs/formatnetwork.html.in | 18 ++++++ - src/conf/network_conf.c | 152 ++++++++++++++++++++++++++++++++++++++++++-- - src/conf/network_conf.h | 3 + - src/network/bridge_driver.c | 16 +++++ - src/util/viriptables.c | 56 +++++++++++++--- - src/util/viriptables.h | 4 ++ - 6 files changed, 235 insertions(+), 14 deletions(-) - -diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in -index 7b42529..5fbd0a9 100644 ---- a/docs/formatnetwork.html.in -+++ b/docs/formatnetwork.html.in -@@ -136,6 +136,24 @@ - network, and to/from the host to the guests, are - unrestricted and not NATed.<span class="since">Since - 0.4.2</span> -+ -+ <p><span class="since">Since 1.0.3</span> it is possible to -+ specify a public IPv4 address range to be used for the NAT by -+ using the <code><nat></code> and -+ <code><address></code> subelements. -+ <pre> -+... -+ <forward mode='nat'> -+ <nat> -+ <address start='1.2.3.4' end='1.2.3.10'/> -+ </nat> -+ </forward> -+... -+ </pre> -+ An singe IPv4 address can be set by setting -+ <code>start</code> and <code>end</code> attributes to -+ the same value. -+ </p> - </dd> - - <dt><code>route</code></dt> -diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c -index 3604ff7..61d086a 100644 ---- a/src/conf/network_conf.c -+++ b/src/conf/network_conf.c -@@ -1325,6 +1325,80 @@ cleanup: - } - - static int -+virNetworkForwardNatDefParseXML(const char *networkName, -+ xmlNodePtr node, -+ xmlXPathContextPtr ctxt, -+ virNetworkForwardDefPtr def) -+{ -+ int ret = -1; -+ xmlNodePtr *natAddrNodes = NULL; -+ int nNatAddrs; -+ char *addr_start = NULL; -+ char *addr_end = NULL; -+ xmlNodePtr save = ctxt->node; -+ -+ ctxt->node = node; -+ -+ if (def->type != VIR_NETWORK_FORWARD_NAT) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("The <nat> element can only be used when <forward> 'mode' is 'nat' in network %s"), -+ networkName); -+ goto cleanup; -+ } -+ -+ /* addresses for SNAT */ -+ nNatAddrs = virXPathNodeSet("./address", ctxt, &natAddrNodes); -+ if (nNatAddrs < 0) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("invalid <address> element found in <forward> of " -+ "network %s"), networkName); -+ goto cleanup; -+ } else if (nNatAddrs > 1) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("Only one <address> element is allowed in <nat> in " -+ "<forward> in network %s"), networkName); -+ goto cleanup; -+ } else if (nNatAddrs == 1) { -+ addr_start = virXMLPropString(*natAddrNodes, "start"); -+ if (addr_start == NULL) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("missing 'start' attribute in <address> element in <nat> in " -+ "<forward> in network %s"), networkName); -+ goto cleanup; -+ } -+ addr_end = virXMLPropString(*natAddrNodes, "end"); -+ if (addr_end == NULL) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("missing 'end' attribute in <address> element in <nat> in " -+ "<forward> in network %s"), networkName); -+ goto cleanup; -+ } -+ } -+ -+ if (addr_start && virSocketAddrParse(&def->addr_start, addr_start, AF_INET) < 0) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("Bad ipv4 start address '%s' in <nat> in <forward> in " -+ "network '%s'"), addr_start, networkName); -+ goto cleanup; -+ } -+ -+ if (addr_end && virSocketAddrParse(&def->addr_end, addr_end, AF_INET) < 0) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("Bad ipv4 end address '%s' in <nat> in <forward> in " -+ "network '%s'"), addr_end, networkName); -+ goto cleanup; -+ } -+ -+ ret = 0; -+ -+cleanup: -+ VIR_FREE(addr_start); -+ VIR_FREE(addr_end); -+ ctxt->node = save; -+ return ret; -+} -+ -+static int - virNetworkForwardDefParseXML(const char *networkName, - xmlNodePtr node, - xmlXPathContextPtr ctxt, -@@ -1334,7 +1408,8 @@ virNetworkForwardDefParseXML(const char *networkName, - xmlNodePtr *forwardIfNodes = NULL; - xmlNodePtr *forwardPfNodes = NULL; - xmlNodePtr *forwardAddrNodes = NULL; -- int nForwardIfs, nForwardAddrs, nForwardPfs; -+ xmlNodePtr *forwardNatNodes = NULL; -+ int nForwardIfs, nForwardAddrs, nForwardPfs, nForwardNats; - char *forwardDev = NULL; - char *forwardManaged = NULL; - char *type = NULL; -@@ -1384,6 +1459,24 @@ virNetworkForwardDefParseXML(const char *networkName, - goto cleanup; - } - -+ nForwardNats = virXPathNodeSet("./nat", ctxt, &forwardNatNodes); -+ if (nForwardNats < 0) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("invalid <nat> element found in <forward> of network %s"), -+ networkName); -+ goto cleanup; -+ } else if (nForwardNats > 1) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("Only one <nat> element is allowed in <forward> of network %s"), -+ networkName); -+ goto cleanup; -+ } else if (nForwardNats == 1) { -+ if (virNetworkForwardNatDefParseXML(networkName, -+ *forwardNatNodes, -+ ctxt, def) < 0) -+ goto cleanup; -+ } -+ - if (((nForwardIfs > 0) + (nForwardAddrs > 0) + (nForwardPfs > 0)) > 1) { - virReportError(VIR_ERR_XML_ERROR, - _("<address>, <interface>, and <pf> elements in <forward> " -@@ -1525,6 +1618,7 @@ cleanup: - VIR_FREE(forwardPfNodes); - VIR_FREE(forwardIfNodes); - VIR_FREE(forwardAddrNodes); -+ VIR_FREE(forwardNatNodes); - ctxt->node = save; - return ret; - } -@@ -2079,13 +2173,54 @@ virPortGroupDefFormat(virBufferPtr buf, - } - - static int -+virNatDefFormat(virBufferPtr buf, -+ const virNetworkForwardDefPtr fwd) -+{ -+ char *addr_start = NULL; -+ char *addr_end = NULL; -+ int ret = -1; -+ -+ if (VIR_SOCKET_ADDR_VALID(&fwd->addr_start)) { -+ addr_start = virSocketAddrFormat(&fwd->addr_start); -+ if (!addr_start) -+ goto cleanup; -+ } -+ -+ if (VIR_SOCKET_ADDR_VALID(&fwd->addr_end)) { -+ addr_end = virSocketAddrFormat(&fwd->addr_end); -+ if (!addr_end) -+ goto cleanup; -+ } -+ -+ if (!addr_end && !addr_start) -+ return 0; -+ -+ virBufferAddLit(buf, "<nat>\n"); -+ virBufferAdjustIndent(buf, 2); -+ -+ virBufferAsprintf(buf, "<address start='%s'", addr_start); -+ if (addr_end) -+ virBufferAsprintf(buf, " end='%s'", addr_end); -+ virBufferAsprintf(buf, "/>\n"); -+ -+ virBufferAdjustIndent(buf, -2); -+ virBufferAsprintf(buf, "</nat>\n"); -+ ret = 0; -+ -+cleanup: -+ VIR_FREE(addr_start); -+ VIR_FREE(addr_end); -+ return ret; -+} -+ -+static int - virNetworkDefFormatInternal(virBufferPtr buf, - const virNetworkDefPtr def, - unsigned int flags) - { - unsigned char *uuid; - char uuidstr[VIR_UUID_STRING_BUFLEN]; -- int ii; -+ int ii, shortforward; - - virBufferAddLit(buf, "<network"); - if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) { -@@ -2122,10 +2257,17 @@ virNetworkDefFormatInternal(virBufferPtr buf, - else - virBufferAddLit(buf, " managed='no'"); - } -- virBufferAsprintf(buf, "%s>\n", -- (def->forward.nifs || def->forward.npfs) ? "" : "/"); -+ shortforward = !(def->forward.nifs || def->forward.npfs -+ || VIR_SOCKET_ADDR_VALID(&def->forward.addr_start) -+ || VIR_SOCKET_ADDR_VALID(&def->forward.addr_end)); -+ virBufferAsprintf(buf, "%s>\n", shortforward ? "/" : ""); - virBufferAdjustIndent(buf, 2); - -+ if (def->forward.type == VIR_NETWORK_FORWARD_NAT) { -+ if (virNatDefFormat(buf, &def->forward) < 0) -+ goto error; -+ } -+ - /* For now, hard-coded to at most 1 forward.pfs */ - if (def->forward.npfs) - virBufferEscapeString(buf, "<pf dev='%s'/>\n", -@@ -2155,7 +2297,7 @@ virNetworkDefFormatInternal(virBufferPtr buf, - } - } - virBufferAdjustIndent(buf, -2); -- if (def->forward.npfs || def->forward.nifs) -+ if (!shortforward) - virBufferAddLit(buf, "</forward>\n"); - } - -diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h -index 4c634ed..1a598e3 100644 ---- a/src/conf/network_conf.h -+++ b/src/conf/network_conf.h -@@ -174,6 +174,9 @@ struct _virNetworkForwardDef { - - size_t nifs; - virNetworkForwardIfDefPtr ifs; -+ -+ /* adresses for SNAT */ -+ virSocketAddr addr_start, addr_end; - }; - - typedef struct _virPortGroupDef virPortGroupDef; -diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c -index c834f83..6d74c1f 100644 ---- a/src/network/bridge_driver.c -+++ b/src/network/bridge_driver.c -@@ -1587,6 +1587,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - NULL) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? -@@ -1601,6 +1603,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - "udp") < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? -@@ -1615,6 +1619,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - "tcp") < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? -@@ -1631,12 +1637,16 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - "udp"); - masqerr4: - iptablesRemoveForwardMasquerade(driver->iptables, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - NULL); - masqerr3: - iptablesRemoveForwardAllowRelatedIn(driver->iptables, -@@ -1667,16 +1677,22 @@ networkRemoveMasqueradingIptablesRules(struct network_driver *driver, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - "tcp"); - iptablesRemoveForwardMasquerade(driver->iptables, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - "udp"); - iptablesRemoveForwardMasquerade(driver->iptables, - &ipdef->address, - prefix, - forwardIf, -+ &network->def->forward.addr_start, -+ &network->def->forward.addr_end, - NULL); - - iptablesRemoveForwardAllowRelatedIn(driver->iptables, -diff --git a/src/util/viriptables.c b/src/util/viriptables.c -index 41fe780..3f0dcf0 100644 ---- a/src/util/viriptables.c -+++ b/src/util/viriptables.c -@@ -805,11 +805,15 @@ iptablesForwardMasquerade(iptablesContext *ctx, - virSocketAddr *netaddr, - unsigned int prefix, - const char *physdev, -+ virSocketAddr *addr_start, -+ virSocketAddr *addr_end, - const char *protocol, - int action) - { -- int ret; -- char *networkstr; -+ int ret = -1; -+ char *networkstr = NULL; -+ char *addr_start_str = NULL; -+ char *addr_end_str = NULL; - virCommandPtr cmd = NULL; - - if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) -@@ -820,8 +824,18 @@ iptablesForwardMasquerade(iptablesContext *ctx, - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Attempted to NAT '%s'. NAT is only supported for IPv4."), - networkstr); -- VIR_FREE(networkstr); -- return -1; -+ goto cleanup; -+ } -+ -+ if (VIR_SOCKET_ADDR_IS_FAMILY(addr_start, AF_INET)) { -+ addr_start_str = virSocketAddrFormat(addr_start); -+ if (!addr_start_str) -+ goto cleanup; -+ if (VIR_SOCKET_ADDR_IS_FAMILY(addr_end, AF_INET)) { -+ addr_end_str = virSocketAddrFormat(addr_end); -+ if (!addr_end_str) -+ goto cleanup; -+ } - } - - cmd = iptablesCommandNew(ctx->nat_postrouting, AF_INET, action); -@@ -835,12 +849,32 @@ iptablesForwardMasquerade(iptablesContext *ctx, - if (physdev && physdev[0]) - virCommandAddArgList(cmd, "--out-interface", physdev, NULL); - -- virCommandAddArgList(cmd, "--jump", "MASQUERADE", NULL); -+ /* Use --jump SNAT if public addr is specified */ -+ if (addr_start_str && addr_start_str[0]) { -+ char tmpstr[sizeof("123.123.123.123-123.123.123.123:65535-65535")]; -+ const char *portstr = ""; -+ -+ memset(tmpstr, 0, sizeof(tmpstr)); -+ if (protocol && protocol[0]) -+ portstr = ":1024-65535"; -+ if (addr_end_str && addr_end_str[0]) { -+ snprintf(tmpstr, sizeof(tmpstr), "%s-%s%s", -+ addr_start_str, addr_end_str, portstr); -+ } else { -+ snprintf(tmpstr, sizeof(tmpstr), "%s%s", addr_start_str, portstr); -+ } - -- if (protocol && protocol[0]) -- virCommandAddArgList(cmd, "--to-ports", "1024-65535", NULL); -+ virCommandAddArgList(cmd, "--jump", "SNAT", -+ "--to-source", tmpstr, NULL); -+ } else { -+ virCommandAddArgList(cmd, "--jump", "MASQUERADE", NULL); -+ -+ if (protocol && protocol[0]) -+ virCommandAddArgList(cmd, "--to-ports", "1024-65535", NULL); -+ } - - ret = iptablesCommandRunAndFree(cmd); -+cleanup: - VIR_FREE(networkstr); - return ret; - } -@@ -863,9 +897,11 @@ iptablesAddForwardMasquerade(iptablesContext *ctx, - virSocketAddr *netaddr, - unsigned int prefix, - const char *physdev, -+ virSocketAddr *addr_start, -+ virSocketAddr *addr_end, - const char *protocol) - { -- return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, protocol, ADD); -+ return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, addr_start, addr_end, protocol, ADD); - } - - /** -@@ -886,9 +922,11 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx, - virSocketAddr *netaddr, - unsigned int prefix, - const char *physdev, -+ virSocketAddr *addr_start, -+ virSocketAddr *addr_end, - const char *protocol) - { -- return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, protocol, REMOVE); -+ return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, addr_start, addr_end, protocol, REMOVE); - } - - -diff --git a/src/util/viriptables.h b/src/util/viriptables.h -index d7fa731..4241380 100644 ---- a/src/util/viriptables.h -+++ b/src/util/viriptables.h -@@ -107,11 +107,15 @@ int iptablesAddForwardMasquerade (iptablesContext *ctx, - virSocketAddr *netaddr, - unsigned int prefix, - const char *physdev, -+ virSocketAddr *addr_start, -+ virSocketAddr *addr_end, - const char *protocol); - int iptablesRemoveForwardMasquerade (iptablesContext *ctx, - virSocketAddr *netaddr, - unsigned int prefix, - const char *physdev, -+ virSocketAddr *addr_start, -+ virSocketAddr *addr_end, - const char *protocol); - int iptablesAddOutputFixUdpChecksum (iptablesContext *ctx, - const char *iface, --- -1.8.1.2 - diff --git a/main/libvirt/0001-util-refactor-iptables-command-construction-into-mul.patch b/main/libvirt/0001-util-refactor-iptables-command-construction-into-mul.patch deleted file mode 100644 index d77da2f2f7..0000000000 --- a/main/libvirt/0001-util-refactor-iptables-command-construction-into-mul.patch +++ /dev/null @@ -1,210 +0,0 @@ -From f3531a040cf2ea1fc432a7613af4e9e823b2caa1 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 4 Feb 2013 10:45:23 +0100 -Subject: [PATCH] util: refactor iptables command construction into multiple - steps - -Instead of creating an iptables command in one shot, do it in steps -so we can add conditional options like physdev and protocol. - -This removes code duplication while keeping existing behaviour. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> -Signed-off-by: Eric Blake <eblake@redhat.com> ---- - src/util/viriptables.c | 132 ++++++++++++++++++++++--------------------------- - 1 file changed, 59 insertions(+), 73 deletions(-) - -diff --git a/src/util/viriptables.c b/src/util/viriptables.c -index 2c4290a..41fe780 100644 ---- a/src/util/viriptables.c -+++ b/src/util/viriptables.c -@@ -1,7 +1,7 @@ - /* - * viriptables.c: helper APIs for managing iptables - * -- * Copyright (C) 2007-2012 Red Hat, Inc. -+ * Copyright (C) 2007-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -129,15 +129,10 @@ iptRulesNew(const char *table, - return NULL; - } - --static int ATTRIBUTE_SENTINEL --iptablesAddRemoveRule(iptRules *rules, int family, int action, -- const char *arg, ...) -+static virCommandPtr -+iptablesCommandNew(iptRules *rules, int family, int action) - { -- va_list args; -- int ret; - virCommandPtr cmd = NULL; -- const char *s; -- - #if HAVE_FIREWALLD - virIpTablesInitialize(); - if (firewall_cmd_path) { -@@ -154,16 +149,36 @@ iptablesAddRemoveRule(iptRules *rules, int family, int action, - - virCommandAddArgList(cmd, "--table", rules->table, - action == ADD ? "--insert" : "--delete", -- rules->chain, arg, NULL); -+ rules->chain, NULL); -+ return cmd; -+} -+ -+static int -+iptablesCommandRunAndFree(virCommandPtr cmd) -+{ -+ int ret; -+ ret = virCommandRun(cmd, NULL); -+ virCommandFree(cmd); -+ return ret; -+} -+ -+static int ATTRIBUTE_SENTINEL -+iptablesAddRemoveRule(iptRules *rules, int family, int action, -+ const char *arg, ...) -+{ -+ va_list args; -+ virCommandPtr cmd = NULL; -+ const char *s; -+ -+ cmd = iptablesCommandNew(rules, family, action); -+ virCommandAddArg(cmd, arg); - - va_start(args, arg); - while ((s = va_arg(args, const char *))) - virCommandAddArg(cmd, s); - va_end(args); - -- ret = virCommandRun(cmd, NULL); -- virCommandFree(cmd); -- return ret; -+ return iptablesCommandRunAndFree(cmd); - } - - /** -@@ -372,28 +387,24 @@ iptablesForwardAllowOut(iptablesContext *ctx, - { - int ret; - char *networkstr; -+ virCommandPtr cmd = NULL; - - if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) - return -1; - -- if (physdev && physdev[0]) { -- ret = iptablesAddRemoveRule(ctx->forward_filter, -- VIR_SOCKET_ADDR_FAMILY(netaddr), -- action, -- "--source", networkstr, -- "--in-interface", iface, -- "--out-interface", physdev, -- "--jump", "ACCEPT", -- NULL); -- } else { -- ret = iptablesAddRemoveRule(ctx->forward_filter, -- VIR_SOCKET_ADDR_FAMILY(netaddr), -- action, -- "--source", networkstr, -- "--in-interface", iface, -- "--jump", "ACCEPT", -- NULL); -- } -+ cmd = iptablesCommandNew(ctx->forward_filter, -+ VIR_SOCKET_ADDR_FAMILY(netaddr), -+ action); -+ virCommandAddArgList(cmd, -+ "--source", networkstr, -+ "--in-interface", iface, NULL); -+ -+ if (physdev && physdev[0]) -+ virCommandAddArgList(cmd, "--out-interface", physdev, NULL); -+ -+ virCommandAddArgList(cmd, "--jump", "ACCEPT", NULL); -+ -+ ret = iptablesCommandRunAndFree(cmd); - VIR_FREE(networkstr); - return ret; - } -@@ -799,6 +810,7 @@ iptablesForwardMasquerade(iptablesContext *ctx, - { - int ret; - char *networkstr; -+ virCommandPtr cmd = NULL; - - if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) - return -1; -@@ -812,49 +824,23 @@ iptablesForwardMasquerade(iptablesContext *ctx, - return -1; - } - -- if (protocol && protocol[0]) { -- if (physdev && physdev[0]) { -- ret = iptablesAddRemoveRule(ctx->nat_postrouting, -- AF_INET, -- action, -- "--source", networkstr, -- "-p", protocol, -- "!", "--destination", networkstr, -- "--out-interface", physdev, -- "--jump", "MASQUERADE", -- "--to-ports", "1024-65535", -- NULL); -- } else { -- ret = iptablesAddRemoveRule(ctx->nat_postrouting, -- AF_INET, -- action, -- "--source", networkstr, -- "-p", protocol, -- "!", "--destination", networkstr, -- "--jump", "MASQUERADE", -- "--to-ports", "1024-65535", -- NULL); -- } -- } else { -- if (physdev && physdev[0]) { -- ret = iptablesAddRemoveRule(ctx->nat_postrouting, -- AF_INET, -- action, -- "--source", networkstr, -- "!", "--destination", networkstr, -- "--out-interface", physdev, -- "--jump", "MASQUERADE", -- NULL); -- } else { -- ret = iptablesAddRemoveRule(ctx->nat_postrouting, -- AF_INET, -- action, -- "--source", networkstr, -- "!", "--destination", networkstr, -- "--jump", "MASQUERADE", -- NULL); -- } -- } -+ cmd = iptablesCommandNew(ctx->nat_postrouting, AF_INET, action); -+ virCommandAddArgList(cmd, "--source", networkstr, NULL); -+ -+ if (protocol && protocol[0]) -+ virCommandAddArgList(cmd, "-p", protocol, NULL); -+ -+ virCommandAddArgList(cmd, "!", "--destination", networkstr, NULL); -+ -+ if (physdev && physdev[0]) -+ virCommandAddArgList(cmd, "--out-interface", physdev, NULL); -+ -+ virCommandAddArgList(cmd, "--jump", "MASQUERADE", NULL); -+ -+ if (protocol && protocol[0]) -+ virCommandAddArgList(cmd, "--to-ports", "1024-65535", NULL); -+ -+ ret = iptablesCommandRunAndFree(cmd); - VIR_FREE(networkstr); - return ret; - } --- -1.8.1.2 - diff --git a/main/libvirt/0002-net-add-support-for-specifying-port-range-for-forwar.patch b/main/libvirt/0002-net-add-support-for-specifying-port-range-for-forwar.patch deleted file mode 100644 index 3c1a32f10f..0000000000 --- a/main/libvirt/0002-net-add-support-for-specifying-port-range-for-forwar.patch +++ /dev/null @@ -1,379 +0,0 @@ -From acca897f2d0631e2acd4c5c53fd57a4d0a3eb712 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 11 Feb 2013 10:08:56 +0100 -Subject: [PATCH 2/2] net: add support for specifying port range for forward - mode nat - -Let users set the port range to be used for forward mode NAT: - -... - <forward mode='nat'> - <nat> - <port start='1024' end='65535'/> - </nat> - </forward> -... - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - docs/formatnetwork.html.in | 21 ++++++++++++++--- - src/conf/network_conf.c | 57 +++++++++++++++++++++++++++++++++++++++------ - src/conf/network_conf.h | 3 ++- - src/network/bridge_driver.c | 16 +++++++++++++ - src/util/viriptables.c | 39 ++++++++++++++++++++++++------- - src/util/viriptables.h | 4 ++++ - 6 files changed, 120 insertions(+), 20 deletions(-) - -diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in -index 5fbd0a9..adb5bb9 100644 ---- a/docs/formatnetwork.html.in -+++ b/docs/formatnetwork.html.in -@@ -138,9 +138,11 @@ - 0.4.2</span> - - <p><span class="since">Since 1.0.3</span> it is possible to -- specify a public IPv4 address range to be used for the NAT by -- using the <code><nat></code> and -- <code><address></code> subelements. -+ specify a public IPv4 address and port range to be used for -+ the NAT by using the <code><nat></code> subelement. -+ The address range is set with the <code><address></code> -+ subelements and <code>start</code> and <code>stop</code> -+ attributes: - <pre> - ... - <forward mode='nat'> -@@ -154,6 +156,19 @@ - <code>start</code> and <code>end</code> attributes to - the same value. - </p> -+ <p> -+ The port range to be used for the <code><nat></code> can -+ be set via the subelement <code><port></code>: -+ <pre> -+... -+ <forward mode='nat'> -+ <nat> -+ <port start='500' end='1000'/> -+ </nat> -+ </forward> -+... -+ </pre> -+ </p> - </dd> - - <dt><code>route</code></dt> -diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c -index 61d086a..5725800 100644 ---- a/src/conf/network_conf.c -+++ b/src/conf/network_conf.c -@@ -1332,7 +1332,8 @@ virNetworkForwardNatDefParseXML(const char *networkName, - { - int ret = -1; - xmlNodePtr *natAddrNodes = NULL; -- int nNatAddrs; -+ xmlNodePtr *natPortNodes = NULL; -+ int nNatAddrs, nNatPorts; - char *addr_start = NULL; - char *addr_end = NULL; - xmlNodePtr save = ctxt->node; -@@ -1389,6 +1390,36 @@ virNetworkForwardNatDefParseXML(const char *networkName, - goto cleanup; - } - -+ /* ports for SNAT and MASQUERADE */ -+ nNatPorts = virXPathNodeSet("./port", ctxt, &natPortNodes); -+ if (nNatPorts < 0) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("invalid <port> element found in <forward> of " -+ "network %s"), networkName); -+ goto cleanup; -+ } else if (nNatPorts > 1) { -+ virReportError(VIR_ERR_XML_ERROR, -+ _("Only one <port> element is allowed in <nat> in " -+ "<forward> in network %s"), networkName); -+ goto cleanup; -+ } else if (nNatPorts == 1) { -+ if (virXPathUInt("string(./port[1]/@start)", ctxt, &def->port_start) < 0 -+ || def->port_start > 65535) { -+ -+ virReportError(VIR_ERR_XML_DETAIL, -+ _("Missing or invalid 'start' attribute in <port> " -+ "in <nat> in <forward> in network %s"), -+ networkName); -+ goto cleanup; -+ } -+ if (virXPathUInt("string(./port[1]/@end)", ctxt, &def->port_end) < 0 -+ || def->port_end > 65535 || def->port_end < def->port_start) { -+ virReportError(VIR_ERR_XML_DETAIL, -+ _("Missing or invalid 'end' attribute in <port> in " -+ "<nat> in <forward> in network %s"), networkName); -+ goto cleanup; -+ } -+ } - ret = 0; - - cleanup: -@@ -2179,6 +2210,7 @@ virNatDefFormat(virBufferPtr buf, - char *addr_start = NULL; - char *addr_end = NULL; - int ret = -1; -+ int longdef; - - if (VIR_SOCKET_ADDR_VALID(&fwd->addr_start)) { - addr_start = virSocketAddrFormat(&fwd->addr_start); -@@ -2192,16 +2224,25 @@ virNatDefFormat(virBufferPtr buf, - goto cleanup; - } - -- if (!addr_end && !addr_start) -+ if (!addr_start && !addr_end && !fwd->port_start && !fwd->port_end) - return 0; - - virBufferAddLit(buf, "<nat>\n"); - virBufferAdjustIndent(buf, 2); - -- virBufferAsprintf(buf, "<address start='%s'", addr_start); -- if (addr_end) -- virBufferAsprintf(buf, " end='%s'", addr_end); -- virBufferAsprintf(buf, "/>\n"); -+ if (addr_start) { -+ virBufferAsprintf(buf, "<address start='%s'", addr_start); -+ if (addr_end) -+ virBufferAsprintf(buf, " end='%s'", addr_end); -+ virBufferAsprintf(buf, "/>\n"); -+ } -+ -+ if (fwd->port_start || fwd->port_end) { -+ virBufferAsprintf(buf, "<port start='%d'", fwd->port_start); -+ if (fwd->port_end) -+ virBufferAsprintf(buf, " end='%d'", fwd->port_end); -+ virBufferAsprintf(buf, "/>\n"); -+ } - - virBufferAdjustIndent(buf, -2); - virBufferAsprintf(buf, "</nat>\n"); -@@ -2259,7 +2300,9 @@ virNetworkDefFormatInternal(virBufferPtr buf, - } - shortforward = !(def->forward.nifs || def->forward.npfs - || VIR_SOCKET_ADDR_VALID(&def->forward.addr_start) -- || VIR_SOCKET_ADDR_VALID(&def->forward.addr_end)); -+ || VIR_SOCKET_ADDR_VALID(&def->forward.addr_end) -+ || def->forward.port_start -+ || def->forward.port_end); - virBufferAsprintf(buf, "%s>\n", shortforward ? "/" : ""); - virBufferAdjustIndent(buf, 2); - -diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h -index 1a598e3..7df2426 100644 ---- a/src/conf/network_conf.h -+++ b/src/conf/network_conf.h -@@ -175,8 +175,9 @@ struct _virNetworkForwardDef { - size_t nifs; - virNetworkForwardIfDefPtr ifs; - -- /* adresses for SNAT */ -+ /* ranges for NAT */ - virSocketAddr addr_start, addr_end; -+ unsigned int port_start, port_end; - }; - - typedef struct _virPortGroupDef virPortGroupDef; -diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c -index 6d74c1f..5c83085 100644 ---- a/src/network/bridge_driver.c -+++ b/src/network/bridge_driver.c -@@ -1589,6 +1589,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - NULL) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? -@@ -1605,6 +1607,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - "udp") < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? -@@ -1621,6 +1625,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - "tcp") < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - forwardIf ? -@@ -1639,6 +1645,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - "udp"); - masqerr4: - iptablesRemoveForwardMasquerade(driver->iptables, -@@ -1647,6 +1655,8 @@ networkAddMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - NULL); - masqerr3: - iptablesRemoveForwardAllowRelatedIn(driver->iptables, -@@ -1679,6 +1689,8 @@ networkRemoveMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - "tcp"); - iptablesRemoveForwardMasquerade(driver->iptables, - &ipdef->address, -@@ -1686,6 +1698,8 @@ networkRemoveMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - "udp"); - iptablesRemoveForwardMasquerade(driver->iptables, - &ipdef->address, -@@ -1693,6 +1707,8 @@ networkRemoveMasqueradingIptablesRules(struct network_driver *driver, - forwardIf, - &network->def->forward.addr_start, - &network->def->forward.addr_end, -+ network->def->forward.port_start, -+ network->def->forward.port_end, - NULL); - - iptablesRemoveForwardAllowRelatedIn(driver->iptables, -diff --git a/src/util/viriptables.c b/src/util/viriptables.c -index 3f0dcf0..aa48520 100644 ---- a/src/util/viriptables.c -+++ b/src/util/viriptables.c -@@ -807,6 +807,8 @@ iptablesForwardMasquerade(iptablesContext *ctx, - const char *physdev, - virSocketAddr *addr_start, - virSocketAddr *addr_end, -+ unsigned int port_start, -+ unsigned int port_end, - const char *protocol, - int action) - { -@@ -815,6 +817,7 @@ iptablesForwardMasquerade(iptablesContext *ctx, - char *addr_start_str = NULL; - char *addr_end_str = NULL; - virCommandPtr cmd = NULL; -+ char port_str[sizeof(":65535-65535")] = ""; - - if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) - return -1; -@@ -849,19 +852,27 @@ iptablesForwardMasquerade(iptablesContext *ctx, - if (physdev && physdev[0]) - virCommandAddArgList(cmd, "--out-interface", physdev, NULL); - -+ if (protocol && protocol[0]) { -+ if (port_start == 0 && port_end == 0) { -+ port_start = 1024; -+ port_end = 65535; -+ } -+ -+ if (port_start < port_end && port_end < 65536) -+ snprintf(port_str, sizeof(port_str), ":%d-%d", -+ port_start, port_end); -+ } -+ - /* Use --jump SNAT if public addr is specified */ - if (addr_start_str && addr_start_str[0]) { - char tmpstr[sizeof("123.123.123.123-123.123.123.123:65535-65535")]; -- const char *portstr = ""; - - memset(tmpstr, 0, sizeof(tmpstr)); -- if (protocol && protocol[0]) -- portstr = ":1024-65535"; - if (addr_end_str && addr_end_str[0]) { - snprintf(tmpstr, sizeof(tmpstr), "%s-%s%s", -- addr_start_str, addr_end_str, portstr); -+ addr_start_str, addr_end_str, port_str); - } else { -- snprintf(tmpstr, sizeof(tmpstr), "%s%s", addr_start_str, portstr); -+ snprintf(tmpstr, sizeof(tmpstr), "%s%s", addr_start_str, port_str); - } - - virCommandAddArgList(cmd, "--jump", "SNAT", -@@ -869,8 +880,8 @@ iptablesForwardMasquerade(iptablesContext *ctx, - } else { - virCommandAddArgList(cmd, "--jump", "MASQUERADE", NULL); - -- if (protocol && protocol[0]) -- virCommandAddArgList(cmd, "--to-ports", "1024-65535", NULL); -+ if (port_str[0]) -+ virCommandAddArgList(cmd, "--to-ports", &port_str[1], NULL); - } - - ret = iptablesCommandRunAndFree(cmd); -@@ -899,9 +910,14 @@ iptablesAddForwardMasquerade(iptablesContext *ctx, - const char *physdev, - virSocketAddr *addr_start, - virSocketAddr *addr_end, -+ unsigned int port_start, -+ unsigned int port_end, - const char *protocol) - { -- return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, addr_start, addr_end, protocol, ADD); -+ return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, -+ addr_start, addr_end, -+ port_start, port_end, -+ protocol, ADD); - } - - /** -@@ -924,9 +940,14 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx, - const char *physdev, - virSocketAddr *addr_start, - virSocketAddr *addr_end, -+ unsigned int port_start, -+ unsigned int port_end, - const char *protocol) - { -- return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, addr_start, addr_end, protocol, REMOVE); -+ return iptablesForwardMasquerade(ctx, netaddr, prefix, physdev, -+ addr_start, addr_end, -+ port_start, port_end, -+ protocol, REMOVE); - } - - -diff --git a/src/util/viriptables.h b/src/util/viriptables.h -index 4241380..f2db368 100644 ---- a/src/util/viriptables.h -+++ b/src/util/viriptables.h -@@ -109,6 +109,8 @@ int iptablesAddForwardMasquerade (iptablesContext *ctx, - const char *physdev, - virSocketAddr *addr_start, - virSocketAddr *addr_end, -+ unsigned int port_start, -+ unsigned int port_end, - const char *protocol); - int iptablesRemoveForwardMasquerade (iptablesContext *ctx, - virSocketAddr *netaddr, -@@ -116,6 +118,8 @@ int iptablesRemoveForwardMasquerade (iptablesContext *ctx, - const char *physdev, - virSocketAddr *addr_start, - virSocketAddr *addr_end, -+ unsigned int port_start, -+ unsigned int port_end, - const char *protocol); - int iptablesAddOutputFixUdpChecksum (iptablesContext *ctx, - const char *iface, --- -1.8.1.2 - diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD index 485c802039..663b6ac9c7 100644 --- a/main/libvirt/APKBUILD +++ b/main/libvirt/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=libvirt -pkgver="1.0.2" +pkgver=1.0.3 _ver="${pkgver/_rc/-rc}" -pkgrel=1 +pkgrel=0 pkgdesc="A virtualization API for several hypervisor and container systems" url="http://libvirt.org/" arch="all" @@ -20,13 +20,6 @@ source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz libvirt.confd libvirt.initd uclibc-physmem.patch - 0001-util-refactor-iptables-command-construction-into-mul.patch - - 0001-net-support-set-public-ip-range-for-forward-mode-nat.patch - 0002-net-add-support-for-specifying-port-range-for-forwar.patch - - 0001-complete-virterror-virerror-name-change.patch - 0001-Fix-missing-error-constants-in-libvirt-python-module.patch " if [ "$ALPINE_LIBC" != "eglibc" ]; then @@ -146,12 +139,15 @@ uml() { _mv_driver "UML" uml } -md5sums="7e268ed702c4331d393e5b43449cae13 libvirt-1.0.2.tar.gz +md5sums="3d9f85d586c9aa3d819b626622f3fc97 libvirt-1.0.3.tar.gz 1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd d897df38c7e7fa1a297aa551108633c9 libvirt.initd -df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch -98a496d6d606c3406e6f8b03c3b25028 0001-util-refactor-iptables-command-construction-into-mul.patch -05789e003f4b90808b6898e9d72ad8f4 0001-net-support-set-public-ip-range-for-forward-mode-nat.patch -de01f68b563a51dd39b873c5eade0f25 0002-net-add-support-for-specifying-port-range-for-forwar.patch -854982416fafeabbeca06e807c868a9c 0001-complete-virterror-virerror-name-change.patch -dcb427eeceb5dcb79e5ea8eef748e44d 0001-Fix-missing-error-constants-in-libvirt-python-module.patch" +df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch" +sha256sums="f64f4acd7cdcfc6ab5e803195ed58b949f262b54e3659d8c37b33f0fec112757 libvirt-1.0.3.tar.gz +851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1 libvirt.confd +e9fad203434ffaa6afe524e42a9fb6594edad61cb02b1ca60a68d1a7fe0c31ab libvirt.initd +807005a8669b7396c9af43ddb2534bb0f073f1e97a5c8b1d9eefc1949f3c2df8 uclibc-physmem.patch" +sha512sums="f0002d40a018e22bd05c9bc990db0b14e0ec815613f54d04fc3b631081d87b6659620188da9f0ba376f290206d979467013274ab99b7394c66bde54c82e08fb4 libvirt-1.0.3.tar.gz +9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc libvirt.confd +f48c97f93ef4509a86eda6200b3aae5b2c0c6263403bde933b770fd62240dca27bc439bd29b440ea6a47c8337f8b4511230ed915cb5ff54d9a1cf311863f6fa1 libvirt.initd +4c885e72dcb11f8523a267917315d4874812eee289fb00075334c1728d0da9bd0e5db6c52d6e3c39bd3fe66d5ccadf9e26ec9dcaa855397e211b9bd1173ac72d uclibc-physmem.patch" diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD index 614cfaf323..cdc1649787 100644 --- a/main/libxi/APKBUILD +++ b/main/libxi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxi -pkgver=1.6.2 +pkgver=1.7 pkgrel=0 pkgdesc="X11 Input extension library" url="http://xorg.freedesktop.org" @@ -33,4 +33,6 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="2a689ae1089786a6712ce9e2c2c7c7ca libXi-1.6.2.tar.bz2" +md5sums="d77922d822cb3abdbdfb92cd66440576 libXi-1.7.tar.bz2" +sha256sums="4ebcf2b02c16ff51e41e9d045de01416d6430b6a4af6a82b17b6bfa4d6f9cbfc libXi-1.7.tar.bz2" +sha512sums="0a191c274eee357a45680a33461e6ddde2147454fe5145b430da6f3fbbba88b5b1ad0650871806357475c56b6b738e764fda34e4e38aaf12f37d25fcd51ea8b3 libXi-1.7.tar.bz2" diff --git a/main/linux-grsec/5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch b/main/linux-grsec/5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch new file mode 100644 index 0000000000..4d75cf36ad --- /dev/null +++ b/main/linux-grsec/5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch @@ -0,0 +1,84 @@ +From patchwork Tue Jan 22 09:06:36 2013 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [5/5] xfrm4: Invalidate all ipv4 routes on IPsec pmtu events +Date: Mon, 21 Jan 2013 23:06:36 -0000 +From: Steffen Klassert <steffen.klassert@secunet.com> +X-Patchwork-Id: 214475 +Message-Id: <1358845596-2066-6-git-send-email-steffen.klassert@secunet.com> +To: David Miller <davem@davemloft.net> +Cc: Herbert Xu <herbert@gondor.apana.org.au>, + Steffen Klassert <steffen.klassert@secunet.com>, netdev@vger.kernel.org + +On IPsec pmtu events we can't access the transport headers of +the original packet, so we can't find the socket that sent +the packet. The only chance to notify the socket about the +pmtu change is to force a relookup for all routes. This +patch implenents this for the IPsec protocols. + +Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> + +--- +net/ipv4/ah4.c | 7 +++++-- + net/ipv4/esp4.c | 7 +++++-- + net/ipv4/ipcomp.c | 7 +++++-- + 3 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c +index a154d0a..a69b4e4 100644 +--- a/net/ipv4/ah4.c ++++ b/net/ipv4/ah4.c +@@ -420,9 +420,12 @@ static void ah4_err(struct sk_buff *skb, u32 info) + if (!x) + return; + +- if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) ++ if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { ++ atomic_inc(&flow_cache_genid); ++ rt_genid_bump(net); ++ + ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0); +- else ++ } else + ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0); + xfrm_state_put(x); + } +diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c +index fd26ff4..3b4f0cd 100644 +--- a/net/ipv4/esp4.c ++++ b/net/ipv4/esp4.c +@@ -502,9 +502,12 @@ static void esp4_err(struct sk_buff *skb, u32 info) + if (!x) + return; + +- if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) ++ if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { ++ atomic_inc(&flow_cache_genid); ++ rt_genid_bump(net); ++ + ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0); +- else ++ } else + ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0); + xfrm_state_put(x); + } +diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c +index d3ab47e..9a46dae 100644 +--- a/net/ipv4/ipcomp.c ++++ b/net/ipv4/ipcomp.c +@@ -47,9 +47,12 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) + if (!x) + return; + +- if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) ++ if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { ++ atomic_inc(&flow_cache_genid); ++ rt_genid_bump(net); ++ + ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0); +- else ++ } else + ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0); + xfrm_state_put(x); + } diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 21b4d65f87..5c67e02ba6 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,8 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.6.11 _kernver=3.6 -pkgrel=15 +pkgrel=16 +_al=5 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,8 +15,8 @@ _config=${config:-kernelconfig.${CARCH}} install= source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz - patch-3.6.11-al4.patch - grsecurity-2.9.1-3.6.11-al4-unofficial-0.patch + patch-3.6.11-al${_al}.patch + grsecurity-2.9.1-3.6.11-al${_al}-unofficial-0.patch 0004-arp-flush-arp-cache-on-device-change.patch r8169-num-rx-desc.patch @@ -23,6 +24,7 @@ source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz r8169-fix-vlan-tag-reordering.patch xsa43-pvops.patch + 5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch kernelconfig.x86 kernelconfig.x86_64 @@ -146,34 +148,37 @@ dev() { md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz bd4bba74093405887d521309a74c19e9 patch-3.6.11.xz -fa0ca65fb8e9f9d08c04f06ae5c316ec patch-3.6.11-al4.patch -0245ff3264fb1b046f24623947fb4eb7 grsecurity-2.9.1-3.6.11-al4-unofficial-0.patch +bc5dd29ae16718a7bdf3241313999122 patch-3.6.11-al5.patch +5de38a21b1217b13326a862c7b88f1da grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch daf2cbb558588c49c138fe9ca2482b64 r8169-num-rx-desc.patch d9b4a528e722d10ba53034ebd440c31b ipv4-remove-output-route-check-in-ipv4_mtu.patch 44a37e1289e1056300574848aea8bd31 r8169-fix-vlan-tag-reordering.patch 2399192c10ba600a086a4c946f1b72f2 xsa43-pvops.patch +3c84d36165b43f0f0f0bdde77c6f68c0 5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch 02ed0c981afbf6a1fc81d5fa9b44e7df kernelconfig.x86 4927251c008b2c2bf5648d732ec63f9d kernelconfig.x86_64" sha256sums="4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f linux-3.6.tar.xz 4bdc3822571a4a765bf6f347aad8b899730acef549ae4236813fd17f254f4327 patch-3.6.11.xz -897ed38d778dfd76256f065f81ad02f16d126dc2e67631253520b8fe0685b444 patch-3.6.11-al4.patch -d67eb0d4437e1c80e3289ef442d68e0b84235d0971b8b347b6340043b869b3ca grsecurity-2.9.1-3.6.11-al4-unofficial-0.patch +7b06dc536709a68cd03918231a8c9c59d236ab7ae898fd80f042413422e6e210 patch-3.6.11-al5.patch +d44e17a36af283c2cfe2d07dc4e0325a110ccf9d29253f605d7f6793d3166ce4 grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch e2d2d1503f53572c6a2e21da729a13a430dd01f510405ffb3a33b29208860bde 0004-arp-flush-arp-cache-on-device-change.patch fdce1143aa10a48582b5bb9cf441b75c6f52701a61f28139970f3110a170fb97 r8169-num-rx-desc.patch c3673636d7604b7b3df665acc0fc0153a76ac6b7f36bb931d235ea1132ac1852 ipv4-remove-output-route-check-in-ipv4_mtu.patch 7ba9b10b04197d3009ad3facabd0bdb2cab870fabcc841716efb1041412a20cd r8169-fix-vlan-tag-reordering.patch 6efe83c9951dcba20f18095814d19089e19230c6876bbdab32cc2f1165bb07c8 xsa43-pvops.patch +ea006140f59d820c61996290434ca6a16f66e6b175e33488b36b650af3592787 5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch c4236fa6150c9cba98280aadc2daccd917410148e06d2231cc8c5370d1735577 kernelconfig.x86 3afefde6d92e1c41f6487c2279c5b707ef42ce42e4f7fe9e37d482c3e24ec3b1 kernelconfig.x86_64" sha512sums="6e3354184d1799228a2d33b92e4a6b743cc24352b8ccc1fd487fab07ab97be2aa03ba87b8406a177581692db1fd40674fbd4e213a782cbe0a6a969b10c4c17a1 linux-3.6.tar.xz 08423f145ee7aef49f50d95032595ee79250135b6ecfa72f802502a277f215b63c4dc04ed149fe4ed7cdaa5ef063b8003b7f72f41d8417e45efbe7e30e621387 patch-3.6.11.xz -477ee6c8bdf8884355efafc29e58810c097a4b1e3ecd84890bf582cf513510266d85a26e38d05ae463429ccfe9dd84cedc2fb1ed0a5fcf662a8a489ca30e6495 patch-3.6.11-al4.patch -bc1e60473292f58c2884e016ba2e5f4e3fbacccd8fdc8856bd46c82e2de2811c6022c458ca5307d57bc1a512e5a65dd350cfe8ab28bc820072e9eec716f0e2c1 grsecurity-2.9.1-3.6.11-al4-unofficial-0.patch +1aaae390ee31a77bd4fa8acc4563ed4a438c6143074364853dcf5126d973d6ad5d39713e76086f36cf06c9027df676b30332f02cfc0de607f4b89e1d3f2ed21f patch-3.6.11-al5.patch +5cefb9bf53bf99a0173a6e1037427d75a4d926b3d9c66fff38355007efa48a07ed6be3e6796537c9e068eb3ea09085d3cf86df5833238318d201c95ca3ed9583 grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch b6fdf376009f0f0f3fa194cb11be97343e4d394cf5d3547de6cfca8ad619c5bd3f60719331fd8cfadc47f09d22be8376ba5f871b46b24887ea73fe47e233a54e 0004-arp-flush-arp-cache-on-device-change.patch d9c91b57415c7c3c365add35565f72ba6225e48212f55abb209e1f426902206543edefb9fc01715357e445b69222a6fb94c3469d701e465450919bad3c83d874 r8169-num-rx-desc.patch fbbaa9c940f70823f5672db04b78de71233ecdda83d0cbeaeac941d732b0e3b18be38a0ed85d7bd03818114d00d9fe00935532968bee5b4673e8fadfda8c0281 ipv4-remove-output-route-check-in-ipv4_mtu.patch 958f5dfb57b6760e92d39027e8ec8d0abc2d99f6b40ef3c108fe90acfe00f3d5fdc2ccebddeffbf70794f6d7a394d985adf40808c2d4c8f7d0591c589b88bbbc r8169-fix-vlan-tag-reordering.patch 383c00a2520f0e27a4e51ef4e499cd8dc33f75ef4d3d5eab22944126c41de20dccf563d1d05cd557cae4091167de78f44ec5bfb76e33f503b36b5e3d756fcaed xsa43-pvops.patch +7016cdac82e9969636920e5e8accafcf7b160fb5afa2ce79fc43ee0b0591afe825f047efa18c7e7b0b310085298221a8b751ff1dd51eee940fa262f0b7054813 5-5-xfrm4-Invalidate-all-ipv4-routes-on-IPsec-pmtu-events.patch 065fff74ab7f885a45d98a1cd2bc5aaf6cb9a08d830297aaab54b512b7c90d692e37101810ee36a1f26e757990f763b664788a858b3ab40d0b4821205b9d3995 kernelconfig.x86 ba9a0b035a97089e51e0a0b723c69148866dabb4baf74c870a005350f7bfd789ab47595c7bc7e218de6d7479d16279cb906aee2ffeda9a6b141ad43ecc26dd4f kernelconfig.x86_64" diff --git a/main/linux-grsec/grsecurity-2.9.1-3.6.11-al4-unofficial-0.patch b/main/linux-grsec/grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch index c198dfbb6f..66590630c5 100644 --- a/main/linux-grsec/grsecurity-2.9.1-3.6.11-al4-unofficial-0.patch +++ b/main/linux-grsec/grsecurity-2.9.1-3.6.11-al5-unofficial-0.patch @@ -223,10 +223,10 @@ index 39462cf..611a556 100644 +zconf.lex.c zoffset.h diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index ad7e2e5..199f49e 100644 +index 15199ed..6ee9267 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -905,6 +905,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -910,6 +910,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. gpt [EFI] Forces disk with valid GPT signature but invalid Protective MBR to be treated as GPT. @@ -236,7 +236,7 @@ index ad7e2e5..199f49e 100644 hashdist= [KNL,NUMA] Large hashes allocated during boot are distributed across NUMA nodes. Defaults on for 64-bit NUMA, off otherwise. -@@ -2050,6 +2053,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -2055,6 +2058,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -31907,10 +31907,10 @@ index 8a8725c..afed796 100644 marker = list_first_entry(&queue->head, struct vmw_marker, head); diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 10ef742..9025b12 100644 +index 545eab4..b7d5269 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -2178,7 +2178,7 @@ static bool hid_ignore(struct hid_device *hdev) +@@ -2179,7 +2179,7 @@ static bool hid_ignore(struct hid_device *hdev) int hid_add_device(struct hid_device *hdev) { @@ -31919,7 +31919,7 @@ index 10ef742..9025b12 100644 int ret; if (WARN_ON(hdev->status & HID_STAT_ADDED)) -@@ -2213,7 +2213,7 @@ int hid_add_device(struct hid_device *hdev) +@@ -2214,7 +2214,7 @@ int hid_add_device(struct hid_device *hdev) /* XXX hack, any other cleaner solution after the driver core * is converted to allow more than 20 bytes as the device name? */ dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, @@ -36265,7 +36265,7 @@ index 78816b8..1fcdfae 100644 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads) diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h -index de6968f..29ac4c1 100644 +index c59edc7..7818de5 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -656,7 +656,7 @@ struct ath_hw_private_ops { @@ -40004,7 +40004,7 @@ index 57c01ab..8a05959 100644 /* diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c -index ef82a0d..78a026b 100644 +index fd38945..78a026b 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -634,7 +634,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m) @@ -40016,15 +40016,6 @@ index ef82a0d..78a026b 100644 { struct file *eventfp, *filep = NULL, *pollstart = NULL, *pollstop = NULL; -@@ -1076,7 +1076,7 @@ static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len, - } - _iov = iov + ret; - size = reg->memory_size - addr + reg->guest_phys_addr; -- _iov->iov_len = min((u64)len, size); -+ _iov->iov_len = min((u64)len - s, size); - _iov->iov_base = (void __user *)(unsigned long) - (reg->userspace_addr + addr - reg->guest_phys_addr); - s += size; diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 747442d..7c0c434 100644 --- a/drivers/video/aty/aty128fb.c @@ -46280,10 +46271,10 @@ index 90d901f..159975f 100644 } return 1; diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c -index cf18217..8f6b9c3 100644 +index 2f2e0da..89b113a 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c -@@ -498,8 +498,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, +@@ -505,8 +505,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, /* Hm, nope. Are (enough) root reserved clusters available? */ if (uid_eq(sbi->s_resuid, current_fsuid()) || (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) || @@ -46329,7 +46320,7 @@ index b686b43..4b46d01 100644 /* locality groups */ diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c -index b26410c..7383d90 100644 +index 24e5c78..a9e7619 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1746,7 +1746,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, @@ -48100,10 +48091,10 @@ index f4246cf..b4aed1d 100644 if (!ret) ret = -EPIPE; diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c -index 324bc08..4fdd56e 100644 +index 68cc9ef..ce0f6c0 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c -@@ -1226,7 +1226,7 @@ static char *read_link(struct dentry *dentry) +@@ -1233,7 +1233,7 @@ static char *read_link(struct dentry *dentry) return link; } @@ -49173,7 +49164,7 @@ index d355e6e..578d905 100644 enum ocfs2_local_alloc_state diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c -index f169da4..9112253 100644 +index b7e74b5..19c6536 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb, @@ -49185,7 +49176,7 @@ index f169da4..9112253 100644 /* You should never ask for this much metadata */ BUG_ON(bits_wanted > -@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle, +@@ -2007,7 +2007,7 @@ int ocfs2_claim_metadata(handle_t *handle, mlog_errno(status); goto bail; } @@ -49194,7 +49185,7 @@ index f169da4..9112253 100644 *suballoc_loc = res.sr_bg_blkno; *suballoc_bit_start = res.sr_bit_offset; -@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle, +@@ -2171,7 +2171,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle, trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno, res->sr_bits); @@ -49203,7 +49194,7 @@ index f169da4..9112253 100644 BUG_ON(res->sr_bits != 1); -@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle, +@@ -2213,7 +2213,7 @@ int ocfs2_claim_new_inode(handle_t *handle, mlog_errno(status); goto bail; } @@ -49212,7 +49203,7 @@ index f169da4..9112253 100644 BUG_ON(res.sr_bits != 1); -@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle, +@@ -2317,7 +2317,7 @@ int __ocfs2_claim_clusters(handle_t *handle, cluster_start, num_clusters); if (!status) @@ -49221,7 +49212,7 @@ index f169da4..9112253 100644 } else { if (min_clusters > (osb->bitmap_cpg - 1)) { /* The only paths asking for contiguousness -@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle, +@@ -2343,7 +2343,7 @@ int __ocfs2_claim_clusters(handle_t *handle, ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode, res.sr_bg_blkno, res.sr_bit_offset); @@ -67517,10 +67508,10 @@ index 493d972..ea17248 100644 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid); +} diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index 2c0d5d0..1b229f2 100644 +index 2cd3492..bda346c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5388,7 +5388,7 @@ static int cgroup_css_links_read(struct cgroup *cont, +@@ -5396,7 +5396,7 @@ static int cgroup_css_links_read(struct cgroup *cont, struct css_set *cg = link->cg; struct task_struct *task; int count = 0; @@ -69927,7 +69918,7 @@ index acbb79c..8d1adc5 100644 .clock_get = thread_cpu_clock_get, .timer_create = thread_cpu_timer_create, diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c -index 69185ae..cc2847a 100644 +index e885be1..380fe76 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -43,6 +43,7 @@ @@ -70010,7 +70001,7 @@ index 69185ae..cc2847a 100644 } static int common_timer_create(struct k_itimer *new_timer) -@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, +@@ -966,6 +967,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, if (copy_from_user(&new_tp, tp, sizeof (*tp))) return -EFAULT; @@ -71480,7 +71471,7 @@ index 87174ef..68cbb82 100644 EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c -index 65bdcf1..21eb831 100644 +index c2f6d47..26517d3 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file, @@ -71537,7 +71528,7 @@ index 65bdcf1..21eb831 100644 set_fs(old_fs); if (result < 0) goto out; -@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file, +@@ -1234,7 +1234,7 @@ static ssize_t bin_dn_node_address(struct file *file, le16_to_cpu(dnaddr) & 0x3ff); set_fs(KERNEL_DS); @@ -71799,7 +71790,7 @@ index c0bd030..62a1927 100644 ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index 7f8a8df..caa26f4 100644 +index 384699f..73238cb 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1785,12 +1785,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) diff --git a/main/linux-grsec/patch-3.6.11-al4.patch b/main/linux-grsec/patch-3.6.11-al5.patch index 70802f6815..54952a485b 100644 --- a/main/linux-grsec/patch-3.6.11-al4.patch +++ b/main/linux-grsec/patch-3.6.11-al5.patch @@ -1,3 +1,33 @@ +diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt +index ad7e2e5..15199ed 100644 +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -570,6 +570,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. + UART at the specified I/O port or MMIO address, + switching to the matching ttyS device later. The + options are the same as for ttyS, above. ++ hvc<n> Use the hypervisor console device <n>. This is for ++ both Xen and PowerPC hypervisors. + + If the device connected to the port is not a TTY but a braille + device, prepend "brl," before the device type, for instance +@@ -760,6 +762,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. + + earlyprintk= [X86,SH,BLACKFIN] + earlyprintk=vga ++ earlyprintk=xen + earlyprintk=serial[,ttySn[,baudrate]] + earlyprintk=ttySn[,baudrate] + earlyprintk=dbgp[debugController#] +@@ -777,6 +780,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. + The VGA output is eventually overwritten by the real + console. + ++ The xen output can only be used by Xen PV guests. ++ + ekgdboc= [X86,KGDB] Allow early kernel console debugging + ekgdboc=kbd + diff --git a/MAINTAINERS b/MAINTAINERS index 9a6c4da..61ed6f7 100644 --- a/MAINTAINERS @@ -999,6 +1029,91 @@ index 8f8e8ee..2a6919e 100644 jmp iret_exc 5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL +diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c +index 48d9d4e..992f442 100644 +--- a/arch/x86/kernel/head.c ++++ b/arch/x86/kernel/head.c +@@ -5,8 +5,6 @@ + #include <asm/setup.h> + #include <asm/bios_ebda.h> + +-#define BIOS_LOWMEM_KILOBYTES 0x413 +- + /* + * The BIOS places the EBDA/XBDA at the top of conventional + * memory, and usually decreases the reported amount of +@@ -16,17 +14,30 @@ + * chipset: reserve a page before VGA to prevent PCI prefetch + * into it (errata #56). Usually the page is reserved anyways, + * unless you have no PS/2 mouse plugged in. ++ * ++ * This functions is deliberately very conservative. Losing ++ * memory in the bottom megabyte is rarely a problem, as long ++ * as we have enough memory to install the trampoline. Using ++ * memory that is in use by the BIOS or by some DMA device ++ * the BIOS didn't shut down *is* a big problem. + */ ++ ++#define BIOS_LOWMEM_KILOBYTES 0x413 ++#define LOWMEM_CAP 0x9f000U /* Absolute maximum */ ++#define INSANE_CUTOFF 0x20000U /* Less than this = insane */ ++ + void __init reserve_ebda_region(void) + { + unsigned int lowmem, ebda_addr; + +- /* To determine the position of the EBDA and the */ +- /* end of conventional memory, we need to look at */ +- /* the BIOS data area. In a paravirtual environment */ +- /* that area is absent. We'll just have to assume */ +- /* that the paravirt case can handle memory setup */ +- /* correctly, without our help. */ ++ /* ++ * To determine the position of the EBDA and the ++ * end of conventional memory, we need to look at ++ * the BIOS data area. In a paravirtual environment ++ * that area is absent. We'll just have to assume ++ * that the paravirt case can handle memory setup ++ * correctly, without our help. ++ */ + if (paravirt_enabled()) + return; + +@@ -37,19 +48,23 @@ void __init reserve_ebda_region(void) + /* start of EBDA area */ + ebda_addr = get_bios_ebda(); + +- /* Fixup: bios puts an EBDA in the top 64K segment */ +- /* of conventional memory, but does not adjust lowmem. */ +- if ((lowmem - ebda_addr) <= 0x10000) +- lowmem = ebda_addr; ++ /* ++ * Note: some old Dells seem to need 4k EBDA without ++ * reporting so, so just consider the memory above 0x9f000 ++ * to be off limits (bugzilla 2990). ++ */ ++ ++ /* If the EBDA address is below 128K, assume it is bogus */ ++ if (ebda_addr < INSANE_CUTOFF) ++ ebda_addr = LOWMEM_CAP; + +- /* Fixup: bios does not report an EBDA at all. */ +- /* Some old Dells seem to need 4k anyhow (bugzilla 2990) */ +- if ((ebda_addr == 0) && (lowmem >= 0x9f000)) +- lowmem = 0x9f000; ++ /* If lowmem is less than 128K, assume it is bogus */ ++ if (lowmem < INSANE_CUTOFF) ++ lowmem = LOWMEM_CAP; + +- /* Paranoia: should never happen, but... */ +- if ((lowmem == 0) || (lowmem >= 0x100000)) +- lowmem = 0x9f000; ++ /* Use the lower of the lowmem and EBDA markers as the cutoff */ ++ lowmem = min(lowmem, ebda_addr); ++ lowmem = min(lowmem, LOWMEM_CAP); /* Absolute cap */ + + /* reserve all memory between lowmem and the 1MB mark */ + memblock_reserve(lowmem, 0x100000 - lowmem); diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index eb11369..8563b64 100644 --- a/arch/x86/kernel/msr.c @@ -1488,7 +1603,7 @@ index 7178c3a..ad86ec9 100644 void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt); diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c -index 72d8899..3705bb0 100644 +index 72d8899..1e40637 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -50,9 +50,6 @@ @@ -1501,7 +1616,7 @@ index 72d8899..3705bb0 100644 struct efi __read_mostly efi = { .mps = EFI_INVALID_TABLE_ADDR, .acpi = EFI_INVALID_TABLE_ADDR, -@@ -68,19 +65,28 @@ EXPORT_SYMBOL(efi); +@@ -68,19 +65,29 @@ EXPORT_SYMBOL(efi); struct efi_memory_map memmap; @@ -1527,14 +1642,15 @@ index 72d8899..3705bb0 100644 } +EXPORT_SYMBOL(efi_enabled); ++static bool disable_runtime = false; static int __init setup_noefi(char *arg) { - efi_enabled = 0; -+ clear_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility); ++ disable_runtime = true; return 0; } early_param("noefi", setup_noefi); -@@ -425,6 +431,7 @@ void __init efi_reserve_boot_services(void) +@@ -425,6 +432,7 @@ void __init efi_reserve_boot_services(void) void __init efi_unmap_memmap(void) { @@ -1542,7 +1658,7 @@ index 72d8899..3705bb0 100644 if (memmap.map) { early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size); memmap.map = NULL; -@@ -459,7 +466,7 @@ void __init efi_free_boot_services(void) +@@ -459,7 +467,7 @@ void __init efi_free_boot_services(void) static int __init efi_systab_init(void *phys) { @@ -1551,7 +1667,7 @@ index 72d8899..3705bb0 100644 efi_system_table_64_t *systab64; u64 tmp = 0; -@@ -551,7 +558,7 @@ static int __init efi_config_init(u64 tables, int nr_tables) +@@ -551,7 +559,7 @@ static int __init efi_config_init(u64 tables, int nr_tables) void *config_tables, *tablep; int i, sz; @@ -1560,7 +1676,7 @@ index 72d8899..3705bb0 100644 sz = sizeof(efi_config_table_64_t); else sz = sizeof(efi_config_table_32_t); -@@ -571,7 +578,7 @@ static int __init efi_config_init(u64 tables, int nr_tables) +@@ -571,7 +579,7 @@ static int __init efi_config_init(u64 tables, int nr_tables) efi_guid_t guid; unsigned long table; @@ -1569,7 +1685,7 @@ index 72d8899..3705bb0 100644 u64 table64; guid = ((efi_config_table_64_t *)tablep)->guid; table64 = ((efi_config_table_64_t *)tablep)->table; -@@ -683,7 +690,6 @@ void __init efi_init(void) +@@ -683,7 +691,6 @@ void __init efi_init(void) if (boot_params.efi_info.efi_systab_hi || boot_params.efi_info.efi_memmap_hi) { pr_info("Table located above 4GB, disabling EFI.\n"); @@ -1577,7 +1693,7 @@ index 72d8899..3705bb0 100644 return; } efi_phys.systab = (efi_system_table_t *)boot_params.efi_info.efi_systab; -@@ -693,10 +699,10 @@ void __init efi_init(void) +@@ -693,10 +700,10 @@ void __init efi_init(void) ((__u64)boot_params.efi_info.efi_systab_hi<<32)); #endif @@ -1591,7 +1707,7 @@ index 72d8899..3705bb0 100644 /* * Show what we know for posterity -@@ -714,10 +720,10 @@ void __init efi_init(void) +@@ -714,10 +721,10 @@ void __init efi_init(void) efi.systab->hdr.revision >> 16, efi.systab->hdr.revision & 0xffff, vendor); @@ -1605,7 +1721,7 @@ index 72d8899..3705bb0 100644 /* * Note: We currently don't support runtime services on an EFI -@@ -726,15 +732,17 @@ void __init efi_init(void) +@@ -726,15 +733,17 @@ void __init efi_init(void) if (!efi_is_native()) pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n"); @@ -1613,7 +1729,7 @@ index 72d8899..3705bb0 100644 - efi_enabled = 0; - return; + else { -+ if (efi_runtime_init()) ++ if (disable_runtime || efi_runtime_init()) + return; + set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility); } @@ -1629,7 +1745,7 @@ index 72d8899..3705bb0 100644 #ifdef CONFIG_X86_32 if (efi_is_native()) { x86_platform.get_wallclock = efi_get_time; -@@ -900,7 +908,7 @@ void __init efi_enter_virtual_mode(void) +@@ -900,7 +909,7 @@ void __init efi_enter_virtual_mode(void) * * Call EFI services through wrapper functions. */ @@ -1638,7 +1754,7 @@ index 72d8899..3705bb0 100644 efi.get_time = virt_efi_get_time; efi.set_time = virt_efi_set_time; efi.get_wakeup_time = virt_efi_get_wakeup_time; -@@ -943,6 +951,9 @@ u64 efi_mem_attributes(unsigned long phys_addr) +@@ -943,6 +952,9 @@ u64 efi_mem_attributes(unsigned long phys_addr) efi_memory_desc_t *md; void *p; @@ -1766,6 +1882,76 @@ index f9643fc..33ca6e4 100644 1: popl %eax +diff --git a/block/genhd.c b/block/genhd.c +index d839723..6c9a4e8 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -25,7 +25,7 @@ static DEFINE_MUTEX(block_class_lock); + struct kobject *block_depr; + + /* for extended dynamic devt allocation, currently only one major is used */ +-#define MAX_EXT_DEVT (1 << MINORBITS) ++#define NR_EXT_DEVT (1 << MINORBITS) + + /* For extended devt allocation. ext_devt_mutex prevents look up + * results from going away underneath its user. +@@ -420,17 +420,18 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt) + do { + if (!idr_pre_get(&ext_devt_idr, GFP_KERNEL)) + return -ENOMEM; ++ mutex_lock(&ext_devt_mutex); + rc = idr_get_new(&ext_devt_idr, part, &idx); ++ if (!rc && idx >= NR_EXT_DEVT) { ++ idr_remove(&ext_devt_idr, idx); ++ rc = -EBUSY; ++ } ++ mutex_unlock(&ext_devt_mutex); + } while (rc == -EAGAIN); + + if (rc) + return rc; + +- if (idx > MAX_EXT_DEVT) { +- idr_remove(&ext_devt_idr, idx); +- return -EBUSY; +- } +- + *devt = MKDEV(BLOCK_EXT_MAJOR, blk_mangle_minor(idx)); + return 0; + } +@@ -644,7 +645,6 @@ void del_gendisk(struct gendisk *disk) + disk_part_iter_exit(&piter); + + invalidate_partition(disk, 0); +- blk_free_devt(disk_to_dev(disk)->devt); + set_capacity(disk, 0); + disk->flags &= ~GENHD_FL_UP; + +@@ -662,6 +662,7 @@ void del_gendisk(struct gendisk *disk) + if (!sysfs_deprecated) + sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); + device_del(disk_to_dev(disk)); ++ blk_free_devt(disk_to_dev(disk)->devt); + } + EXPORT_SYMBOL(del_gendisk); + +diff --git a/block/partition-generic.c b/block/partition-generic.c +index f1d1451..1cb4dec 100644 +--- a/block/partition-generic.c ++++ b/block/partition-generic.c +@@ -249,11 +249,11 @@ void delete_partition(struct gendisk *disk, int partno) + if (!part) + return; + +- blk_free_devt(part_devt(part)); + rcu_assign_pointer(ptbl->part[partno], NULL); + rcu_assign_pointer(ptbl->last_lookup, NULL); + kobject_put(part->holder_dir); + device_del(part_to_dev(part)); ++ blk_free_devt(part_devt(part)); + + hd_struct_put(part); + } diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 9eaf708..251435a 100644 --- a/drivers/acpi/osl.c @@ -1837,10 +2023,10 @@ index d1ecca2..f1fcaca 100644 acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */ strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c -index 847ed55..813aa38 100644 +index 847ed55..b38787b 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c -@@ -109,6 +109,180 @@ void __init acpi_old_suspend_ordering(void) +@@ -109,6 +109,188 @@ void __init acpi_old_suspend_ordering(void) old_suspend_ordering = true; } @@ -1892,6 +2078,14 @@ index 847ed55..813aa38 100644 + }, + { + .callback = init_nvs_nosave, ++ .ident = "Sony Vaio VGN-FW41E_H", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW41E_H"), ++ }, ++ }, ++ { ++ .callback = init_nvs_nosave, + .ident = "Sony Vaio VGN-FW21E", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), @@ -2021,7 +2215,7 @@ index 847ed55..813aa38 100644 /** * acpi_pm_freeze - Disable the GPEs and suspend EC transactions. */ -@@ -224,6 +398,7 @@ static void acpi_pm_end(void) +@@ -224,6 +406,7 @@ static void acpi_pm_end(void) } #else /* !CONFIG_ACPI_SLEEP */ #define acpi_target_sleep_state ACPI_STATE_S0 @@ -2029,7 +2223,7 @@ index 847ed55..813aa38 100644 #endif /* CONFIG_ACPI_SLEEP */ #ifdef CONFIG_SUSPEND -@@ -382,175 +557,6 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = { +@@ -382,175 +565,6 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = { .end = acpi_pm_end, .recover = acpi_pm_finish, }; @@ -2205,7 +2399,7 @@ index 847ed55..813aa38 100644 #endif /* CONFIG_SUSPEND */ #ifdef CONFIG_HIBERNATION -@@ -881,13 +887,13 @@ int __init acpi_sleep_init(void) +@@ -881,13 +895,13 @@ int __init acpi_sleep_init(void) u8 type_a, type_b; #ifdef CONFIG_SUSPEND int i = 0; @@ -2256,6 +2450,34 @@ index 7862d17..4979127 100644 /* acquire resources */ rc = pcim_enable_device(pdev); +diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c +index ef773e1..4cb6096 100644 +--- a/drivers/ata/ata_piix.c ++++ b/drivers/ata/ata_piix.c +@@ -339,6 +339,23 @@ static const struct pci_device_id piix_pci_tbl[] = { + { 0x8086, 0x9c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + /* SATA Controller IDE (DH89xxCC) */ + { 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, ++ /* SATA Controller IDE (Avoton) */ ++ { 0x8086, 0x1f20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, ++ /* SATA Controller IDE (Avoton) */ ++ { 0x8086, 0x1f21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, ++ /* SATA Controller IDE (Avoton) */ ++ { 0x8086, 0x1f30, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, ++ /* SATA Controller IDE (Avoton) */ ++ { 0x8086, 0x1f31, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, ++ /* SATA Controller IDE (Wellsburg) */ ++ { 0x8086, 0x8d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, ++ /* SATA Controller IDE (Wellsburg) */ ++ { 0x8086, 0x8d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, ++ /* SATA Controller IDE (Wellsburg) */ ++ { 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, ++ /* SATA Controller IDE (Wellsburg) */ ++ { 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, ++ + { } /* terminate list */ + }; + diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 8e1039c..8789aef 100644 --- a/drivers/ata/libata-core.c @@ -2819,6 +3041,108 @@ index 9dcf76a..31dd451 100644 return -EOPNOTSUPP; switch (op) { +diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c +index c6decb9..73d8c92 100644 +--- a/drivers/block/xen-blkback/blkback.c ++++ b/drivers/block/xen-blkback/blkback.c +@@ -623,7 +623,6 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif, + goto fail_response; + } + +- preq.dev = req->u.rw.handle; + preq.sector_number = req->u.rw.sector_number; + preq.nr_sects = 0; + +diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c +index 4f66171..a155254 100644 +--- a/drivers/block/xen-blkback/xenbus.c ++++ b/drivers/block/xen-blkback/xenbus.c +@@ -367,6 +367,7 @@ static int xen_blkbk_remove(struct xenbus_device *dev) + be->blkif = NULL; + } + ++ kfree(be->mode); + kfree(be); + dev_set_drvdata(&dev->dev, NULL); + return 0; +@@ -502,6 +503,7 @@ static void backend_changed(struct xenbus_watch *watch, + = container_of(watch, struct backend_info, backend_watch); + struct xenbus_device *dev = be->dev; + int cdrom = 0; ++ unsigned long handle; + char *device_type; + + DPRINTK(""); +@@ -521,10 +523,10 @@ static void backend_changed(struct xenbus_watch *watch, + return; + } + +- if ((be->major || be->minor) && +- ((be->major != major) || (be->minor != minor))) { +- pr_warn(DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n", +- be->major, be->minor, major, minor); ++ if (be->major | be->minor) { ++ if (be->major != major || be->minor != minor) ++ pr_warn(DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n", ++ be->major, be->minor, major, minor); + return; + } + +@@ -542,36 +544,33 @@ static void backend_changed(struct xenbus_watch *watch, + kfree(device_type); + } + +- if (be->major == 0 && be->minor == 0) { +- /* Front end dir is a number, which is used as the handle. */ +- +- char *p = strrchr(dev->otherend, '/') + 1; +- long handle; +- err = strict_strtoul(p, 0, &handle); +- if (err) +- return; ++ /* Front end dir is a number, which is used as the handle. */ ++ err = strict_strtoul(strrchr(dev->otherend, '/') + 1, 0, &handle); ++ if (err) ++ return; + +- be->major = major; +- be->minor = minor; ++ be->major = major; ++ be->minor = minor; + +- err = xen_vbd_create(be->blkif, handle, major, minor, +- (NULL == strchr(be->mode, 'w')), cdrom); +- if (err) { +- be->major = 0; +- be->minor = 0; +- xenbus_dev_fatal(dev, err, "creating vbd structure"); +- return; +- } ++ err = xen_vbd_create(be->blkif, handle, major, minor, ++ !strchr(be->mode, 'w'), cdrom); + ++ if (err) ++ xenbus_dev_fatal(dev, err, "creating vbd structure"); ++ else { + err = xenvbd_sysfs_addif(dev); + if (err) { + xen_vbd_free(&be->blkif->vbd); +- be->major = 0; +- be->minor = 0; + xenbus_dev_fatal(dev, err, "creating sysfs entries"); +- return; + } ++ } + ++ if (err) { ++ kfree(be->mode); ++ be->mode = NULL; ++ be->major = 0; ++ be->minor = 0; ++ } else { + /* We're potentially connected now */ + xen_update_blkif_status(be->blkif); + } diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index fc2de55..b00000e 100644 --- a/drivers/bluetooth/ath3k.c @@ -2899,6 +3223,21 @@ index e164c55..1bfb207 100644 return edac_pci_dev->store(edac_pci_dev->value, buffer, count); return -EIO; } +diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c +index 7a05fd2..841c78d 100644 +--- a/drivers/firewire/core-device.c ++++ b/drivers/firewire/core-device.c +@@ -1019,6 +1019,10 @@ static void fw_device_init(struct work_struct *work) + ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? + idr_get_new(&fw_device_idr, device, &minor) : + -ENOMEM; ++ if (minor >= 1 << MINORBITS) { ++ idr_remove(&fw_device_idr, minor); ++ minor = -ENOSPC; ++ } + up_write(&fw_device_rwsem); + + if (ret < 0) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 08c6749..638e1f7 100644 --- a/drivers/firewire/net.c @@ -3889,7 +4228,7 @@ index 6f6ca50..c9df873 100644 ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs); drm_helper_mode_fill_fb_struct(&ufb->base, mode_cmd); diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 5de3bb3..10ef742 100644 +index 5de3bb3..545eab4 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1528,6 +1528,7 @@ static const struct hid_device_id hid_have_special_driver[] = { @@ -3900,11 +4239,29 @@ index 5de3bb3..10ef742 100644 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, +@@ -2025,6 +2026,7 @@ static const struct hid_device_id hid_ignore_list[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_MASTERKIT, USB_DEVICE_ID_MASTERKIT_MA901RADIO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index ab8ce9f..2a3f007 100644 +index ab8ce9f..1c8d114 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -681,6 +681,9 @@ +@@ -536,6 +536,9 @@ + #define USB_VENDOR_ID_MADCATZ 0x0738 + #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 + ++#define USB_VENDOR_ID_MASTERKIT 0x16c0 ++#define USB_DEVICE_ID_MASTERKIT_MA901RADIO 0x05df ++ + #define USB_VENDOR_ID_MCC 0x09db + #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 + #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a +@@ -681,6 +684,9 @@ #define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f #define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002 @@ -4152,7 +4509,7 @@ index d6cc77a..5f306f7 100644 return retval; diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c -index 18a89b7..e69ece6 100644 +index 18a89b7..2a5e8dd 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -906,6 +906,38 @@ static void __init free_iommu_all(void) @@ -4203,6 +4560,18 @@ index 18a89b7..e69ece6 100644 return pci_enable_device(iommu->dev); } +@@ -1667,6 +1701,11 @@ static int amd_iommu_init_dma(void) + if (ret) + return ret; + ++ init_device_table_dma(); ++ ++ for_each_iommu(iommu) ++ iommu_flush_all_caches(iommu); ++ + amd_iommu_init_api(); + + amd_iommu_init_notifier(); diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 554e6ac..16dc458 100644 --- a/drivers/iommu/intel-iommu.c @@ -4730,6 +5099,22 @@ index d12b2cc..371f3d4 100644 struct dm_btree_value_type le64_type; le64_type.context = NULL; +diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c +index cabc19c..cec1f8c 100644 +--- a/drivers/media/rc/rc-main.c ++++ b/drivers/media/rc/rc-main.c +@@ -778,8 +778,10 @@ static ssize_t show_protocols(struct device *device, + } else if (dev->raw) { + enabled = dev->raw->enabled_protocols; + allowed = ir_raw_get_allowed_protocols(); +- } else ++ } else { ++ mutex_unlock(&dev->lock); + return -ENODEV; ++ } + + IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n", + (long long)allowed, diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index f8b7771..7604f4e 100644 --- a/drivers/mfd/mfd-core.c @@ -5655,6 +6040,19 @@ index 6f7cf49..262e1e0 100644 {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000}, {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4}, {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001}, +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c +index 84b558d..678854a 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c +@@ -903,6 +903,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, + AR_PHY_CL_TAB_1, + AR_PHY_CL_TAB_2 }; + ++ ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask); ++ + if (rtt) { + if (!ar9003_hw_rtt_restore(ah, chan)) + run_rtt_cal = true; diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h index 3a1ff55..a633aea 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h @@ -5676,6 +6074,19 @@ index 3a1ff55..a633aea 100644 enum targetPowerHTRates { HT_TARGET_RATE_0_8_16, +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c +index e476f9f..6b23a50 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c +@@ -533,7 +533,7 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, + ath9k_hw_synth_delay(ah, chan, synthDelay); + } + +-static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) ++void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) + { + switch (rx) { + case 0x5: diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 1b48414..4527d0d 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c @@ -5727,6 +6138,18 @@ index 4a9570d..aac4a40 100644 } } +diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h +index de6968f..c59edc7 100644 +--- a/drivers/net/wireless/ath/ath9k/hw.h ++++ b/drivers/net/wireless/ath/ath9k/hw.h +@@ -1060,6 +1060,7 @@ int ar9003_paprd_create_curve(struct ath_hw *ah, + int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain); + int ar9003_paprd_init_table(struct ath_hw *ah); + bool ar9003_paprd_is_done(struct ath_hw *ah); ++void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx); + + /* Hardware family op attach helpers */ + void ar5008_hw_attach_phy_ops(struct ath_hw *ah); diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 4480c0c..6b12d48 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c @@ -7218,6 +7641,32 @@ index e49871d..3c5c353 100644 return 0 static int __init ispnpidacpi(const char *id) { +diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c +index bba3cca..8e3329e 100644 +--- a/drivers/power/ab8500_btemp.c ++++ b/drivers/power/ab8500_btemp.c +@@ -1119,7 +1119,7 @@ static void __exit ab8500_btemp_exit(void) + platform_driver_unregister(&ab8500_btemp_driver); + } + +-subsys_initcall_sync(ab8500_btemp_init); ++device_initcall(ab8500_btemp_init); + module_exit(ab8500_btemp_exit); + + MODULE_LICENSE("GPL v2"); +diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c +index 804b88c..d8cd151 100644 +--- a/drivers/power/abx500_chargalg.c ++++ b/drivers/power/abx500_chargalg.c +@@ -1698,7 +1698,7 @@ static ssize_t abx500_chargalg_sysfs_charger(struct kobject *kobj, + static struct attribute abx500_chargalg_en_charger = \ + { + .name = "chargalg", +- .mode = S_IWUGO, ++ .mode = S_IWUSR, + }; + + static struct attribute *abx500_chargalg_chg[] = { diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 7413885..d4b9b1e 100644 --- a/drivers/regulator/wm831x-dcdc.c @@ -7578,7 +8027,7 @@ index 6cee785..2701546 100644 ---help--- Enable support for National Instruments AT-A2150 cards diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c -index 41dea18..da45902 100644 +index 41dea18..2bbf288 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1545,8 +1545,16 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd, @@ -7598,6 +8047,42 @@ index 41dea18..da45902 100644 goto done; } +@@ -1769,7 +1777,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait) + + mask = 0; + read_subdev = comedi_get_read_subdevice(dev_file_info); +- if (read_subdev) { ++ if (read_subdev && read_subdev->async) { + poll_wait(file, &read_subdev->async->wait_head, wait); + if (!read_subdev->busy + || comedi_buf_read_n_available(read_subdev->async) > 0 +@@ -1779,7 +1787,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait) + } + } + write_subdev = comedi_get_write_subdevice(dev_file_info); +- if (write_subdev) { ++ if (write_subdev && write_subdev->async) { + poll_wait(file, &write_subdev->async->wait_head, wait); + comedi_buf_write_alloc(write_subdev->async, + write_subdev->async->prealloc_bufsz); +@@ -1821,7 +1829,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, + } + + s = comedi_get_write_subdevice(dev_file_info); +- if (s == NULL) { ++ if (s == NULL || s->async == NULL) { + retval = -EIO; + goto done; + } +@@ -1932,7 +1940,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, + } + + s = comedi_get_read_subdevice(dev_file_info); +- if (s == NULL) { ++ if (s == NULL || s->async == NULL) { + retval = -EIO; + goto done; + } diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index 523a809..e38bd64 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c @@ -7611,6 +8096,66 @@ index 523a809..e38bd64 100644 return 0; } +diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c +index d3a1d65..ac0fbd7 100644 +--- a/drivers/staging/comedi/drivers/ni_labpc.c ++++ b/drivers/staging/comedi/drivers/ni_labpc.c +@@ -1263,7 +1263,9 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) + else + channel = CR_CHAN(cmd->chanlist[0]); + /* munge channel bits for differential / scan disabled mode */ +- if (labpc_ai_scan_mode(cmd) != MODE_SINGLE_CHAN && aref == AREF_DIFF) ++ if ((labpc_ai_scan_mode(cmd) == MODE_SINGLE_CHAN || ++ labpc_ai_scan_mode(cmd) == MODE_SINGLE_CHAN_INTERVAL) && ++ aref == AREF_DIFF) + channel *= 2; + devpriv->command1_bits |= ADC_CHAN_BITS(channel); + devpriv->command1_bits |= thisboard->ai_range_code[range]; +@@ -1279,21 +1281,6 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) + devpriv->write_byte(devpriv->command1_bits, + dev->iobase + COMMAND1_REG); + } +- /* setup any external triggering/pacing (command4 register) */ +- devpriv->command4_bits = 0; +- if (cmd->convert_src != TRIG_EXT) +- devpriv->command4_bits |= EXT_CONVERT_DISABLE_BIT; +- /* XXX should discard first scan when using interval scanning +- * since manual says it is not synced with scan clock */ +- if (labpc_use_continuous_mode(cmd) == 0) { +- devpriv->command4_bits |= INTERVAL_SCAN_EN_BIT; +- if (cmd->scan_begin_src == TRIG_EXT) +- devpriv->command4_bits |= EXT_SCAN_EN_BIT; +- } +- /* single-ended/differential */ +- if (aref == AREF_DIFF) +- devpriv->command4_bits |= ADC_DIFF_BIT; +- devpriv->write_byte(devpriv->command4_bits, dev->iobase + COMMAND4_REG); + + devpriv->write_byte(cmd->chanlist_len, + dev->iobase + INTERVAL_COUNT_REG); +@@ -1373,6 +1360,22 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) + devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT; + devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); + ++ /* setup any external triggering/pacing (command4 register) */ ++ devpriv->command4_bits = 0; ++ if (cmd->convert_src != TRIG_EXT) ++ devpriv->command4_bits |= EXT_CONVERT_DISABLE_BIT; ++ /* XXX should discard first scan when using interval scanning ++ * since manual says it is not synced with scan clock */ ++ if (labpc_use_continuous_mode(cmd) == 0) { ++ devpriv->command4_bits |= INTERVAL_SCAN_EN_BIT; ++ if (cmd->scan_begin_src == TRIG_EXT) ++ devpriv->command4_bits |= EXT_SCAN_EN_BIT; ++ } ++ /* single-ended/differential */ ++ if (aref == AREF_DIFF) ++ devpriv->command4_bits |= ADC_DIFF_BIT; ++ devpriv->write_byte(devpriv->command4_bits, dev->iobase + COMMAND4_REG); ++ + /* startup acquisition */ + + /* command2 reg */ diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 89f4d43..af5007c 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c @@ -8433,7 +8978,7 @@ index 6b6f50a..5bafd2d 100644 iscsit_dec_conn_usage_count(conn_p); return; diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c -index 68d4c10..f535c50 100644 +index 68d4c10..7f9136e 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -1193,6 +1193,8 @@ int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth) @@ -8459,7 +9004,44 @@ index 68d4c10..f535c50 100644 dev->se_sub_dev->se_dev_attrib.fabric_max_sectors = fabric_max_sectors; pr_debug("dev[%p]: SE Device max_sectors changed to %u\n", -@@ -1622,6 +1628,7 @@ int core_dev_setup_virtual_lun0(void) +@@ -1434,24 +1440,18 @@ static struct se_lun *core_dev_get_lun(struct se_portal_group *tpg, u32 unpacked + + struct se_lun_acl *core_dev_init_initiator_node_lun_acl( + struct se_portal_group *tpg, ++ struct se_node_acl *nacl, + u32 mapped_lun, +- char *initiatorname, + int *ret) + { + struct se_lun_acl *lacl; +- struct se_node_acl *nacl; + +- if (strlen(initiatorname) >= TRANSPORT_IQN_LEN) { ++ if (strlen(nacl->initiatorname) >= TRANSPORT_IQN_LEN) { + pr_err("%s InitiatorName exceeds maximum size.\n", + tpg->se_tpg_tfo->get_fabric_name()); + *ret = -EOVERFLOW; + return NULL; + } +- nacl = core_tpg_get_initiator_node_acl(tpg, initiatorname); +- if (!nacl) { +- *ret = -EINVAL; +- return NULL; +- } + lacl = kzalloc(sizeof(struct se_lun_acl), GFP_KERNEL); + if (!lacl) { + pr_err("Unable to allocate memory for struct se_lun_acl.\n"); +@@ -1462,7 +1462,8 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl( + INIT_LIST_HEAD(&lacl->lacl_list); + lacl->mapped_lun = mapped_lun; + lacl->se_lun_nacl = nacl; +- snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s", initiatorname); ++ snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s", ++ nacl->initiatorname); + + return lacl; + } +@@ -1622,6 +1623,7 @@ int core_dev_setup_virtual_lun0(void) ret = PTR_ERR(dev); goto out; } @@ -8468,7 +9050,7 @@ index 68d4c10..f535c50 100644 g_lun0_dev = dev; diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c -index ea479e5..c0dd776 100644 +index ea479e5..f06b130 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c @@ -72,6 +72,12 @@ static int target_fabric_mappedlun_link( @@ -8484,7 +9066,27 @@ index ea479e5..c0dd776 100644 /* * Ensure that the source port exists */ -@@ -763,6 +769,11 @@ static int target_fabric_port_link( +@@ -350,9 +356,17 @@ static struct config_group *target_fabric_make_mappedlun( + ret = -EINVAL; + goto out; + } ++ if (mapped_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) { ++ pr_err("Mapped LUN: %lu exceeds TRANSPORT_MAX_LUNS_PER_TPG" ++ "-1: %u for Target Portal Group: %u\n", mapped_lun, ++ TRANSPORT_MAX_LUNS_PER_TPG-1, ++ se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg)); ++ ret = -EINVAL; ++ goto out; ++ } + +- lacl = core_dev_init_initiator_node_lun_acl(se_tpg, mapped_lun, +- config_item_name(acl_ci), &ret); ++ lacl = core_dev_init_initiator_node_lun_acl(se_tpg, se_nacl, ++ mapped_lun, &ret); + if (!lacl) { + ret = -EINVAL; + goto out; +@@ -763,6 +777,11 @@ static int target_fabric_port_link( ret = -ENODEV; goto out; } @@ -8496,11 +9098,43 @@ index ea479e5..c0dd776 100644 lun_p = core_dev_add_lun(se_tpg, dev, lun->unpacked_lun); if (IS_ERR(lun_p)) { +diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h +index 0fd4282..e102488 100644 +--- a/drivers/target/target_core_internal.h ++++ b/drivers/target/target_core_internal.h +@@ -51,7 +51,7 @@ struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_device *, u3 + int core_dev_del_lun(struct se_portal_group *, u32); + struct se_lun *core_get_lun_from_tpg(struct se_portal_group *, u32); + struct se_lun_acl *core_dev_init_initiator_node_lun_acl(struct se_portal_group *, +- u32, char *, int *); ++ struct se_node_acl *, u32, int *); + int core_dev_add_initiator_node_lun_acl(struct se_portal_group *, + struct se_lun_acl *, u32, u32); + int core_dev_del_initiator_node_lun_acl(struct se_portal_group *, diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c -index b8628a5..8dfe6f5 100644 +index b8628a5..ee5000c 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c -@@ -672,6 +672,7 @@ int core_tpg_register( +@@ -114,16 +114,10 @@ struct se_node_acl *core_tpg_get_initiator_node_acl( + struct se_node_acl *acl; + + spin_lock_irq(&tpg->acl_node_lock); +- list_for_each_entry(acl, &tpg->acl_node_list, acl_list) { +- if (!strcmp(acl->initiatorname, initiatorname) && +- !acl->dynamic_node_acl) { +- spin_unlock_irq(&tpg->acl_node_lock); +- return acl; +- } +- } ++ acl = __core_tpg_get_initiator_node_acl(tpg, initiatorname); + spin_unlock_irq(&tpg->acl_node_lock); + +- return NULL; ++ return acl; + } + + /* core_tpg_add_node_to_devs(): +@@ -672,6 +666,7 @@ int core_tpg_register( for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) { lun = se_tpg->tpg_lun_list[i]; lun->unpacked_lun = i; @@ -11109,6 +11743,19 @@ index b969279..a9b5f2e 100644 /* +diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c +index ef82a0d..fd38945 100644 +--- a/drivers/vhost/vhost.c ++++ b/drivers/vhost/vhost.c +@@ -1076,7 +1076,7 @@ static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len, + } + _iov = iov + ret; + size = reg->memory_size - addr + reg->guest_phys_addr; +- _iov->iov_len = min((u64)len, size); ++ _iov->iov_len = min((u64)len - s, size); + _iov->iov_base = (void __user *)(unsigned long) + (reg->userspace_addr + addr - reg->guest_phys_addr); + s += size; diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c index 77d1fdb..716daaa 100644 --- a/drivers/video/backlight/adp8860_bl.c @@ -11871,6 +12518,21 @@ index ce5cbd7..210fce2 100644 goto compose_mount_options_out; } +diff --git a/fs/direct-io.c b/fs/direct-io.c +index f86c720..9202248 100644 +--- a/fs/direct-io.c ++++ b/fs/direct-io.c +@@ -261,9 +261,9 @@ static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, bool is + dio->end_io(dio->iocb, offset, transferred, + dio->private, ret, is_async); + } else { ++ inode_dio_done(dio->inode); + if (is_async) + aio_complete(dio->iocb, ret, 0); +- inode_dio_done(dio->inode); + } + + return ret; diff --git a/fs/eventpoll.c b/fs/eventpoll.c index eedec84..3b032dd 100644 --- a/fs/eventpoll.c @@ -11957,6 +12619,47 @@ index a5c29bb..8535c45 100644 error = ext4_set_acl(handle, inode, type, acl); ext4_journal_stop(handle); if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) +diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c +index cf18217..2f2e0da 100644 +--- a/fs/ext4/balloc.c ++++ b/fs/ext4/balloc.c +@@ -358,7 +358,7 @@ void ext4_validate_block_bitmap(struct super_block *sb, + } + + /** +- * ext4_read_block_bitmap() ++ * ext4_read_block_bitmap_nowait() + * @sb: super block + * @block_group: given block group + * +@@ -457,6 +457,8 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) + struct buffer_head *bh; + + bh = ext4_read_block_bitmap_nowait(sb, block_group); ++ if (!bh) ++ return NULL; + if (ext4_wait_block_bitmap(sb, block_group, bh)) { + put_bh(bh); + return NULL; +@@ -482,11 +484,16 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, + + free_clusters = percpu_counter_read_positive(fcc); + dirty_clusters = percpu_counter_read_positive(dcc); +- root_clusters = EXT4_B2C(sbi, ext4_r_blocks_count(sbi->s_es)); ++ ++ /* ++ * r_blocks_count should always be multiple of the cluster ratio so ++ * we are safe to do a plane bit shift only. ++ */ ++ root_clusters = ext4_r_blocks_count(sbi->s_es) >> sbi->s_cluster_bits; + + if (free_clusters - (nclusters + root_clusters + dirty_clusters) < + EXT4_FREECLUSTERS_WATERMARK) { +- free_clusters = EXT4_C2B(sbi, percpu_counter_sum_positive(fcc)); ++ free_clusters = percpu_counter_sum_positive(fcc); + dirty_clusters = percpu_counter_sum_positive(dcc); + } + /* Check whether we have space after accounting for current diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 741bb94..31be24d 100644 --- a/fs/ext4/extents.c @@ -12049,6 +12752,34 @@ index 2ce16af..7e424eb 100644 while (index <= end) { nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE); if (nr_pages == 0) +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index b26410c..24e5c78 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -4128,7 +4128,7 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac) + /* The max size of hash table is PREALLOC_TB_SIZE */ + order = PREALLOC_TB_SIZE - 1; + /* Add the prealloc space to lg */ +- rcu_read_lock(); ++ spin_lock(&lg->lg_prealloc_lock); + list_for_each_entry_rcu(tmp_pa, &lg->lg_prealloc_list[order], + pa_inode_list) { + spin_lock(&tmp_pa->pa_lock); +@@ -4152,12 +4152,12 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac) + if (!added) + list_add_tail_rcu(&pa->pa_inode_list, + &lg->lg_prealloc_list[order]); +- rcu_read_unlock(); ++ spin_unlock(&lg->lg_prealloc_lock); + + /* Now trim the list to be not more than 8 elements */ + if (lg_prealloc_count > 8) { + ext4_mb_discard_lg_preallocations(sb, lg, +- order, lg_prealloc_count); ++ order, lg_prealloc_count); + return; + } + return ; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2b5fb60..f4665ec 100644 --- a/fs/ext4/super.c @@ -12123,6 +12854,58 @@ index 2b5fb60..f4665ec 100644 ext4_commit_super(sb, 1); unlock_super(sb); +diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c +index 2cdb98d..f039941 100644 +--- a/fs/ext4/xattr.c ++++ b/fs/ext4/xattr.c +@@ -554,7 +554,7 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode, + error = ext4_handle_dirty_xattr_block(handle, inode, bh); + if (IS_SYNC(inode)) + ext4_handle_sync(handle); +- dquot_free_block(inode, 1); ++ dquot_free_block(inode, EXT4_C2B(EXT4_SB(inode->i_sb), 1)); + ea_bdebug(bh, "refcount now=%d; releasing", + le32_to_cpu(BHDR(bh)->h_refcount)); + } +@@ -843,7 +843,8 @@ inserted: + else { + /* The old block is released after updating + the inode. */ +- error = dquot_alloc_block(inode, 1); ++ error = dquot_alloc_block(inode, ++ EXT4_C2B(EXT4_SB(sb), 1)); + if (error) + goto cleanup; + error = ext4_journal_get_write_access(handle, +@@ -939,7 +940,7 @@ cleanup: + return error; + + cleanup_dquot: +- dquot_free_block(inode, 1); ++ dquot_free_block(inode, EXT4_C2B(EXT4_SB(sb), 1)); + goto cleanup; + + bad_block: +diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c +index 324bc08..68cc9ef 100644 +--- a/fs/fuse/dir.c ++++ b/fs/fuse/dir.c +@@ -682,7 +682,14 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry) + + spin_lock(&fc->lock); + fi->attr_version = ++fc->attr_version; +- drop_nlink(inode); ++ /* ++ * If i_nlink == 0 then unlink doesn't make sense, yet this can ++ * happen if userspace filesystem is careless. It would be ++ * difficult to enforce correct nlink usage so just ignore this ++ * condition here ++ */ ++ if (inode->i_nlink > 0) ++ drop_nlink(inode); + spin_unlock(&fc->lock); + fuse_invalidate_attr(inode); + fuse_invalidate_attr(dir); diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index fb1ab953..2fb20f5 100644 --- a/fs/jbd2/transaction.c @@ -12389,10 +13172,19 @@ index c9c1c0a..ac784eb 100644 fh_dup2(current_fh, resfh); out: diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c -index 5b3224c..0953c6c 100644 +index 5b3224c..b271e9d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c -@@ -2341,7 +2341,7 @@ nfsd4_init_slabs(void) +@@ -1098,6 +1098,8 @@ free_client(struct nfs4_client *clp) + } + free_svc_cred(&clp->cl_cred); + kfree(clp->cl_name.data); ++ idr_remove_all(&clp->cl_stateids); ++ idr_destroy(&clp->cl_stateids); + kfree(clp); + } + +@@ -2341,7 +2343,7 @@ nfsd4_init_slabs(void) if (openowner_slab == NULL) goto out_nomem; lockowner_slab = kmem_cache_create("nfsd4_lockowners", @@ -12519,6 +13311,21 @@ index 8445fbc..6f292dd 100644 tmp_i_mark = kmem_cache_alloc(inotify_inode_mark_cachep, GFP_KERNEL); if (unlikely(!tmp_i_mark)) +diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c +index 6577432..340bd02 100644 +--- a/fs/ocfs2/aops.c ++++ b/fs/ocfs2/aops.c +@@ -593,9 +593,9 @@ static void ocfs2_dio_end_io(struct kiocb *iocb, + level = ocfs2_iocb_rw_locked_level(iocb); + ocfs2_rw_unlock(inode, level); + ++ inode_dio_done(inode); + if (is_async) + aio_complete(iocb, ret, 0); +- inode_dio_done(inode); + } + + /* diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 4f7795f..88577eb 100644 --- a/fs/ocfs2/dlmglue.c @@ -12543,6 +13350,132 @@ index 4f7795f..88577eb 100644 ocfs2_track_lock_refresh(lockres); } bail: +diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c +index f169da4..b7e74b5 100644 +--- a/fs/ocfs2/suballoc.c ++++ b/fs/ocfs2/suballoc.c +@@ -642,7 +642,7 @@ ocfs2_block_group_alloc_discontig(handle_t *handle, + * cluster groups will be staying in cache for the duration of + * this operation. + */ +- ac->ac_allow_chain_relink = 0; ++ ac->ac_disable_chain_relink = 1; + + /* Claim the first region */ + status = ocfs2_block_group_claim_bits(osb, handle, ac, min_bits, +@@ -1823,7 +1823,7 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac, + * Do this *after* figuring out how many bits we're taking out + * of our target group. + */ +- if (ac->ac_allow_chain_relink && ++ if (!ac->ac_disable_chain_relink && + (prev_group_bh) && + (ocfs2_block_group_reasonably_empty(bg, res->sr_bits))) { + status = ocfs2_relink_block_group(handle, alloc_inode, +@@ -1928,7 +1928,6 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac, + + victim = ocfs2_find_victim_chain(cl); + ac->ac_chain = victim; +- ac->ac_allow_chain_relink = 1; + + status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits, + res, &bits_left); +@@ -1947,7 +1946,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac, + * searching each chain in order. Don't allow chain relinking + * because we only calculate enough journal credits for one + * relink per alloc. */ +- ac->ac_allow_chain_relink = 0; ++ ac->ac_disable_chain_relink = 1; + for (i = 0; i < le16_to_cpu(cl->cl_next_free_rec); i ++) { + if (i == victim) + continue; +diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h +index b8afabf..a36d0aa 100644 +--- a/fs/ocfs2/suballoc.h ++++ b/fs/ocfs2/suballoc.h +@@ -49,7 +49,7 @@ struct ocfs2_alloc_context { + + /* these are used by the chain search */ + u16 ac_chain; +- int ac_allow_chain_relink; ++ int ac_disable_chain_relink; + group_search_t *ac_group_search; + + u64 ac_last_group; +diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c +index 0ba9ea1..2e3ea30 100644 +--- a/fs/ocfs2/xattr.c ++++ b/fs/ocfs2/xattr.c +@@ -7189,7 +7189,7 @@ int ocfs2_init_security_and_acl(struct inode *dir, + struct buffer_head *dir_bh = NULL; + + ret = ocfs2_init_security_get(inode, dir, qstr, NULL); +- if (!ret) { ++ if (ret) { + mlog_errno(ret); + goto leave; + } +diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c +index 2d1e0f3..12da9ee 100644 +--- a/fs/pstore/platform.c ++++ b/fs/pstore/platform.c +@@ -96,6 +96,27 @@ static const char *get_reason_str(enum kmsg_dump_reason reason) + } + } + ++bool pstore_cannot_block_path(enum kmsg_dump_reason reason) ++{ ++ /* ++ * In case of NMI path, pstore shouldn't be blocked ++ * regardless of reason. ++ */ ++ if (in_nmi()) ++ return true; ++ ++ switch (reason) { ++ /* In panic case, other cpus are stopped by smp_send_stop(). */ ++ case KMSG_DUMP_PANIC: ++ /* Emergency restart shouldn't be blocked by spin lock. */ ++ case KMSG_DUMP_EMERG: ++ return true; ++ default: ++ return false; ++ } ++} ++EXPORT_SYMBOL_GPL(pstore_cannot_block_path); ++ + /* + * callback from kmsg_dump. (s2,l2) has the most recently + * written bytes, older bytes are in (s1,l1). Save as much +@@ -114,10 +135,12 @@ static void pstore_dump(struct kmsg_dumper *dumper, + + why = get_reason_str(reason); + +- if (in_nmi()) { +- is_locked = spin_trylock(&psinfo->buf_lock); +- if (!is_locked) +- pr_err("pstore dump routine blocked in NMI, may corrupt error record\n"); ++ if (pstore_cannot_block_path(reason)) { ++ is_locked = spin_trylock_irqsave(&psinfo->buf_lock, flags); ++ if (!is_locked) { ++ pr_err("pstore dump routine blocked in %s path, may corrupt error record\n" ++ , in_nmi() ? "NMI" : why); ++ } + } else + spin_lock_irqsave(&psinfo->buf_lock, flags); + oopscount++; +@@ -143,9 +166,9 @@ static void pstore_dump(struct kmsg_dumper *dumper, + total += hsize + len; + part++; + } +- if (in_nmi()) { ++ if (pstore_cannot_block_path(reason)) { + if (is_locked) +- spin_unlock(&psinfo->buf_lock); ++ spin_unlock_irqrestore(&psinfo->buf_lock, flags); + } else + spin_unlock_irqrestore(&psinfo->buf_lock, flags); + } diff --git a/fs/splice.c b/fs/splice.c index 41514dd..c69fbb7 100644 --- a/fs/splice.c @@ -12656,6 +13589,44 @@ index ed6642a..25f01d0 100644 }; #define HAVE_GENERIC_MMU_GATHER +diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h +index da64e15..6cdabb4 100644 +--- a/include/linux/auto_fs.h ++++ b/include/linux/auto_fs.h +@@ -31,25 +31,16 @@ + #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION + + /* +- * Architectures where both 32- and 64-bit binaries can be executed +- * on 64-bit kernels need this. This keeps the structure format +- * uniform, and makes sure the wait_queue_token isn't too big to be +- * passed back down to the kernel. +- * +- * This assumes that on these architectures: +- * mode 32 bit 64 bit +- * ------------------------- +- * int 32 bit 32 bit +- * long 32 bit 64 bit +- * +- * If so, 32-bit user-space code should be backwards compatible. ++ * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed ++ * back to the kernel via ioctl from userspace. On architectures where 32- and ++ * 64-bit userspace binaries can be executed it's important that the size of ++ * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we ++ * do not break the binary ABI interface by changing the structure size. + */ +- +-#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \ +- || defined(__powerpc__) || defined(__s390__) +-typedef unsigned int autofs_wqt_t; +-#else ++#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */ + typedef unsigned long autofs_wqt_t; ++#else ++typedef unsigned int autofs_wqt_t; + #endif + + /* Packet types */ diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 366422b..eb53e15 100644 --- a/include/linux/binfmts.h @@ -12894,6 +13865,41 @@ index 8d3c427..50a6cbe 100644 #define PCI_DEVICE_ID_RICOH_R5CE823 0xe823 #define PCI_DEVICE_ID_RICOH_R5C832 0x0832 #define PCI_DEVICE_ID_RICOH_R5C843 0x0843 +diff --git a/include/linux/pstore.h b/include/linux/pstore.h +index c892587..2e24e22 100644 +--- a/include/linux/pstore.h ++++ b/include/linux/pstore.h +@@ -74,12 +74,18 @@ static inline void pstore_ftrace_call(unsigned long ip, unsigned long parent_ip) + + #ifdef CONFIG_PSTORE + extern int pstore_register(struct pstore_info *); ++extern bool pstore_cannot_block_path(enum kmsg_dump_reason reason); + #else + static inline int + pstore_register(struct pstore_info *psi) + { + return -ENODEV; + } ++static inline bool ++pstore_cannot_block_path(enum kmsg_dump_reason reason) ++{ ++ return false; ++} + #endif + + #endif /*_LINUX_PSTORE_H*/ +diff --git a/include/linux/quota.h b/include/linux/quota.h +index 524ede8..2a0327e 100644 +--- a/include/linux/quota.h ++++ b/include/linux/quota.h +@@ -417,6 +417,7 @@ struct quota_module_name { + #define INIT_QUOTA_MODULE_NAMES {\ + {QFMT_VFS_OLD, "quota_v1"},\ + {QFMT_VFS_V0, "quota_v2"},\ ++ {QFMT_VFS_V1, "quota_v2"},\ + {0, NULL}} + + #endif /* __KERNEL__ */ diff --git a/include/linux/sched.h b/include/linux/sched.h index 23bddac..d2bbc12 100644 --- a/include/linux/sched.h @@ -13114,10 +14120,31 @@ index d61ec54..5973f47 100644 ftrace_init(); diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index ff2bce5..2c0d5d0 100644 +index ff2bce5..2cd3492 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -2635,9 +2635,7 @@ static int cgroup_create_dir(struct cgroup *cgrp, struct dentry *dentry, +@@ -422,12 +422,20 @@ static void __put_css_set(struct css_set *cg, int taskexit) + struct cgroup *cgrp = link->cgrp; + list_del(&link->cg_link_list); + list_del(&link->cgrp_link_list); ++ ++ /* ++ * We may not be holding cgroup_mutex, and if cgrp->count is ++ * dropped to 0 the cgroup can be destroyed at any time, hence ++ * rcu_read_lock is used to keep it alive. ++ */ ++ rcu_read_lock(); + if (atomic_dec_and_test(&cgrp->count) && + notify_on_release(cgrp)) { + if (taskexit) + set_bit(CGRP_RELEASABLE, &cgrp->flags); + check_for_release(cgrp); + } ++ rcu_read_unlock(); + + kfree(link); + } +@@ -2635,9 +2643,7 @@ static int cgroup_create_dir(struct cgroup *cgrp, struct dentry *dentry, dentry->d_fsdata = cgrp; inc_nlink(parent->d_inode); rcu_assign_pointer(cgrp->dentry, dentry); @@ -13127,6 +14154,29 @@ index ff2bce5..2c0d5d0 100644 return error; } +diff --git a/kernel/cpuset.c b/kernel/cpuset.c +index f33c715..01abde2 100644 +--- a/kernel/cpuset.c ++++ b/kernel/cpuset.c +@@ -2519,8 +2519,16 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk) + + dentry = task_cs(tsk)->css.cgroup->dentry; + spin_lock(&cpuset_buffer_lock); +- snprintf(cpuset_name, CPUSET_NAME_LEN, +- dentry ? (const char *)dentry->d_name.name : "/"); ++ ++ if (!dentry) { ++ strcpy(cpuset_name, "/"); ++ } else { ++ spin_lock(&dentry->d_lock); ++ strlcpy(cpuset_name, (const char *)dentry->d_name.name, ++ CPUSET_NAME_LEN); ++ spin_unlock(&dentry->d_lock); ++ } ++ + nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN, + tsk->mems_allowed); + printk(KERN_INFO "%s cpuset=%s mems_allowed=%s\n", diff --git a/kernel/futex.c b/kernel/futex.c index 19eb089..8879430 100644 --- a/kernel/futex.c @@ -13337,6 +14387,24 @@ index 125cb67..acbb79c 100644 if ((it->it_value.tv_sec | it->it_value.tv_nsec) == 0) { /* * It actually did fire already. +diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c +index 69185ae..e885be1 100644 +--- a/kernel/posix-timers.c ++++ b/kernel/posix-timers.c +@@ -639,6 +639,13 @@ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags) + { + struct k_itimer *timr; + ++ /* ++ * timer_t could be any type >= int and we want to make sure any ++ * @timer_id outside positive int range fails lookup. ++ */ ++ if ((unsigned long long)timer_id > INT_MAX) ++ return NULL; ++ + rcu_read_lock(); + timr = idr_find(&posix_timers_id, (int)timer_id); + if (timr) { diff --git a/kernel/ptrace.c b/kernel/ptrace.c index a232bb5..b96de86b4 100644 --- a/kernel/ptrace.c @@ -13685,6 +14753,22 @@ index 29dd40a..69f38bd 100644 /* Optionally wait for the CPUs to complete */ if (wait) +diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c +index 65bdcf1..c2f6d47 100644 +--- a/kernel/sysctl_binary.c ++++ b/kernel/sysctl_binary.c +@@ -1194,9 +1194,10 @@ static ssize_t bin_dn_node_address(struct file *file, + + /* Convert the decnet address to binary */ + result = -EIO; +- nodep = strchr(buf, '.') + 1; ++ nodep = strchr(buf, '.'); + if (!nodep) + goto out; ++ ++nodep; + + area = simple_strtoul(buf, NULL, 10); + node = simple_strtoul(nodep, NULL, 10); diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl index eb51d76..3f42652 100644 --- a/kernel/timeconst.pl @@ -13703,18 +14787,88 @@ index eb51d76..3f42652 100644 } exit 0; diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index 781ecc2..7f8a8df 100644 +index 781ecc2..384699f 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -3863,7 +3863,7 @@ static int ftrace_module_notify(struct notifier_block *self, +@@ -3835,35 +3835,49 @@ static void ftrace_init_module(struct module *mod, + ftrace_process_locs(mod, start, end); + } - struct notifier_block ftrace_module_nb = { - .notifier_call = ftrace_module_notify, +-static int ftrace_module_notify(struct notifier_block *self, +- unsigned long val, void *data) ++static int ftrace_module_notify_enter(struct notifier_block *self, ++ unsigned long val, void *data) + { + struct module *mod = data; + +- switch (val) { +- case MODULE_STATE_COMING: ++ if (val == MODULE_STATE_COMING) + ftrace_init_module(mod, mod->ftrace_callsites, + mod->ftrace_callsites + + mod->num_ftrace_callsites); +- break; +- case MODULE_STATE_GOING: ++ return 0; ++} ++ ++static int ftrace_module_notify_exit(struct notifier_block *self, ++ unsigned long val, void *data) ++{ ++ struct module *mod = data; ++ ++ if (val == MODULE_STATE_GOING) + ftrace_release_mod(mod); +- break; +- } + + return 0; + } + #else +-static int ftrace_module_notify(struct notifier_block *self, +- unsigned long val, void *data) ++static int ftrace_module_notify_enter(struct notifier_block *self, ++ unsigned long val, void *data) ++{ ++ return 0; ++} ++static int ftrace_module_notify_exit(struct notifier_block *self, ++ unsigned long val, void *data) + { + return 0; + } + #endif /* CONFIG_MODULES */ + +-struct notifier_block ftrace_module_nb = { +- .notifier_call = ftrace_module_notify, - .priority = 0, ++struct notifier_block ftrace_module_enter_nb = { ++ .notifier_call = ftrace_module_notify_enter, + .priority = INT_MAX, /* Run before anything that can use kprobes */ ++}; ++ ++struct notifier_block ftrace_module_exit_nb = { ++ .notifier_call = ftrace_module_notify_exit, ++ .priority = INT_MIN, /* Run after anything that can remove kprobes */ }; extern unsigned long __start_mcount_loc[]; +@@ -3897,9 +3911,13 @@ void __init ftrace_init(void) + __start_mcount_loc, + __stop_mcount_loc); + +- ret = register_module_notifier(&ftrace_module_nb); ++ ret = register_module_notifier(&ftrace_module_enter_nb); ++ if (ret) ++ pr_warning("Failed to register trace ftrace module enter notifier\n"); ++ ++ ret = register_module_notifier(&ftrace_module_exit_nb); + if (ret) +- pr_warning("Failed to register trace ftrace module notifier\n"); ++ pr_warning("Failed to register trace ftrace module exit notifier\n"); + + set_ftrace_early_filters(); + diff --git a/lib/atomic64.c b/lib/atomic64.c index 9785378..08a4f06 100644 --- a/lib/atomic64.c @@ -13760,6 +14914,26 @@ index 8c0e629..dc2be7e 100644 err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len); if (err) goto err; +diff --git a/lib/idr.c b/lib/idr.c +index 4046e29..e90d2d0 100644 +--- a/lib/idr.c ++++ b/lib/idr.c +@@ -625,7 +625,14 @@ void *idr_get_next(struct idr *idp, int *nextidp) + return p; + } + +- id += 1 << n; ++ /* ++ * Proceed to the next layer at the current level. Unlike ++ * idr_for_each(), @id isn't guaranteed to be aligned to ++ * layer boundary at this point and adding 1 << n may ++ * incorrectly skip IDs. Make sure we jump to the ++ * beginning of the next layer using round_up(). ++ */ ++ id = round_up(id + 1, 1 << n); + while (n < fls(id)) { + n += IDR_BITS; + p = *--paa; diff --git a/mm/compaction.c b/mm/compaction.c index 7fcd3a5..214944a 100644 --- a/mm/compaction.c @@ -15908,6 +17082,46 @@ index 128494e..7fc5846 100644 if (task->tk_msg.rpc_cred) { put_rpccred(task->tk_msg.rpc_cred); task->tk_msg.rpc_cred = NULL; +diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c +index bac973a..3e74e01 100644 +--- a/net/sunrpc/svc_xprt.c ++++ b/net/sunrpc/svc_xprt.c +@@ -814,7 +814,6 @@ static void svc_age_temp_xprts(unsigned long closure) + struct svc_serv *serv = (struct svc_serv *)closure; + struct svc_xprt *xprt; + struct list_head *le, *next; +- LIST_HEAD(to_be_aged); + + dprintk("svc_age_temp_xprts\n"); + +@@ -835,25 +834,15 @@ static void svc_age_temp_xprts(unsigned long closure) + if (atomic_read(&xprt->xpt_ref.refcount) > 1 || + test_bit(XPT_BUSY, &xprt->xpt_flags)) + continue; +- svc_xprt_get(xprt); +- list_move(le, &to_be_aged); ++ list_del_init(le); + set_bit(XPT_CLOSE, &xprt->xpt_flags); + set_bit(XPT_DETACHED, &xprt->xpt_flags); +- } +- spin_unlock_bh(&serv->sv_lock); +- +- while (!list_empty(&to_be_aged)) { +- le = to_be_aged.next; +- /* fiddling the xpt_list node is safe 'cos we're XPT_DETACHED */ +- list_del_init(le); +- xprt = list_entry(le, struct svc_xprt, xpt_list); +- + dprintk("queuing xprt %p for closing\n", xprt); + + /* a thread will dequeue and close it soon */ + svc_xprt_enqueue(xprt); +- svc_xprt_put(xprt); + } ++ spin_unlock_bh(&serv->sv_lock); + + mod_timer(&serv->sv_temptimer, jiffies + svc_conn_age_period * HZ); + } diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 5d7f61d..2480c01 100644 --- a/net/sunrpc/xprt.c @@ -16029,7 +17243,7 @@ index ee895f3..be8c176 100644 } outb(pvoice->number, ALI_REG(codec, ALI_GC_CIR)); diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 8f23374..6874743 100644 +index 8f23374..c383243 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -924,8 +924,12 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, @@ -16054,6 +17268,16 @@ index 8f23374..6874743 100644 if (eld_valid) { if (!snd_hdmi_get_eld(eld, codec, pin_nid)) snd_hdmi_show_eld(eld); +@@ -1245,6 +1250,9 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) + + if (pcmdev > 0) + sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev); ++ if (!is_jack_detectable(codec, per_pin->pin_nid)) ++ strncat(hdmi_str, " Phantom", ++ sizeof(hdmi_str) - strlen(hdmi_str) - 1); + + return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0); + } diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e1b7061..51bbe0d 100644 --- a/sound/pci/hda/patch_realtek.c @@ -16499,6 +17723,46 @@ index 0f58b4b..b8d1ad1 100644 } else snd_printk(KERN_INFO "usb-audio: Fast Track Pro config OK\n"); +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index 3657ab0..243ae64 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -225,13 +225,13 @@ $(OUTPUT)util/parse-events-flex.c: util/parse-events.l + $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c + + $(OUTPUT)util/parse-events-bison.c: util/parse-events.y +- $(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c ++ $(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_ + + $(OUTPUT)util/pmu-flex.c: util/pmu.l + $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c + + $(OUTPUT)util/pmu-bison.c: util/pmu.y +- $(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c ++ $(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_ + + $(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c + $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c +diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y +index 2bc5fbf..68a5f42 100644 +--- a/tools/perf/util/parse-events.y ++++ b/tools/perf/util/parse-events.y +@@ -1,5 +1,4 @@ + %pure-parser +-%name-prefix "parse_events_" + %parse-param {void *_data} + %parse-param {void *scanner} + %lex-param {void* scanner} +diff --git a/tools/perf/util/pmu.y b/tools/perf/util/pmu.y +index 20ea77e..522943f 100644 +--- a/tools/perf/util/pmu.y ++++ b/tools/perf/util/pmu.y +@@ -1,5 +1,4 @@ + +-%name-prefix "perf_pmu_" + %parse-param {struct list_head *format} + %parse-param {char *name} + diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d617f69..cd197be 100644 --- a/virt/kvm/kvm_main.c diff --git a/main/lua-lgi/APKBUILD b/main/lua-lgi/APKBUILD index 5341a15131..6257c0b099 100644 --- a/main/lua-lgi/APKBUILD +++ b/main/lua-lgi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-lgi -pkgver=0.6.2 +pkgver=0.7.1 pkgrel=0 pkgdesc="Lua binding using gobject-introspection" url="http://github.com/pavouk/lgi" @@ -9,10 +9,10 @@ arch="all" license="MIT" depends="" depends_dev="" -makedepends="lua-dev gtk+-dev gobject-introspection-dev" +makedepends="lua-dev gtk+-dev gobject-introspection-dev libffi-dev" install="" subpackages="$pkgname-doc" -source="https://github.com/downloads/pavouk/lgi/lgi-$pkgver.tar.gz" +source="lgi-$pkgver.tar.gz::https://github.com/pavouk/lgi/archive/$pkgver.tar.gz" _builddir="$srcdir"/lgi-$pkgver prepare() { @@ -37,4 +37,6 @@ package() { cp -r docs/* samples "$pkgdir"/usr/share/doc/lua-lgi/ } -md5sums="9ae2c0740e9ea536b6b6afacea5bd21b lgi-0.6.2.tar.gz" +md5sums="de7367aee8e39f7df7c2229675c5ff2d lgi-0.7.1.tar.gz" +sha256sums="05a5fb7175836975f142bd0782fd18a851c8239d1cd26c9fb1d79b5c00af92e6 lgi-0.7.1.tar.gz" +sha512sums="ffca37c874040745d730b089eddfdd44e515fb61ffdd7d7de3f7947156ce7d03c2376c020584137dc4f54b4c9ff448fdb1ed8e581f4bf3f003d96c47517166a6 lgi-0.7.1.tar.gz" diff --git a/main/lua-penlight/APKBUILD b/main/lua-penlight/APKBUILD index 8fbe461f90..95f7d62f4e 100644 --- a/main/lua-penlight/APKBUILD +++ b/main/lua-penlight/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-penlight -pkgver=1.0.3a +pkgver=1.1 pkgrel=0 pkgdesc="Lua libraries for extended operations on tables, lists and strings" url="http://penlight.luaforge.net/" @@ -10,9 +10,9 @@ depends="lua-filesystem" makedepends="wget" install= subpackages="$pkgname-doc" -source="https://github.com/stevedonovan/penlight/archive/$pkgver.tar.gz" +source="http://stevedonovan.github.com/files/penlight-$pkgver.zip" -_builddir="$srcdir"/Penlight-$pkgver +_builddir="$srcdir"/penlight-$pkgver build() { return 0 @@ -27,4 +27,6 @@ package() { cp -r examples "$pkgdir"/usr/share/doc/$pkgname/ } -md5sums="5de8e66b18b915b0afe58fe464466daa 1.0.3a.tar.gz" +md5sums="b24499e9f9496a311b7f38626358df41 penlight-1.1.zip" +sha256sums="cf3e80f325830fb487d2744c3a597a935d52f2d9166b375357e254ab24907ead penlight-1.1.zip" +sha512sums="af64c87a88e4fb7a7bcb572c841fe1cb8880eeecc125df4bed164525d5637f334b0ee1e5f1caf17e258429c25ecfacbac9fe2b5a9d7c3e281ec8177da2d6b113 penlight-1.1.zip" diff --git a/main/lua-posix/0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch b/main/lua-posix/0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch new file mode 100644 index 0000000000..c6fffd54fb --- /dev/null +++ b/main/lua-posix/0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch @@ -0,0 +1,30 @@ +From 9f6c2a8fe34db847df957e55e0375b5cf15a44b9 Mon Sep 17 00:00:00 2001 +From: nmcveity <nmcveity@gmail.com> +Date: Mon, 4 Mar 2013 22:49:27 -0800 +Subject: [PATCH] Removed Lua 5.2 functions lua_len and lua_tointegerx + +This fixes issue #71. +--- + lposix.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/lposix.c b/lposix.c +index ffd3c57..bf5accb 100644 +--- a/lposix.c ++++ b/lposix.c +@@ -901,11 +901,7 @@ static int runexec(lua_State *L, int use_shell) + const char *path = luaL_checkstring(L, 1); + int i,n=lua_gettop(L), table = 0; + if (n >= 1 && lua_type(L, 2) == LUA_TTABLE) { +- int isint; +- lua_len(L, 2); +- n = lua_tointegerx(L, -1, &isint); +- if (!isint) +- luaL_error(L, "argument 2 is a table, but has non-numeric length"); ++ n = lua_objlen(L, 2); + table = 1; + } else + n--; +-- +1.8.1.5 + diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD index 2e206e6119..1dd8bcdb74 100644 --- a/main/lua-posix/APKBUILD +++ b/main/lua-posix/APKBUILD @@ -1,23 +1,32 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-posix _name=luaposix -pkgver=5.1.23 -pkgrel=0 +pkgver=5.1.26 +pkgrel=1 pkgdesc="POSIX library for Lua" url="https://github.com/luaposix/luaposix" arch="all" license="MIT" depends="lua lua-bitlib" makedepends="lua-dev perl ncurses-dev" -source="https://github.com/downloads/luaposix/luaposix/luaposix-$pkgver.tar.gz" +source="luaposix-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/release-v$pkgver.tar.gz + 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch" replaces="luaposix" -subpackages="curses" +subpackages="lua-curses $pkgname-doc" -_builddir="$srcdir"/$_name-$pkgver +_builddir="$srcdir"/$_name-release-v$pkgver _lualib=/usr/lib/lua/5.1 _luashare=/usr/share/lua/5.1 +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { cd "$_builddir" ./configure --prefix=/usr \ @@ -35,8 +44,14 @@ package() { curses() { pkgdesc="ncurses binding for Lua" + replaces="curses" mkdir -p "$subpkgdir"/$_lualib "$subpkgdir"/$_luashare mv "$pkgdir"/$_lualib/curses* "$subpkgdir"/$_lualib/ || return 1 mv "$pkgdir"/$_luashare/curses* "$subpkgdir"/$_luashare/ || return 1 } -md5sums="ebe7d335741ca736e003a6844a0fbf92 luaposix-5.1.23.tar.gz" +md5sums="26018f1e581e24d2875e848a77d03139 luaposix-5.1.26.tar.gz +2af13134ae7e936e74f6f1f2f011a3ba 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch" +sha256sums="8de25b0013cc97ccf5ccd8b23012a548fb8ed682d8d95c849c3798bdfbda9866 luaposix-5.1.26.tar.gz +256504f015850b3126a53d40d6210b8d6f473bc3c180b74621c62709d3db594d 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch" +sha512sums="48e8a7ab8752d0a87326226813c1feb4f76596c568eb657777c8861837fd036835107c1ef7125d9512d42326ce560249057a791e99c36e29228fae665443fb59 luaposix-5.1.26.tar.gz +b460d42e39c790ca4dd44b16923a9a44267a2b2088995eed9cdbfc9b852d9beb30f96a30cceddd6bbe32e2ed2cc806515e8d9e9fb7a3d877043a65f1f1f2394e 0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch" diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 604cb19bcb..65567b84a4 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man-pages -pkgver=3.47 +pkgver=3.48 _posixver=2003-a pkgrel=0 pkgdesc="Linux man pages" @@ -31,9 +31,9 @@ package() { rm "$pkgdir"/usr/share/man/man3/iconv* } -md5sums="2046259794d3003f4dc4dbe4b688ba2f man-pages-3.47.tar.xz +md5sums="16cb409678ad97f936a452f47f806044 man-pages-3.48.tar.xz 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2" -sha256sums="4cc56ab572da7cb9ca200010a917812ae97966cb37307423743256ed22109482 man-pages-3.47.tar.xz +sha256sums="6944cc3ad5131abab01c6703e63672b2e44be52737cdb1144f6ddaebb7f7d682 man-pages-3.48.tar.xz e355b1b7bbccd4cef6b4a38dccf090e4535e038c21a9985c19891f21173d49ea man-pages-posix-2003-a.tar.bz2" -sha512sums="bab39c2c4ac44e9f46717f47e6db2cc346baef31fe92d6c5d587948c92d5d8e5fb9ed171da179327063a052d7a27aa4da9bd18e760f7d47c9f2e398e2a5bd6fc man-pages-3.47.tar.xz +sha512sums="000d7ea7d6e628903b22eed83839246bd2a94221627ac2b4b0ba6af4bd75ea309f4e352ed1f4f997bce1b401ba55c47ca6e84af8fa64c6b143572d79e1d90edc man-pages-3.48.tar.xz 70d1e1e5ceb3095323bfe2c85bfd5661e25fd77469a4b18eb9806f327cb65a030c2ea51185577d6230aec1778185ee2d4385f677af3069d28ab07e9373857024 man-pages-posix-2003-a.tar.bz2" diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD index a89b563c5c..ef871587c4 100644 --- a/main/mesa-demos/APKBUILD +++ b/main/mesa-demos/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa-demos -pkgver=8.0.1 -pkgrel=5 +pkgver=8.1.0 +pkgrel=0 pkgdesc="Mesa demos and utils" url="http://mesa3d.sourceforge.net" arch="all" @@ -13,9 +13,6 @@ makedepends="$depends_dev mesa-dev glew-dev glu-dev automake autoconf libtool" install="" subpackages= source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2 - sincos.patch - mesa-demos-gles.patch - link.patch " _builddir="$srcdir/$pkgname-$pkgver" @@ -41,7 +38,6 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="320c2a4b6edc6faba35d9cb1e2a30bf4 mesa-demos-8.0.1.tar.bz2 -75be22556a657f0a157028233832d167 sincos.patch -dc89e44fed4a6c9d0ac3d8b88ddead91 mesa-demos-gles.patch -502885b11980be71712f6a33bfd1508d link.patch" +md5sums="9df33ba69a26bbfbc7c8148602e59542 mesa-demos-8.1.0.tar.bz2" +sha256sums="9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828 mesa-demos-8.1.0.tar.bz2" +sha512sums="4832690cd7fb7bb4caccde039cb68baf9213e102ca9212541da499941879b719c1a7ee4038b3e0fde42a92bd6589a90b8ec842982aba81ff507e6ea55054a9ed mesa-demos-8.1.0.tar.bz2" diff --git a/main/mesa-demos/link.patch b/main/mesa-demos/link.patch deleted file mode 100644 index f19b6bbc95..0000000000 --- a/main/mesa-demos/link.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/egl/opengl/Makefile.in.orig -+++ ./src/egl/opengl/Makefile.in -@@ -111,10 +111,10 @@ - peglgears_LDADD = $(LDADD) - xeglgears_SOURCES = xeglgears.c - xeglgears_OBJECTS = xeglgears.$(OBJEXT) --xeglgears_LDADD = $(LDADD) -+xeglgears_LDADD = $(LDADD) $(X11_LIBS) - xeglthreads_SOURCES = xeglthreads.c - xeglthreads_OBJECTS = xeglthreads.$(OBJEXT) --xeglthreads_LDADD = $(LDADD) -+xeglthreads_LDADD = $(LDADD) $(X11_LIBS) -lpthread - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles diff --git a/main/mesa-demos/mesa-demos-gles.patch b/main/mesa-demos/mesa-demos-gles.patch deleted file mode 100644 index 20d4430662..0000000000 --- a/main/mesa-demos/mesa-demos-gles.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c -index 93816b5..647d634 100644 ---- a/src/egl/opengles2/es2_info.c -+++ b/src/egl/opengles2/es2_info.c -@@ -18,8 +18,8 @@ - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/keysym.h> --#include <GLES/gl.h> --#include <GLES/glext.h> -+#include <GLES2/gl2.h> -+#include <GLES2/gl2ext.h> - #include <EGL/egl.h> - - diff --git a/main/mesa-demos/sincos.patch b/main/mesa-demos/sincos.patch deleted file mode 100644 index 38da0285d1..0000000000 --- a/main/mesa-demos/sincos.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ./src/egl/opengles2/es2gears.c.orig -+++ ./src/egl/opengles2/es2gears.c -@@ -109,13 +109,15 @@ - c[4] = 1; - v = gear->vertices; - for (i = 0; i < teeth; i++) { -+ GLint j; - s[0] = s[4]; - c[0] = c[4]; -- sincos(i * 2.0 * M_PI / teeth + da, &s[1], &c[1]); -- sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]); -- sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]); -- sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]); - -+ for (j=1; j <=4; j++) { -+ s[j] = sin(i * 2.0 * M_PI / teeth + da * j); -+ c[j] = cos(i * 2.0 * M_PI / teeth + da * j); -+ } -+ - normal[0] = 0.0; - normal[1] = 0.0; - normal[2] = 1.0; -@@ -199,7 +201,8 @@ - { - double s, c; - -- sincos(angle, &s, &c); -+ s = sin(angle); -+ c = cos(angle); - GLfloat r[16] = { - x * x * (1 - c) + c, y * x * (1 - c) + z * s, x * z * (1 - c) - y * s, 0, - x * y * (1 - c) - z * s, y * y * (1 - c) + c, y * z * (1 - c) + x * s, 0, diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index bfbabe4e12..573f54bd69 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=9.0.3 -pkgrel=1 +pkgver=9.1 +pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" arch="all" @@ -21,15 +21,13 @@ depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev libxdamage-dev libxfixes-dev libxcb-dev glproto" makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend talloc-dev py-libxml2 flex bison llvm-dev udev-dev libvdpau-dev - libxvmc-dev + libxvmc-dev gettext autoconf automake libtool" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 glx_ro_text_segm.patch - ccache.patch uclibc-debug.patch " - _dri_driverdir=/usr/lib/xorg/modules/dri _builddir="$srcdir/Mesa-$pkgver" @@ -65,8 +63,8 @@ build() { --disable-asm \ --enable-pic \ --enable-glx-rts \ - --with-gallium-drivers=r300,r600,svga,swrast,nouveau \ - --with-dri-drivers=i915,i965,r200,radeon,swrast,nouveau \ + --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --enable-gallium-llvm \ --enable-gallium-egl \ --with-egl-platforms=x11,drm \ @@ -181,22 +179,31 @@ _mv_vdpau() { done } +_mv_gpipe() { + local i + install -d "$subpkgdir"/usr/lib/gallium-pipe + for i in "$@"; do + mv "$pkgdir"/usr/lib/gallium-pipe/pipe_$i.* \ + "$subpkgdir"/usr/lib/gallium-pipe/ || return 1 + done +} + ati() { _mv_dri radeon_dri r200_dri r300_dri r600_dri \ - && _mv_vdpau r300 r600 softpipe; } + && _mv_vdpau r300 r600 softpipe \ + && _mv_gpipe r300 r600; } intel() { _mv_dri i915_dri i965_dri; } -nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri && _mv_vdpau nouveau; } -swrast() { _mv_dri swrast_dri; } -vmwgfx() { _mv_dri vmwgfx_dri; } +nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri \ + && _mv_vdpau nouveau \ + && _mv_gpipe nouveau; } +swrast() { _mv_dri swrast_dri && _mv_gpipe swrast; } +vmwgfx() { _mv_dri vmwgfx_dri && _mv_gpipe vmwgfx; } -md5sums="d7515cc5116c72ac63d735655bd63689 MesaLib-9.0.3.tar.bz2 +md5sums="d3891e02215422e120271d976ff1947e MesaLib-9.1.tar.bz2 a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch -1f30bf8340114b455f005cc9b134c414 ccache.patch cff511b3d459189751c841b8f99e7112 uclibc-debug.patch" -sha256sums="ea940005b2c379f83527b5ba6d7fb69c533c2c17b561dc3b8469237ac75606a5 MesaLib-9.0.3.tar.bz2 +sha256sums="af484cbfe7fe26e62fb1ddb1204d608c4270e74364c44e7207508cd736a0707b MesaLib-9.1.tar.bz2 004f52adefaeccfd4553e0b1d09ad769891d69d05880094c7a45d19623e674a6 glx_ro_text_segm.patch -aa756ba2da1a27829f784ac86e0c95a90aa139b232e0e59b5a981070cdf14a63 ccache.patch 8caa309f38190005e37fa833dba34463ee03b775210742004888db1d2b19184d uclibc-debug.patch" -sha512sums="2685706670356ca82c36a9fc30bfdabe9429e37ba670ece4a44634222430f828dfd5f15b116d78e3a9a6c432cf6ee3cf3a44bd132f896b81cc0bf1e1076dfdc5 MesaLib-9.0.3.tar.bz2 +sha512sums="9475361e3e3ce0e8ad632003b6e41944d3750de3d5a1a774a2e9cb1f04fd0df8f27e6f47e31f08808c3f4506f683cbda53570617f1db1dd0657b07e4bac36a19 MesaLib-9.1.tar.bz2 c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch -3d7e1152d033873fb953fe09b7cab0980f355924ac17e2f857b070907142489709bc55af63361d8036bf8e84526a589f05a0a29af2c72760b6f99ba957ac6c7f ccache.patch 72da0c43a5ae8c9fcd4a14df6c565d015a5f2f6422688e4b9b63c9b7e438e37219b94172952fc5664dd72a862e47e1893967df5820835b1f37547808087affb7 uclibc-debug.patch" diff --git a/main/mesa/ccache.patch b/main/mesa/ccache.patch deleted file mode 100644 index c75d659fa2..0000000000 --- a/main/mesa/ccache.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/targets/xa-vmwgfx/Makefile.orig -+++ ./src/gallium/targets/xa-vmwgfx/Makefile -@@ -59,7 +59,7 @@ - # Make the library - $(TOP)/$(LIB_DIR)/gallium/$(XA_LIB_NAME): depend $(OBJECTS) $(XA_LIB_DEPS) \ - xa_symbols -- $(MKLIB) -o $(XA_LIB) -linker $(LD) -ldflags '$(LDFLAGS)' \ -+ $(MKLIB) -o $(XA_LIB) -linker '$(LD)' -ldflags '$(LDFLAGS)' \ - -major $(XA_MAJOR) -minor $(XA_MINOR) -patch $(XA_TINY) \ - $(MKLIB_OPTIONS) \ - -exports xa_symbols \ diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD index 5974e907cd..979565e6e0 100644 --- a/main/mpg123/APKBUILD +++ b/main/mpg123/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpg123 -pkgver=1.14.4 +pkgver=1.15.1 pkgrel=0 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" url="http://sourceforge.net/projects/mpg123" @@ -29,4 +29,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="a72d0c60a1d7dbec7cfe966bc11672bf mpg123-1.14.4.tar.bz2" +md5sums="3bb9441c5f4fa10c995b8e0bd84d5549 mpg123-1.15.1.tar.bz2" +sha256sums="c6ea4f4db28a66a7ad9f22f890ce10aa796f73ae03f864f3272070c46c088355 mpg123-1.15.1.tar.bz2" +sha512sums="035e068f546aeb3996d254115160e39e5564b7a17f6ae0b424e5b9d5fbc3c632a78b958495b6c511c839d49eaf3f361a6bb7b4b6108e4596153c824d98e00047 mpg123-1.15.1.tar.bz2" diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD index cc56fe9059..7c57ec7314 100644 --- a/main/mplayer/APKBUILD +++ b/main/mplayer/APKBUILD @@ -2,7 +2,7 @@ pkgname=mplayer pkgver=1.1 _ver=${pkgver/_/} -pkgrel=4 +pkgrel=5 pkgdesc="A movie player for linux" url="http://www.mplayerhq.hu/" arch="all" diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 788192a27c..d2a267b610 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec _kpkg=linux-$_flavor _realname=open-vm-tools _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _realver=9.2.0_p799703 _ver=${_realver/_p/-} diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index e875b37aec..ab84020575 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openldap -pkgver=2.4.33 +pkgver=2.4.34 pkgrel=0 pkgdesc="LDAP Server" url="http://www.openldap.org/" @@ -126,9 +126,21 @@ clients() { } -md5sums="5adae44897647c15ce5abbff313bc85a openldap-2.4.33.tgz +md5sums="df93a62e396ac312333cdeab0c5b48b6 openldap-2.4.34.tgz 2524e490ba334a760fa57057c16da7a9 openldap-2.4-ppolicy.patch d19d0502f046078ecd737e29e7552fa8 openldap-2.4.11-libldap_r.patch c47e20f041e4b352e662d5bd677c0a38 slapd.initd b672311fca605c398240cd37a2ae080a slapd.confd fa5ce0005ef5f1160b6ff126f97aaa1a slurpd.initd" +sha256sums="eaab4c4a6b09cc9e60f97e6ef9974f8327d977d1d7af7bc00c2bc5f90dfe0606 openldap-2.4.34.tgz +355a8239355fcc5863ba7430d73af7ccad9e0211ae56180011d15d7418aa5b27 openldap-2.4-ppolicy.patch +3310a89d38bc39e6eb4333799d475411b274482b8bccab212b3edfd4385db70e openldap-2.4.11-libldap_r.patch +fae0a224bd297be617e1895715a39151962b1f47ef6ce5a5424cf12b7f9b554a slapd.initd +1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d slapd.confd +9cfe54485585a1bd74dd167c27ad9e60a5dec7351b6a64804749f253bb6cfbad slurpd.initd" +sha512sums="e72d5b8ce9cdeeca1d0c418532c8430ad153bb08301a80caed94659bda46ae8dc90dd1cc1efd90089e609cdd4712fea05062fda87810e15a92de3e7635752d64 openldap-2.4.34.tgz +5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch +44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch +b6686a55e63fd031acfa7fc8d9aec32c2709d4d072ae3840dd10a827614cbd80c1eeb472134065307d239bef016a9f376605c8cfbaf9c57f1fca6e0f242a3c32 slapd.initd +8290769b63b3a5863622de2deb9269a0711ba5f4a225eb230d7c5097937b9d4e8cf5a998ee99232824e2335ae1b6e0114357b61c9611bc2460ebd195d12eabae slapd.confd +69ee0d739d8c8c1cb2478d5c864f703cba215d0ceb399da941c0ebc91e7de87a4d99172670686a84a98e57bde94837777a8066d27f79b6b8bf4bcd72336ce775 slurpd.initd" diff --git a/main/openssl/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch b/main/openssl/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch index 6b21985797..c88edbf8fe 100644 --- a/main/openssl/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch +++ b/main/openssl/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch @@ -424,7 +424,7 @@ index 6ab42d2..e107d3c 100644 + NID_sha1, + NID_sha1WithRSAEncryption, + SHA_DIGEST_LENGTH, -+ 0, ++ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE, + padlock_sha1_init, + padlock_sha1_update, + padlock_sha1_final, diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index ed004a2573..aef1505971 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openssl pkgver=1.0.1e -pkgrel=0 +pkgrel=1 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" depends= @@ -94,7 +94,7 @@ md5sums="66bf6f10f060d561929de96f9dfe5b8c openssl-1.0.1e.tar.gz c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch ddb5fc155145d5b852425adaec32234d 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch 4a7b9e20beb33a5e262ab64c2b8e5b48 0002-engines-e_padlock-backport-cvs-head-changes.patch -d95bbaa38889836afd3c52f3962f3b54 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch +cef4633142031b59960200e87ce3bb18 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch c32f42451a07267ee5dfb3781fa40c00 0004-crypto-engine-autoload-padlock-dynamic-engine.patch c5b1042a3acaf3591f3f5620b7086e12 0005-s_client-ircv3-starttls.patch d1f3aaad7c36590f21355682983cd14e openssl-1.0.1-version-eglibc.patch" @@ -103,7 +103,7 @@ fe844e21b2c42da2d8e9c89350211d70c0829f45532b89b7e492bfde589ee7ed fix-manpages.p 82863c2fed659a7186c7f3905a1853b8bd8060350ad101ce159fa7e7d2ba27e8 openssl-bb-basename.patch 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 0002-engines-e_padlock-backport-cvs-head-changes.patch -e59f86fb779d327479fa97506c6d0d2df44b97f8182b45ca2eefebe9bef44b8d 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch +cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f 0004-crypto-engine-autoload-padlock-dynamic-engine.patch 44b553d92e33c48f854a8e15b23830375bc400e987505c74956ac196266f0d46 0005-s_client-ircv3-starttls.patch 51146851d8454dcb73138f794ced8bd629658b4a0524c466f61b653fff536c93 openssl-1.0.1-version-eglibc.patch" @@ -112,7 +112,7 @@ sha512sums="c76857e439431b2ef6f2aa123997e53f82b9c3c964d4d765d7cc6c0c20b37a21adf5 6c4f4b0c1b606b3e5a8175618c4398923392f9c25ad8d3f5b65b0424fe51e104c4f456d2da590d9f572382225ab320278e88db1585790092450cad60a02819a5 openssl-bb-basename.patch ea282b09d4692a29e5a554e19b0798fa921717d4892decc68cba92cad11e85e4064d8ac78d98f6fa8bb45c65fdd1a5d1a6f6755e53102d520e9d8b807c3a7822 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch 96cdd28d1ad5efd3f5836b4c57c9c6ea8e790fbf919e32a8c4acd3883a3531b8d295053a4aa20e6165600153b141ce7b0a3d1d736fdfc325d59862b845aa4d98 0002-engines-e_padlock-backport-cvs-head-changes.patch -b403a402debf1890df10d5cac12c5f6cc54be6f9bfd3b9cbc014694c02621d4c488f1215a94ac13f01e4cfc6ab93658cfa4c4ba8b707956dc745bf5648a927cf 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch +b019320869d215014ad46e0b29aa239e31243571c4d45256b3ce6449a67fdc106a381c1cf3abd55ddbfd6a0e9ffa3e3167377317cbc72b254b1f9bcc0e22b8b6 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch 3bedc326ca3e5945bc4ec4dccfe596042ee87aaeaf90b5063110a99cc8e38584838d68289907e4a3fcdb8e04635052ad0759c94e1d7070bb317c2066e2506bbe 0004-crypto-engine-autoload-padlock-dynamic-engine.patch 70cd257bbd5a86685dc2508399e67746b60ed5d581eb84fe4d4fc6af214f31b71e2a58ad758d572976a61f67bf64c37a935a9788db160f75bced75397b9bcce3 0005-s_client-ircv3-starttls.patch 6db9d9ee62048d27f80e392eda99a46712ee85f1c8fd49f4931be73c880da8b84844a72657f7bceddb7db0026daddd31870d9c5065494f8d359ee8560284fd4a openssl-1.0.1-version-eglibc.patch" diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD index 8f66847104..af842e6b81 100644 --- a/main/owncloud/APKBUILD +++ b/main/owncloud/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=owncloud -pkgver=4.5.6 -pkgrel=0 +pkgver=4.5.7 +pkgrel=1 pkgdesc="Your own WebDAV-based cloud service" url="http://owncloud.org" arch="noarch" @@ -14,7 +14,7 @@ install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-pgsql $pkgname-sqlite $pkgname-mysql $pkgname-texteditor $pkgname-videoviewer" replaces="$pkgname-plugins" -source="http://download.owncloud.org/releases/$pkgname-$pkgver.tar.bz2 +source="http://mirrors.owncloud.org/releases/$pkgname-$pkgver.tar.bz2 owncloud.config.php " @@ -87,5 +87,5 @@ videoviewer() { } -md5sums="b494ce673c8d5a4061978d2e6cfbc401 owncloud-4.5.6.tar.bz2 -7ea292d24e6c7fd79b6269de090b9fae owncloud.config.php" +md5sums="12b41fd8119c0fe48b62fcfe36999def owncloud-4.5.7.tar.bz2 +fd9403d34ddf737a3c932cfed0ff03b2 owncloud.config.php" diff --git a/main/owncloud/owncloud.config.php b/main/owncloud/owncloud.config.php index c3ad416799..7ea480b821 100644 --- a/main/owncloud/owncloud.config.php +++ b/main/owncloud/owncloud.config.php @@ -1,7 +1,7 @@ <?php $CONFIG = array( "datadirectory" => '/var/lib/owncloud/data', -"version" => '4.5.6', +"version" => '4.5.7', "dbname" => 'owncloud', "dbhost" => 'localhost', "dbuser" => 'owncloud', diff --git a/main/owncloud/owncloud.post-upgrade b/main/owncloud/owncloud.post-upgrade index af5d2b7713..cae2dc9dad 100644 --- a/main/owncloud/owncloud.post-upgrade +++ b/main/owncloud/owncloud.post-upgrade @@ -2,7 +2,7 @@ echo "*" echo "* Please give ownership to the web server user, the following directories:" echo "*" -echo "* /etc/owncloud/config.php" +echo "* /etc/owncloud" echo "* /var/lib/owncloud/data" echo "* /usr/share/webapps/owncloud/apps" echo "*" diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD index bc1e663d96..2415567e55 100644 --- a/main/pixman/APKBUILD +++ b/main/pixman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pixman -pkgver=0.28.2 +pkgver=0.29.2 pkgrel=0 pkgdesc="Pixman library" url="http://xorg.freedesktop.org" @@ -23,4 +23,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="f6e3294c4edb7b6bca8459e604286348 pixman-0.28.2.tar.bz2" +md5sums="6e64a6d73559973ef6a9f125b5161ad3 pixman-0.29.2.tar.bz2" +sha256sums="aa3dca46f6c90ae7731929d4e12195a981c52c3a423669ec3329d5a9c469841f pixman-0.29.2.tar.bz2" +sha512sums="b526f1c46012ee67bb1e5caa4f704200a4b8d3d2a59b527e271c09bcc0adbee9de855910ad66fd02ef5e8543423e574e89335d8b5f3133ed2e33d45c6b17d0f7 pixman-0.29.2.tar.bz2" diff --git a/main/py-configshell/APKBUILD b/main/py-configshell/APKBUILD index 299357e2ee..e504979c76 100644 --- a/main/py-configshell/APKBUILD +++ b/main/py-configshell/APKBUILD @@ -1,42 +1,22 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=py-configshell _realname=configshell -pkgver=1.1_p4 +pkgver=1.1_p7 _ver=${pkgver/_rc/rc} _ver=${_ver/_p/.fb} -pkgrel=2 +pkgrel=0 pkgdesc="Python library that provides a framework for building simple but nice CLI-based applications" url="https://github.com/agrover/configshell-fb" arch="noarch" -license="AGPLv3" +license="AGPL3" depends="python" depends_dev="python-dev py-simpleparse py-urwid" makedepends="$depends_dev" install="" -subpackages= -source="http://dev.alpinelinux.org/archive/configshell/$_realname-$_ver.tar.gz" - -_giturl="https://github.com/agrover/configshell-fb" -_gittag=v$_ver - -_builddir="$srcdir"/$_realname - -snapshot() { - mkdir -p "$srcdir" - cd "${SRCDEST:-$srcdir}" - if ! [ -d $_realname-fb.git ]; then - git clone --bare $_giturl || return 1 - cd $_realname-fb.git - else - cd $_realname-fb.git - git fetch || return 1 - fi - - git archive --prefix=$_realname/ -o "$SRCDEST"/$_realname-$_ver.tar.gz $_gittag - scp "$SRCDEST"/$_realname-$_ver.tar.gz dev.alpinelinux.org:/archive/$_realname/ -} - +subpackages="" +source="https://github.com/agrover/configshell-fb/archive/v$_ver.tar.gz" +_builddir="$srcdir"/$_realname-fb-$_ver prepare() { local i cd "$_builddir" @@ -49,12 +29,14 @@ prepare() { build() { cd "$_builddir" - python setup.py build + python setup.py build || return 1 } package() { cd "$_builddir" - python setup.py install --skip-build --root="$pkgdir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="69abc1134f16a14d481518a5378cf1b1 configshell-1.1.fb4.tar.gz" +md5sums="c14768baf1216f2ce272d7a9e261909c v1.1.fb7.tar.gz" +sha256sums="ab5576b7c4ff91390aea0b1edb7de5eada209da054022a10e8eab71252e2dc55 v1.1.fb7.tar.gz" +sha512sums="1fa8eed68c3bfa261dcb1ad7d724844bf1845f11fe8fa1587972e2cd6aa91750504e3438cc9b349c382b590bfe54e1ffbc616aa76927e32c4651123f6f756e37 v1.1.fb7.tar.gz" diff --git a/main/py-irc/APKBUILD b/main/py-irc/APKBUILD index d94a16b33a..ff68a96846 100644 --- a/main/py-irc/APKBUILD +++ b/main/py-irc/APKBUILD @@ -1,20 +1,21 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=py-irc -pkgver=3.0.1 +_pkgname=irc +pkgver=8.0.1 pkgrel=0 -pkgdesc="python irc client library" +pkgdesc="A python irc client library" url="http://python-irclib.sourceforge.net/" arch="noarch" -license="LGPL" +license="LGPL2+" depends="" depends_dev="python" -makedepends="$depends_dev py-hgtools" +makedepends="$depends_dev py-hgtools py-setuptools" install="" -subpackages="" -source="http://pypi.python.org/packages/source/i/irc/irc-${pkgver}.zip" +subpackages="$pkgname-scripts" +source="http://pypi.python.org/packages/source/i/irc/$_pkgname-${pkgver}.zip" -_builddir="$srcdir"/irc-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -35,4 +36,15 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="d69203c3d92867a99d669339f0ec87cb irc-3.0.1.zip" +scripts() { + _files="dccreceive.py dccsend.py irccat.py irccat2.py \ + servermap.py testbot.py" + for _file in $_files; do + install -Dm644 "$_builddir"/scripts/$_file \ + "$subpkgdir"/usr/share/doc/"$pkgname"/scripts/$_file || return 1 + done +} + +md5sums="0d4073d11845cac2d9eef60505f3c5fc irc-8.0.1.zip" +sha256sums="d7b0703f8fd94d67eac8136e4f8d8a4975b24f492766ba4372256932f44caf19 irc-8.0.1.zip" +sha512sums="6df02af77f0f7580f7ca1af273a46fe546c5c0aa55b75e2a689994f4547e6eed54c121e7d38b301f7874c98affe13a32bd5ff27401b9de90b02291a4e703c85c irc-8.0.1.zip" diff --git a/main/py-yaml/APKBUILD b/main/py-yaml/APKBUILD index d9cb46889e..5c81514183 100644 --- a/main/py-yaml/APKBUILD +++ b/main/py-yaml/APKBUILD @@ -8,14 +8,14 @@ pkgdesc="Python bindings for YAML" url="http://pyyaml.org" arch="all" license="MIT" -depends= -depends_dev= +depends="" +depends_dev="" makedepends="yaml-dev python-dev" install="" subpackages="" source="http://pyyaml.org/download/pyyaml/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -27,3 +27,5 @@ package() { } md5sums="74c94a383886519e9e7b3dd1ee540247 PyYAML-3.10.tar.gz" +sha256sums="e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c PyYAML-3.10.tar.gz" +sha512sums="57536fd9e5515916189c37487e0da583c8e9f79dd52dedb18342f65aefb6c063c4f141326ae7b49411d0cfdfd493bb0516f5c53737c76a69c7050a74a2834a33 PyYAML-3.10.tar.gz" diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index c6bd119637..a8d67d8d28 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt pkgver=4.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" diff --git a/main/rtmpdump/APKBUILD b/main/rtmpdump/APKBUILD index 551db45921..3189ce8900 100644 --- a/main/rtmpdump/APKBUILD +++ b/main/rtmpdump/APKBUILD @@ -3,7 +3,7 @@ pkgname=rtmpdump verbase=2.4 pkgver=2.4_git20130304 -pkgrel=0 +pkgrel=1 pkgdesc="A tool to download rtmp:// and rtmpe:// streams" url="http://rtmpdump.mplayerhq.hu/" arch="all" @@ -15,7 +15,9 @@ subpackages="$pkgname-dev $pkgname-doc librtmp" giturl="git://git.ffmpeg.org/rtmpdump" disturl="dev.alpinelinux.org:/archive/rtmpdump" -source="http://dev.alpinelinux.org/archive/rtmpdump/rtmpdump-${pkgver}.tar.gz" +source="http://dev.alpinelinux.org/archive/rtmpdump/rtmpdump-${pkgver}.tar.gz + akamai1.patch + akamai2.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -46,6 +48,12 @@ librtmp() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -md5sums="bcf4d0c3b8f34aedc29eb6283f97b1e7 rtmpdump-2.4_git20130304.tar.gz" -sha256sums="2022929fde03d2b097b330d2283349460e77c8fa097a117bf35f5aa4bf22151e rtmpdump-2.4_git20130304.tar.gz" -sha512sums="05f0698e62a2bde3be642e2a6fc9ced5ef89f7a1e4d5ab879805859e9f484ec0550694a9dd637d45b339311bbca2f81dfe9d913f774c201ff042511d909f0eb2 rtmpdump-2.4_git20130304.tar.gz" +md5sums="bcf4d0c3b8f34aedc29eb6283f97b1e7 rtmpdump-2.4_git20130304.tar.gz +3788679684481c05d544c2264236cd21 akamai1.patch +c9c0d09778fd781596affb6f950af9e3 akamai2.patch" +sha256sums="2022929fde03d2b097b330d2283349460e77c8fa097a117bf35f5aa4bf22151e rtmpdump-2.4_git20130304.tar.gz +d0261408b0093cfc2a3a0202adcf5a9d24b5241c792d40a81018f9cc56f133d6 akamai1.patch +fb0821c1502099f0bc50cabd260e08c1298a31f1f6345d60407233c66994a435 akamai2.patch" +sha512sums="05f0698e62a2bde3be642e2a6fc9ced5ef89f7a1e4d5ab879805859e9f484ec0550694a9dd637d45b339311bbca2f81dfe9d913f774c201ff042511d909f0eb2 rtmpdump-2.4_git20130304.tar.gz +37d433925cef893de38ad69250ae42ec148272e817d1ad8a4a12b608431fb35dbdf5687a524be6b65fa7a2a6b05146c0fbedaad0ebbd48248f5863ea817311ed akamai1.patch +8bfd526e8f53ff2505a56dbc5b1f9596ab838ebb996845b3d1005f0a0125e5e5775717dd1b1ea854a1f9fa5bb7608325fd972905b1b4c991d07880c38097b8c8 akamai2.patch" diff --git a/main/rtmpdump/akamai1.patch b/main/rtmpdump/akamai1.patch new file mode 100644 index 0000000000..9aa26facbc --- /dev/null +++ b/main/rtmpdump/akamai1.patch @@ -0,0 +1,28 @@ +http://lists.mplayerhq.hu/pipermail/rtmpdump/2012-December/002251.html + +From: Björn Axelsson <bjorn.axelsson at intinor.se> + +This was broken in e42b5d09. This makes adobe auth against +akamai servers work again. +--- + librtmp/rtmp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c +index b966710..d64a0bb 100644 +--- a/librtmp/rtmp.c ++++ b/librtmp/rtmp.c +@@ -2514,8 +2514,8 @@ PublisherAuth(RTMP *r, AVal *description) + #define RESPONSE_LEN 32 + #define CHALLENGE2_LEN 16 + #define SALTED2_LEN (32+8+8+8) +-#define B64DIGEST_LEN 22 /* 16 byte digest => 22 b64 chars */ +-#define B64INT_LEN 6 /* 4 byte int => 6 b64 chars */ ++#define B64DIGEST_LEN 24 /* 16 byte digest => 22 b64 chars + 2 chars padding */ ++#define B64INT_LEN 8 /* 4 byte int => 6 b64 chars + 2 chars padding */ + #define HEXHASH_LEN (2*MD5_DIGEST_LENGTH) + char response[RESPONSE_LEN]; + char challenge2[CHALLENGE2_LEN]; +-- +1.7.9.4 + diff --git a/main/rtmpdump/akamai2.patch b/main/rtmpdump/akamai2.patch new file mode 100644 index 0000000000..a4fc4720ac --- /dev/null +++ b/main/rtmpdump/akamai2.patch @@ -0,0 +1,28 @@ +http://lists.mplayerhq.hu/pipermail/rtmpdump/2012-December/002252.html + +Some servers (akamai) only include a 'challenge' parameter, no +'opaque' parameter, while others (wowza) include both 'opaque' +and 'challenge'. If 'opaque' is provided, it should be used here, +otherwise 'challenge', but never both. + +After this patch, adobe auth works against both wowza and akamai +servers. +--- + librtmp/rtmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c +index d64a0bb..7f1c7ff 100644 +--- a/librtmp/rtmp.c ++++ b/librtmp/rtmp.c +@@ -2609,7 +2609,7 @@ PublisherAuth(RTMP *r, AVal *description) + /* response = base64enc(md5(hash1 + opaque + challenge2)) */ + if (opaque.av_len) + MD5_Update(&md5ctx, opaque.av_val, opaque.av_len); +- if (challenge.av_len) ++ else if (challenge.av_len) + MD5_Update(&md5ctx, challenge.av_val, challenge.av_len); + MD5_Update(&md5ctx, challenge2, B64INT_LEN); + MD5_Final(md5sum_val, &md5ctx); +-- +1.7.9.4 diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD index 9b7f902d8d..b58047148e 100644 --- a/main/sdl/APKBUILD +++ b/main/sdl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sdl pkgver=1.2.15 -pkgrel=3 +pkgrel=4 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" url="http://www.libsdl.org" arch="all" diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD index bd4173b13e..5a7cb1e39b 100644 --- a/main/sircbot/APKBUILD +++ b/main/sircbot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sircbot -pkgver=0.2 -pkgrel=5 +pkgver=0.3 +pkgrel=0 pkgdesc="Minimalistic IRC bot" url="http://git.alpinelinux.org/cgit/sircbot/" arch="all" @@ -13,6 +13,7 @@ makedepends="lua-dev" install="$pkgname.pre-install" subpackages="lua-sircbot:luamod" source="http://git.alpinelinux.org/cgit/sircbot.git/snapshot/sircbot-$pkgver.tar.bz2 + disconnect-fix.patch sircbot.initd sircbot.confd " @@ -41,12 +42,15 @@ luamod() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -md5sums="a9d16db48c97ebfa30e1c84f37e70838 sircbot-0.2.tar.bz2 +md5sums="bad605639450640276341044f3d96190 sircbot-0.3.tar.bz2 +4ba720163ca111f1cb7c9c369a370e05 disconnect-fix.patch 1451771566a969550ef3c0ced26fc9bb sircbot.initd 8443ac189030c7b8beb8e579dc16ebc7 sircbot.confd" -sha256sums="572ee420fc7dbc4732c3d51841694f2b8800f22eea9909c9047c45b4eca847d8 sircbot-0.2.tar.bz2 +sha256sums="0631a74260ebb6698a58ea68067387c29d533c0db9ba7147b834a77a8758202d sircbot-0.3.tar.bz2 +61da3159e48426f04f1fb4df31420a3faa72b52b6fddb342709406f89025a554 disconnect-fix.patch f554417bd15db266ccf05f4f193ee45cb5a318230543a3fb39fb2b37a3050988 sircbot.initd b0bf9767150e486815aada1761b6fca7b7838df3045082ff8083167dbce613e6 sircbot.confd" -sha512sums="4afac87a63fe76314168fa363dee8766a03c85ae3cd603096e4f33b26823333a9dadf30e773af019d4c7c3bd83dce5838f967071c6393a02d844dc6a30768c7a sircbot-0.2.tar.bz2 +sha512sums="fe5a201fa92a25831e7107d8036f32e6b79d39814129f584e106484344e974037ddc016a5c3240a9c2a2540975b41356f80dba2507ee33750ce26ab751c201b8 sircbot-0.3.tar.bz2 +ab0102d04b42826102ee705dc2b4a3202391619b4df7365bda8cc47715a0537a1656bcc32869628e70aa3467837dd7a7ca6aac6843c3fd046aba7832fed91ed6 disconnect-fix.patch 00c8a90a0c12b052622b674bd81b426303a0a43cdf01c808e421938782074758ad6d3021165bb6fde49557b0a62d42bda62dd871c4d093f35b7adba1abc024cb sircbot.initd 315167ec664ce859908fcd230f6e0c604a0b02e56286156ba6ec76c32d6d514726acb493fe7a13b44d9255ec2e34fe4b2a6f02edf039b06e487cea6528d4d6a7 sircbot.confd" diff --git a/main/sircbot/disconnect-fix.patch b/main/sircbot/disconnect-fix.patch new file mode 100644 index 0000000000..523264a632 --- /dev/null +++ b/main/sircbot/disconnect-fix.patch @@ -0,0 +1,194 @@ +From 93d007481e25c9db88e8b16117b0378d51951bb6 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 07 Mar 2013 15:20:22 +0000 +Subject: fix segfault when IRC server does disconnect + +and fix lots of whitespace damage +--- +diff --git a/irc.c b/irc.c +index 92a925e..5832421 100644 +--- a/irc.c ++++ b/irc.c +@@ -14,11 +14,11 @@ static int tcp_connect(const char *host, int port) + struct sockaddr_in addr; + struct hostent *h; + int sock = socket(AF_INET, SOCK_STREAM, 0); +- if (sock < 0) ++ if (sock < 0) + return sock; + + h = gethostbyname(host); +- if (h == NULL) ++ if (h == NULL) + return -1; + + memset(&addr, 0, sizeof(addr)); +@@ -38,17 +38,17 @@ struct irc_session *irc_connect(const char* server, int port, const char *nick, + { + char buf[256]; + struct irc_session *sess; +- ++ + sess = malloc(sizeof(struct irc_session)); + if (sess == NULL) + return NULL; +- ++ + sess->nick = nick; + sess->server = server; + sess->fd = tcp_connect(server, port); +- if (sess->fd < 0) ++ if (sess->fd < 0) + return NULL; +- ++ + /* login */ + if (pass) + irc_send(sess, "PASS", pass); +@@ -79,7 +79,9 @@ int irc_send_ping(struct irc_session *s) + + int irc_close(struct irc_session *s, const char *msg) + { +- irc_send(s, "QUIT", msg ? msg : ""); +- close(s->fd); ++ if (s->fd > 0) { ++ irc_send(s, "QUIT", msg ? msg : ""); ++ close(s->fd); ++ } + free(s); + } +diff --git a/sircbot.c b/sircbot.c +index b85d7d0..7d9c1a3 100644 +--- a/sircbot.c ++++ b/sircbot.c +@@ -56,8 +56,8 @@ struct sircbot_socket_callback { + int (*callback)(struct sircbot_session *sb, struct pollfd *fds, + void *ctx); + }; +- +- ++ ++ + static int foreground = 0; + static int sigterm = 0; + static int flush_rate = 2; +@@ -90,7 +90,7 @@ int daemonize(const char *pidfile, const char *logfile) + /* exit parent */ + if (pid > 0) + exit(0); +- ++ + /* detatch to controling terminal */ + setsid(); + +@@ -220,10 +220,10 @@ int run_hooks(char *user, char *rcpt, char* data) + /* exit parent */ + if (pid > 0) + exit(0); +- ++ + snprintf(dir, sizeof(dir), "/etc/" PROGNAME ".d/%s", rcpt); + printf("DEBUG: running scripts in %s\n", dir); +- execlp("/bin/run-parts", "/bin/run-parts", "-a", user, ++ execlp("/bin/run-parts", "/bin/run-parts", "-a", user, + "-a", data, "-a", rcpt, dir, NULL); + log_err("run-parts"); + exit(1); +@@ -302,17 +302,21 @@ int parse_irc_data(struct sircbot_session *sb, char *buf) + } + + /* callback functions */ +-static int irc_server_cb(struct sircbot_session *sb, struct pollfd *fds, ++static int irc_server_cb(struct sircbot_session *sb, struct pollfd *fds, + void *ctx) + { + char buf[4096]; + int r; + struct irc_session *sess = (struct irc_session *) ctx; + +- if (fds->revents & POLLHUP) ++ if (fds->revents & POLLHUP) { + /* server hang up on us */ ++ printf("DEBUG: %s: connection closed\n", sess ? sess->server : "null"); ++ close(sess->fd); ++ sess->fd = -1; + return 0; +- ++ } ++ + if (fds->revents & POLLERR) { + log_err(sess->server); + return -1; +@@ -340,7 +344,7 @@ int channel_extend_fd_array(struct sircbot_channel *chan) + chan->fd_array[i] = -1; + return 0; + } +- ++ + + void channel_add_connection(struct sircbot_channel *chan, int fd) + { +@@ -428,7 +432,7 @@ static int irc_reset_pollfds(struct sircbot_session *sb, struct pollfd *fds, + fds[n].fd = sb->sess->fd; + fds[n].events = POLLIN; + fds[n].revents = 0; +- cb[n].context = NULL; ++ cb[n].context = sb->sess; + cb[n].callback = &irc_server_cb; + n++; + +@@ -474,18 +478,24 @@ static int send_fifo_queue(struct irc_session *sess, + return r; + } + +-static void join_channels(struct sircbot_session *sb) ++static int join_channels(struct sircbot_session *sb) + { + time_t now = time(NULL); + int i; + /* wait atleast 5 secs before we join a channel */ + for (i = 0; i < sb->numchan; i++) +- if ((now - sb->chan[i].last_closetime) > 5 +- && sb->chan[i].listen_fd < 0) { ++ if ((now - sb->chan[i].last_closetime) > 5 ++ && sb->chan[i].listen_fd < 0 && sb->sess != NULL) { ++ int r = 0; + printf("DEBUG: joining %s\n", sb->chan[i].name); + sb->chan[i].last_closetime = now; +- irc_send(sb->sess, "JOIN", sb->chan[i].name); ++ r = irc_send(sb->sess, "JOIN", sb->chan[i].name); ++ if (r < 0) { ++ printf("DEBUG: error %s: %s\n", sb->sess->server, strerror(r)); ++ return r; ++ } + } ++ return 0; + } + + static int irc_loop(struct sircbot_session *sb) +@@ -504,7 +514,8 @@ static int irc_loop(struct sircbot_session *sb) + tv.tv_sec = 1; + tv.tv_nsec = 0; + while (!sigterm) { +- join_channels(sb); ++ if (join_channels(sb) < 0) ++ goto ret_err; + n = irc_reset_pollfds(sb, fds, cbs, maxfds); + r = ppoll(fds, n, &tv, &sigmask); + if (r < 0) { +@@ -633,11 +644,11 @@ int main(int argc, char *argv[]) + sleep(10); + continue; + } +- ++ + irc_loop(&sb); + irc_close(sb.sess, "bye"); + /* reset channel sockets */ +- for (i = 0; i < argc; i++) ++ for (i = 0; i < argc; i++) + close_channel_socket(&sb.chan[i], 0); + if (sigterm) + break; +-- +cgit v0.9.0.3 diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD index d612b0b06e..856f36c0ce 100644 --- a/main/snort/APKBUILD +++ b/main/snort/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=snort -pkgver=2.9.4 +pkgver=2.9.4.1 pkgrel=0 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" @@ -75,7 +75,15 @@ package() { touch "$pkgdir"/var/lib/snort/rules/black_list.rules } -md5sums="e79ee6b4fbb32edc5dfed2d7dfcc6813 snort-2.9.4.tar.gz +md5sums="0506bf9a3245a909d036efbdd8ce9591 snort-2.9.4.1.tar.gz 6a8b6d9c00971d419f0c1ea036c76ea4 automake.patch b65d10cce3e79f38aa6fb5e0aa494144 snort.initd 446f8d2b3435b8a6be738da978670605 snort.confd" +sha256sums="2f42256e9f4b613201ea79e5af54b645a8ab029972b23f6fbc649eb00e6f1dae snort-2.9.4.1.tar.gz +b6d1b0affb4056f1eb6dbfc375dbbe52d943ca7f79228aa92c0bfac9ee84f025 automake.patch +6fc40466781dcae894f9ac1447feac9d33bc548a39cb78c19ee1dad2639a93b6 snort.initd +d504cb31ffcce9acc8fc7b68123a31a53b491444c52730339ea9a4e986521f71 snort.confd" +sha512sums="c9b84f4a03ba0c074f84edd0243cf582c5dbac41bbe054b9f5cd114bd28e2bc9a1b98fc4e2ff1ce2bd6fafb1af2353c09326adeccbfe14013aba25ccd339f8d0 snort-2.9.4.1.tar.gz +2c60d48feebe5c8755aaad4ce6dc1b95ba1cec0d340506007bb489bb578bf1e24d5ade8492f9108efc5ea62be9d5fe6deffdafc88e607cf4386a8c6adf1868b1 automake.patch +0f796d826cbc736558783c6d31c2573343984c87480c6476db3723ba1a8d28f93e445f850febd67a0dbd11ea558ef1161121ad4a3145f73af7eb30d7702e0b6b snort.initd +abc0846ea6e08029c772f24e213f211a39219701e6e2c8b3aa112632318479db7b21014c5f2c4987cb2981cafce0ea744549c3ce754e9145cba9ec5604ae66f3 snort.confd" diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index 31de74bf8c..eee32c0144 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.8.6_p6 +pkgver=1.8.6_p7 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else @@ -46,5 +46,9 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="394efcbfedb200ba188958f047ce76d2 sudo-1.8.6p6.tar.gz +md5sums="126abfa2e841139e774d4c67d80f0e5b sudo-1.8.6p7.tar.gz 429d9613091f1f3f19ce8def5b3032b3 libcrypt.patch" +sha256sums="301089edb22356f59d097f6abbe1303f03927a38691b02959d618546c2125036 sudo-1.8.6p7.tar.gz +80d16a0b4ee7b97eed6806c4cf2c1b04c9d2ae3ec550bc97ed44ff6db8c8d556 libcrypt.patch" +sha512sums="732bcbd53b77d329bbc77d3cd3644a595e938433053122fe3098385c0ad3a6a9cf4f4ab8709c7a79cad51dba77ffaa1be9ffde8e8834d3798822a1bd5b518d42 sudo-1.8.6p7.tar.gz +e4b236c2ee47e01222eed98c401861336d49a0c74a28219972c68763a4c9233a010b315850f9f2f4396205dc21c4ce4eeb5c95101464f4f3040b70d25bd2116c libcrypt.patch" diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD index 97e98a5212..9005a8d9b8 100644 --- a/main/tinc/APKBUILD +++ b/main/tinc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tinc -pkgver=1.0.19 +pkgver=1.0.20 pkgrel=0 pkgdesc="tinc is a Virtual Private Network (VPN) daemon" url="http://www.tinc-vpn.org/" @@ -45,7 +45,15 @@ package() { "$pkgdir"/etc/conf.d/tinc.networks } -md5sums="5d97ee0f1ccf8fea5b492f6b54d5ac32 tinc-1.0.19.tar.gz +md5sums="001277e0ccd7ca29f7fa4039774ad611 tinc-1.0.20.tar.gz 411a260ed9bb1fc441444c3efbeafd7b tincd.initd b95471eab010c0ed002cf3d16a009ced tincd.lo.initd 475d64d9aa410ec7e91f5b079800abc9 tinc.networks" +sha256sums="62230cdfcb9c3218df0be53b2e3a268a595d28b25dcb1ba190d25db91ae3d132 tinc-1.0.20.tar.gz +0e8a18f9af03d967b30eac2c1de5d233449fae8a97342cdb88bf60e6b3867e73 tincd.initd +bd0909202c2f5b6fb0d97cac4f7f02a392393acd4b300a04db3a5416f4345035 tincd.lo.initd +7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad tinc.networks" +sha512sums="54f974aa9afd66f76cb068f2b7ac4fe349f55f6233a3d129d44a9c9569ac9233e1610f8cf9e2161878bbfe4053beabe43591438f4cb3bd505b14bb6d61db6511 tinc-1.0.20.tar.gz +4a5da677d030dd24d347a86e7e892ea9aab57c2b4de8c9fa6ef576e239e4169f3ee6934162edc004a00678405f199606f05c173dd1ff94ee2f711536b1dfc072 tincd.initd +63df032f815b4a1e84c972e4cbfe115eda9fb80419b21d72811a947a8c9742f51442b5a06b0dbd220eb9a673b115fe62972019bdd4bac5855a36908c68bf5638 tincd.lo.initd +f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135 tinc.networks" diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 1c62e89ca6..4afb0261f4 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -3,7 +3,7 @@ pkgname=vlc pkgver=2.0.5 _pkgver=${pkgver/_/-} -pkgrel=2 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" pkgusers="vlc" pkggroups="vlc" diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD index 6b958351c0..42e0d14098 100644 --- a/main/webkitgtk/APKBUILD +++ b/main/webkitgtk/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkitgtk pkgver=1.10.2 -pkgrel=0 +pkgrel=1 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" arch="all" diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD index 4f950cd64f..072352fd8f 100644 --- a/main/wget/APKBUILD +++ b/main/wget/APKBUILD @@ -6,28 +6,32 @@ pkgrel=0 pkgdesc="A network utility to retrieve files from the Web" url="http://www.gnu.org/software/wget/wget.html" arch="all" -license="GPL3" -depends= +license="GPL3+" +depends="" makedepends="openssl-dev" subpackages="$pkgname-doc" install="wget.post-deinstall" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr \ + cd "$_builddir" + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --with-ssl=openssl \ - --disable-nls + --disable-nls \ + || return 1 make || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 } md5sums="12edc291dba8127f2e9696e69f36299e wget-1.14.tar.gz" +sha256sums="f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269 wget-1.14.tar.gz" +sha512sums="e01291318b44ee1022e39589933411c453372e8026b1641dd7caa1adb132c94bdcf6f6ff291f4b6dc2b46eb0e48c80c60231cd86247db17954ee73053422cb27 wget-1.14.tar.gz" diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index c5cee87bf9..a7c2da0a6a 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.5.24 +pkgver=1.5.25 _ver=${pkgver/_/-} pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" @@ -49,4 +49,6 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="d65a64799a815de7864c27660a9307ab wine-1.5.24.tar.bz2" +md5sums="840f6d46c360d8df1a0efb98cf41ce92 wine-1.5.25.tar.bz2" +sha256sums="3d93266fbc1bf04fbe28c0028d436610273413884ceeba47c8f8811db6cf2220 wine-1.5.25.tar.bz2" +sha512sums="7a7944afcc925d9de4a6aaea5e47f6ae86304e59ffe7476a936f3a329104558ebb8b7f4ffd1510ac0c6601d53bb63349a8ec282547bf2a3b6027e8a1b8420289 wine-1.5.25.tar.bz2" diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD index ac59ea3457..68163531c6 100644 --- a/main/wipe/APKBUILD +++ b/main/wipe/APKBUILD @@ -3,10 +3,10 @@ pkgname=wipe pkgver=0.22 pkgrel=0 -pkgdesc="tool for securely erasing files from magnetic media" +pkgdesc="A tool for securely erasing files from magnetic media" url="http://lambda-diode.com/software/wipe/" arch="all" -license="GPL" +license="GPL2" depends="" depends_dev="" makedepends="$depends_dev" diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index 97947daf81..06a27fd414 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wireshark -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=0 pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" @@ -77,6 +77,12 @@ tshark() { mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark } -md5sums="fde40a8d4555cab12271e67f9778f5d5 wireshark-1.8.5.tar.bz2 +md5sums="317361e701936c72f7f18f857059b944 wireshark-1.8.6.tar.bz2 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop e771800a8c977fe223583a453bc27397 wireshark.png" +sha256sums="2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea wireshark-1.8.6.tar.bz2 +10c8b5bdd1d161454c93df166f39b2bae72efe6021beb61d84dd65dc329260fe wireshark.desktop +a9f6d78dd64a87acd1b600222156b9fc26e7ccbbc43fc77c1da138908bdb2d3c wireshark.png" +sha512sums="d130c615d950875c3e119edda8a5c6842fe48d57c77bf8cb8751354455fc1bac3c6c6d65b0f76be6a83e4350eed85337ffcad6d006c95fc713db9afe172e9b16 wireshark-1.8.6.tar.bz2 +6e1eab7793a97377017be9126b7d25bd9c10d2b0e06be1e83e66ac2ea64dce5c4f8f7783d483921867241d298eb0ac82ff3f9910e90c2065125bff9a3856f52e wireshark.desktop +b421575dbc3d496a8c3d5485929c161c06d3403bff2fef4f1db07b1db729ca173c6e89cb648d127c02800359975d5e0880c344dc58fa9d24dde570a862bdd7d4 wireshark.png" diff --git a/main/xbmc/APKBUILD b/main/xbmc/APKBUILD index c8d4987b8e..c7faa3ac9f 100644 --- a/main/xbmc/APKBUILD +++ b/main/xbmc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=xbmc pkgver=12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A software media player and entertainment hub for digital media" url="http://xbmc.org" arch="x86_64 x86" diff --git a/main/xdriinfo/APKBUILD b/main/xdriinfo/APKBUILD index a6344c1dd9..07368425ec 100644 --- a/main/xdriinfo/APKBUILD +++ b/main/xdriinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdriinfo pkgver=1.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="query configuration information of DRI drivers" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD index 392ffdbb88..45bf148881 100644 --- a/main/xf86-input-evdev/APKBUILD +++ b/main/xf86-input-evdev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-input-evdev pkgver=2.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.org evdev input driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-input-keyboard/APKBUILD b/main/xf86-input-keyboard/APKBUILD index 9beb9680a3..8cfeb5b59a 100644 --- a/main/xf86-input-keyboard/APKBUILD +++ b/main/xf86-input-keyboard/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-input-keyboard pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.org keyboard input driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-input-mouse/APKBUILD b/main/xf86-input-mouse/APKBUILD index 8f22cca8b9..5c36260bca 100644 --- a/main/xf86-input-mouse/APKBUILD +++ b/main/xf86-input-mouse/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-input-mouse pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org mouse input driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD index 8426b92c0f..428f9667ae 100644 --- a/main/xf86-input-synaptics/APKBUILD +++ b/main/xf86-input-synaptics/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-input-synaptics pkgver=1.6.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.org synaptics input driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-input-vmmouse/APKBUILD b/main/xf86-input-vmmouse/APKBUILD index 2439c6bf72..aaf6ae595f 100644 --- a/main/xf86-input-vmmouse/APKBUILD +++ b/main/xf86-input-vmmouse/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-input-vmmouse pkgver=13.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="X.org VMware mouse input driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD index 1c899f4f06..b62539ddae 100644 --- a/main/xf86-video-apm/APKBUILD +++ b/main/xf86-video-apm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-apm pkgver=1.2.5 -pkgrel=1 +pkgrel=3 pkgdesc="Alliance ProMotion video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,6 +12,7 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch " prepare() { @@ -37,4 +38,9 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="bce02d48c66932d082786167af22835a xf86-video-apm-1.2.5.tar.bz2" +md5sums="bce02d48c66932d082786167af22835a xf86-video-apm-1.2.5.tar.bz2 +8be9e7447c739b7cf9a80ea8ce9da852 mibstore.patch" +sha256sums="953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f xf86-video-apm-1.2.5.tar.bz2 +be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b mibstore.patch" +sha512sums="652307d5e21fcd0df890b941821f409cc0c9846133cf7e522799710d28ebf0d8ff2d8ead3235d8207169f416a6561bc14b4fedb1baaddb1bddf03007372af622 xf86-video-apm-1.2.5.tar.bz2 +f27a8f9f3206de54ce9f05596d78829832e7576b5d515d22b0052e39c70fef63e85f016c2c1dfad45aa6d09cb59582d101854552fc44970275f1b38688924d52 mibstore.patch" diff --git a/main/xf86-video-apm/mibstore.patch b/main/xf86-video-apm/mibstore.patch new file mode 100644 index 0000000000..e48d2c42d8 --- /dev/null +++ b/main/xf86-video-apm/mibstore.patch @@ -0,0 +1,23 @@ +From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:03:29 +0000 +Subject: Remove #include "mibstore.h" + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/apm.h b/src/apm.h +index a3c06f8..365e5e2 100644 +--- a/src/apm.h ++++ b/src/apm.h +@@ -33,9 +33,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* I2C support */ + #include "xf86i2c.h" + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD index 18cabcd718..32e0cd093f 100644 --- a/main/xf86-video-ark/APKBUILD +++ b/main/xf86-video-ark/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ark pkgver=0.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for ark cards" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,34 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="2e9809b5ae3f01a56be0d6e5441da03c xf86-video-ark-0.7.5.tar.bz2" +md5sums="2e9809b5ae3f01a56be0d6e5441da03c xf86-video-ark-0.7.5.tar.bz2 +d4625a8bf75d55959faebadcae02e3e4 mibstore.patch" +sha256sums="c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +32130c11a9af2d125a8376c0fc5cc7a94ecec5b88f33005ec9cc54423feeffb9 mibstore.patch" +sha512sums="67c2b4e2109bf9d84a007c9679d35e7c0a4e4ddcdb7be9fa5070ce7e2f666e018d8421ddd4890cf3abb4eb37e060a10666c62a9efbb5369eb7cd8647ee18a644 xf86-video-ark-0.7.5.tar.bz2 +f7ef3d7003e75ae6d27f4ec1100e6cb42546f3dd5871a2d92ad779909ebd1243976679f14e1a8443ba17bb3cd36fa755cdbda4be3627a49af0033513309ad6bb mibstore.patch" diff --git a/main/xf86-video-ark/mibstore.patch b/main/xf86-video-ark/mibstore.patch new file mode 100644 index 0000000000..2bc41a73af --- /dev/null +++ b/main/xf86-video-ark/mibstore.patch @@ -0,0 +1,18 @@ +--- ./src/ark_driver.c.orig 2013-03-07 10:16:06.584081552 +0000 ++++ ./src/ark_driver.c 2013-03-07 10:16:23.270892075 +0000 +@@ -39,7 +39,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "ark.h" + +@@ -538,7 +537,6 @@ + + fbPictureInit (pScreen, 0, 0); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + if (!pARK->NoAccel) { diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD index c23031b6a3..d770103958 100644 --- a/main/xf86-video-ast/APKBUILD +++ b/main/xf86-video-ast/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ast pkgver=0.97.0 -pkgrel=1 +pkgrel=3 pkgdesc="X.Org driver for ASpeedTech cards" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,34 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="2b630ed7d7864045b324b39cd58da367 xf86-video-ast-0.97.0.tar.bz2" +md5sums="2b630ed7d7864045b324b39cd58da367 xf86-video-ast-0.97.0.tar.bz2 +cf7f0346da96567652f89f367136b1dc mibstore.patch" +sha256sums="28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76 xf86-video-ast-0.97.0.tar.bz2 +f28cb96f3de6089880b7e04572f6fa6d6cfa149718569bfc2389090677af5e7c mibstore.patch" +sha512sums="7eadb06c0159d460977b6e99183e6f1c4673f18b26072d9c28fc38518522fe9adade89531a42d83e277d545a3f157c37c6600b0330bb90327c1a17b5698fa22d xf86-video-ast-0.97.0.tar.bz2 +5d7af51fa6939c062d0e5e21938a9df79c06e79bba7b7940d2dacc56c40c78819390004b704a30e21cd054a2590ae21274645e53ffbc2d0340f0a8e5b7aad5de mibstore.patch" diff --git a/main/xf86-video-ast/mibstore.patch b/main/xf86-video-ast/mibstore.patch new file mode 100644 index 0000000000..006daaa135 --- /dev/null +++ b/main/xf86-video-ast/mibstore.patch @@ -0,0 +1,101 @@ +From 0833e0086b9712b1c29571919899d5d17fea8382 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:33 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c +index 6be9a4f..684e400 100644 +--- a/src/ast_2dtool.c ++++ b/src/ast_2dtool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_accel.c b/src/ast_accel.c +index a789b21..0e7e5d3 100644 +--- a/src/ast_accel.c ++++ b/src/ast_accel.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_cursor.c b/src/ast_cursor.c +index 47ea09d..c672564 100644 +--- a/src/ast_cursor.c ++++ b/src/ast_cursor.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_driver.c b/src/ast_driver.c +index 5e6a26e..43fcdbc 100644 +--- a/src/ast_driver.c ++++ b/src/ast_driver.c +@@ -31,7 +31,6 @@ + #endif + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +@@ -888,7 +887,6 @@ ASTScreenInit(SCREEN_INIT_ARGS_DECL) + } + #endif /* end of Accel_2D */ + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/ast_mode.c b/src/ast_mode.c +index 50289f1..2e06062 100644 +--- a/src/ast_mode.c ++++ b/src/ast_mode.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_tool.c b/src/ast_tool.c +index c701c1e..c2bfac6 100644 +--- a/src/ast_tool.c ++++ b/src/ast_tool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c +index 42de52c..513cf7b 100644 +--- a/src/ast_vgatool.c ++++ b/src/ast_vgatool.c +@@ -27,7 +27,6 @@ + #include "xf86_OSproc.h" + #include "xf86cmap.h" + #include "compiler.h" +-#include "mibstore.h" + #include "vgaHW.h" + #include "mipointer.h" + #include "micmap.h" +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD index 5b0d0e5889..2244e59dd1 100644 --- a/main/xf86-video-ati/APKBUILD +++ b/main/xf86-video-ati/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ati pkgver=7.1.0 -pkgrel=0 +pkgrel=2 pkgdesc="ATI video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD index e97560b254..9b739621a9 100644 --- a/main/xf86-video-chips/APKBUILD +++ b/main/xf86-video-chips/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-chips pkgver=1.2.5 -pkgrel=1 +pkgrel=3 pkgdesc="Chips and Technologies video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,6 +12,7 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch iopl.h" prepare() { @@ -37,4 +38,11 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } md5sums="56be62612f98a0cf469a2a78c0a14ed5 xf86-video-chips-1.2.5.tar.bz2 +d778298220dd261af852b50d986f72ca mibstore.patch e4a7c922ab37bb4c8f44f731c9bec911 iopl.h" +sha256sums="8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2 xf86-video-chips-1.2.5.tar.bz2 +36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804 mibstore.patch +d04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670 iopl.h" +sha512sums="3468d453fb3bc01b115d0a4a9f10bebe43b89c9cd997e2991d459a40a2f8a0e3ed2cb40bfcb2b80fae853af8c9ea6a94c82d73d16a27fe9612c8a1f2a6fbd3d4 xf86-video-chips-1.2.5.tar.bz2 +b2ef8a538fd5764d072a1310f80bd1f7f7886adf5ffcacf1f2dcc58b054e91ad88a9aad262e8c5494ee4d29471d0e771bd8792f4760680efa16f6d177a932f44 mibstore.patch +9fc3dbf8325425b755b08e9478225872468cacda5c97a2eb0c987bf0c726ca89d559d8db9d00ac372c52b8bd55912a9fa20f60eb4bdd2a2df093857a0023714c iopl.h" diff --git a/main/xf86-video-chips/mibstore.patch b/main/xf86-video-chips/mibstore.patch new file mode 100644 index 0000000000..bfd94181e9 --- /dev/null +++ b/main/xf86-video-chips/mibstore.patch @@ -0,0 +1,39 @@ +From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:34 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6f3a5d4..effbc60 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -96,9 +96,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-cirrus/APKBUILD b/main/xf86-video-cirrus/APKBUILD index 224e7d0c66..eb9f038135 100644 --- a/main/xf86-video-cirrus/APKBUILD +++ b/main/xf86-video-cirrus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-cirrus pkgver=1.5.2 -pkgrel=0 +pkgrel=1 pkgdesc="Cirrus Logic video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD index 1a5814ed2f..7d08b9602b 100644 --- a/main/xf86-video-dummy/APKBUILD +++ b/main/xf86-video-dummy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-dummy pkgver=0.3.6 -pkgrel=1 +pkgrel=3 pkgdesc="X.Org driver for dummy cards" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,34 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto xf86dgaproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="dc40aebf031f933523dcf101befe99e4 xf86-video-dummy-0.3.6.tar.bz2" +md5sums="dc40aebf031f933523dcf101befe99e4 xf86-video-dummy-0.3.6.tar.bz2 +c60006edbfd14b36c285fd760ec53c44 mibstore.patch" +sha256sums="44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798 xf86-video-dummy-0.3.6.tar.bz2 +06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb mibstore.patch" +sha512sums="3a530083d591ebde37b58a329d9a6ed4955d09d8f3f7fb566840681f2588aa752014c8753f411aec0410a2704b3b55729868a27aee138df42eb7d7bb5a5a52c5 xf86-video-dummy-0.3.6.tar.bz2 +c141a4f316b67f06d07318af312c2a37c764b34ea6fdd17413a2e08e4f2e4e817499bea3bbbbf894fc4c08e74f721e3c640a300a8eb052b5b733b5142392c2ac mibstore.patch" diff --git a/main/xf86-video-dummy/mibstore.patch b/main/xf86-video-dummy/mibstore.patch new file mode 100644 index 0000000000..4b0b46ef30 --- /dev/null +++ b/main/xf86-video-dummy/mibstore.patch @@ -0,0 +1,31 @@ +From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:36 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/dummy_driver.c b/src/dummy_driver.c +index 62066d6..6062c39 100644 +--- a/src/dummy_driver.c ++++ b/src/dummy_driver.c +@@ -14,9 +14,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi colormap manipulation need this */ + #include "micmap.h" + +@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) + , lines - pScrn->virtualY); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD index 1ac6d8265c..b20df67bed 100644 --- a/main/xf86-video-fbdev/APKBUILD +++ b/main/xf86-video-fbdev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-fbdev pkgver=0.4.3 -pkgrel=1 +pkgrel=3 pkgdesc="video driver for framebuffer device" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,35 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="1d99f1dfb3f0fea077b6b61caa3dc85a xf86-video-fbdev-0.4.3.tar.bz2" +md5sums="1d99f1dfb3f0fea077b6b61caa3dc85a xf86-video-fbdev-0.4.3.tar.bz2 +9defb13a8fcb51a2ffcec786b36766b3 mibstore.patch" +sha256sums="ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831 xf86-video-fbdev-0.4.3.tar.bz2 +4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321 mibstore.patch" +sha512sums="0e29c3aab44246f53cdd74cc3236ebc705f0aedd496803f91e83c12dc2e31c52aac9bd86061667fb827b822a70262dd340153bafce706669b49fb1bf00d2e844 xf86-video-fbdev-0.4.3.tar.bz2 +5e26f59cdf4b1d2fbd807a5f3612f303b87f01dc220a5c7963bf906eae833e4d88c2787f2e01ed9fd1a355a4cdd38a5aee79e3923508d2558f6ff64255c51fcb mibstore.patch" diff --git a/main/xf86-video-fbdev/mibstore.patch b/main/xf86-video-fbdev/mibstore.patch new file mode 100644 index 0000000000..138d5bc2a1 --- /dev/null +++ b/main/xf86-video-fbdev/mibstore.patch @@ -0,0 +1,29 @@ +From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:37 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/fbdev.c b/src/fbdev.c +index cd7ebc5..f5a7378 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -14,7 +14,6 @@ + #include "xf86_OSproc.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" +@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) + } + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD index ccff5779c6..1243689be1 100644 --- a/main/xf86-video-geode/APKBUILD +++ b/main/xf86-video-geode/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-geode pkgver=2.11.14 -pkgrel=0 +pkgrel=2 pkgdesc="AMD Geode GX and LX video driver" url="http://xorg.freedesktop.org/" arch="x86" @@ -11,7 +11,7 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto xf86dgaproto" -patches="" +patches="mibstore.patch" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 $patches" @@ -36,4 +36,9 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="c9a4e1c5438240e5bdce332f92df9163 xf86-video-geode-2.11.14.tar.bz2" +md5sums="c9a4e1c5438240e5bdce332f92df9163 xf86-video-geode-2.11.14.tar.bz2 +241b9d715ad8e22e8d556b5cf6d4dd07 mibstore.patch" +sha256sums="4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc xf86-video-geode-2.11.14.tar.bz2 +f5958126b5361b856607fb0c575086f18f148bfff97ae11ed83638fcecb0c69d mibstore.patch" +sha512sums="d974bb0b00d09c0c3454ccf5363838acc8c3baa62daf8664f1bf310177c23997924db9adcf57323c355f7add43a0560fb54f3ede97e4ed11082d0c793312559b xf86-video-geode-2.11.14.tar.bz2 +b2757d5647c79e94f5c77604941fb059ffe570b84d04b1d76fd53b7200deade837d6c805196e1a306d7bc2ae512d868b7f87ccfbdce164b11c0fd68af2c071a0 mibstore.patch" diff --git a/main/xf86-video-geode/mibstore.patch b/main/xf86-video-geode/mibstore.patch new file mode 100644 index 0000000000..b34ba9c76a --- /dev/null +++ b/main/xf86-video-geode/mibstore.patch @@ -0,0 +1,46 @@ +From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:16:26 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/geode_driver.c b/src/geode_driver.c +index b27bfd5..9cd0af9 100644 +--- a/src/geode_driver.c ++++ b/src/geode_driver.c +@@ -59,8 +59,6 @@ + /* Machine independent stuff */ + #include "mipointer.h" + #include "micmap.h" +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "vgaHW.h" + #include "vbe.h" + +diff --git a/src/gx_driver.c b/src/gx_driver.c +index 5268f29..7f44e19 100644 +--- a/src/gx_driver.c ++++ b/src/gx_driver.c +@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pGeode->NoAccel) + GXAccelInit(pScrn); + +- miInitializeBackingStore(pScrn); + xf86SetBackingStore(pScrn); + + /* Set up the soft cursor */ +diff --git a/src/lx_driver.c b/src/lx_driver.c +index 6d7f37f..146578e 100644 +--- a/src/lx_driver.c ++++ b/src/lx_driver.c +@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pGeode->NoAccel) + pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE; + +- miInitializeBackingStore(pScrn); + xf86SetBackingStore(pScrn); + + /* Set up the soft cursor */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD index 087d158845..079bd2c7c9 100644 --- a/main/xf86-video-glint/APKBUILD +++ b/main/xf86-video-glint/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-glint pkgver=1.2.8 -pkgrel=1 +pkgrel=4 pkgdesc="GLINT/Permedia video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,19 +12,35 @@ 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" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="775579c67dc55ff4909de3638bafd19f xf86-video-glint-1.2.8.tar.bz2" +md5sums="775579c67dc55ff4909de3638bafd19f xf86-video-glint-1.2.8.tar.bz2 +9afce8beedb2335e297c58471a4184fa mibstore.patch" +sha256sums="657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221 xf86-video-glint-1.2.8.tar.bz2 +8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231 mibstore.patch" +sha512sums="ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468 xf86-video-glint-1.2.8.tar.bz2 +f482f2ee1ccf089250be3c1f9b80cde90253a482891e177595a3331acd0cac9f0faf1e58382dc3d03c4c02638096fae8d767d46a9b51c35b5adce40c6e6ce767 mibstore.patch" diff --git a/main/xf86-video-glint/mibstore.patch b/main/xf86-video-glint/mibstore.patch new file mode 100644 index 0000000000..6bc5738c80 --- /dev/null +++ b/main/xf86-video-glint/mibstore.patch @@ -0,0 +1,30 @@ +From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:38 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/glint_driver.c b/src/glint_driver.c +index b6d20a9..aa78516 100644 +--- a/src/glint_driver.c ++++ b/src/glint_driver.c +@@ -52,8 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + +-#include "mibstore.h" +- + #include "pm3_regs.h" + #include "glint_regs.h" + #include "IBM.h" +@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD index e29d8809f5..263a0a49ef 100644 --- a/main/xf86-video-i128/APKBUILD +++ b/main/xf86-video-i128/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-i128 pkgver=1.3.6 -pkgrel=1 +pkgrel=3 pkgdesc="Number 9 I128 video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,35 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="0b0d365dce2c567b807562a32f7fe66e xf86-video-i128-1.3.6.tar.bz2" +md5sums="0b0d365dce2c567b807562a32f7fe66e xf86-video-i128-1.3.6.tar.bz2 +01ba59049028fd4c65d620fb898a23e8 mibstore.patch" +sha256sums="f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c xf86-video-i128-1.3.6.tar.bz2 +a33da9fb125697fa9c3178bfa11f40f88f69947cd0934ac37139ba1c1a950d52 mibstore.patch" +sha512sums="688956107fe473941da9d22914dc1aa1889b8a1bb75678692d40630396eca5426a4506bb0a536c48b6ed7a2b580a80af5b8b5d3199e2b04d8f24c404f60d3c34 xf86-video-i128-1.3.6.tar.bz2 +3cfe390f1f812250ed3abde0dc8bd699419bf71d6642328d69163012b813906b995acf942c31febe6fc6909109181436e1c7dfcb74d08feae6c9b7434ea63df9 mibstore.patch" diff --git a/main/xf86-video-i128/mibstore.patch b/main/xf86-video-i128/mibstore.patch new file mode 100644 index 0000000000..b42a6c8f1f --- /dev/null +++ b/main/xf86-video-i128/mibstore.patch @@ -0,0 +1,30 @@ +From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:40 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/i128_driver.c b/src/i128_driver.c +index a0f08c0..51a4135 100644 +--- a/src/i128_driver.c ++++ b/src/i128_driver.c +@@ -50,8 +50,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "micmap.h" + + #include "xf86DDC.h" +@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) + return FALSE; + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD index 24e98cde8a..bfa9958a32 100644 --- a/main/xf86-video-i740/APKBUILD +++ b/main/xf86-video-i740/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-i740 pkgver=1.3.4 -pkgrel=1 +pkgrel=3 pkgdesc="Intel i740 video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,35 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="11c0aa1036ba8c203a03d1f00bbec195 xf86-video-i740-1.3.4.tar.bz2" +md5sums="11c0aa1036ba8c203a03d1f00bbec195 xf86-video-i740-1.3.4.tar.bz2 +3a2b499ce4d6dc54f2ce0c306ab1ebb0 mibstore.patch" +sha256sums="1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78 xf86-video-i740-1.3.4.tar.bz2 +2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca mibstore.patch" +sha512sums="0440bdb891af02fabf10b92c0c7a0013140aeee82c80d2daf42291fff8fda96824889dd2d36338d032db7ac5b8e0691bf86d64c7cef3f51fbdb7b344ffff997d xf86-video-i740-1.3.4.tar.bz2 +e2f179d7e86e7a90cd34bd0bd60061cedf493c2cdf23354a8550b952e15bfef987c61db86ab5c03e57a438cad2bbc02fb0089c86990a81c3928089319197b57c mibstore.patch" diff --git a/main/xf86-video-i740/mibstore.patch b/main/xf86-video-i740/mibstore.patch new file mode 100644 index 0000000000..a33dc7e3db --- /dev/null +++ b/main/xf86-video-i740/mibstore.patch @@ -0,0 +1,32 @@ +From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:21:52 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/i740_driver.c b/src/i740_driver.c +index 1c82198..7c1051d 100644 +--- a/src/i740_driver.c ++++ b/src/i740_driver.c +@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD index f0534e9b9d..f229e7be4b 100644 --- a/main/xf86-video-intel/APKBUILD +++ b/main/xf86-video-intel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-intel pkgver=2.21.3 -pkgrel=0 +pkgrel=2 pkgdesc="X.Org driver for Intel cards" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-mach64/APKBUILD b/main/xf86-video-mach64/APKBUILD index ea29e42f9d..a8e0ea2755 100644 --- a/main/xf86-video-mach64/APKBUILD +++ b/main/xf86-video-mach64/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-mach64 pkgver=6.9.4 -pkgrel=0 +pkgrel=2 pkgdesc="ATI Mach64 video driver" url="http://xorg.freedesktop.org/" arch="" diff --git a/main/xf86-video-nouveau/APKBUILD b/main/xf86-video-nouveau/APKBUILD index a19736d08e..51f22538b6 100644 --- a/main/xf86-video-nouveau/APKBUILD +++ b/main/xf86-video-nouveau/APKBUILD @@ -2,7 +2,7 @@ pkgname=xf86-video-nouveau #_gitdate=20111010 pkgver=1.0.6 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source X.org drivers for nVidia video cards" url="http://nouveau.freedesktop.org/" arch="all" diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD index b24a9ef70f..9c09007816 100644 --- a/main/xf86-video-nv/APKBUILD +++ b/main/xf86-video-nv/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-nv pkgver=2.1.20 -pkgrel=1 +pkgrel=3 pkgdesc="Nvidia video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,35 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="e263dd0cd149b5224e92baa5a227bb00 xf86-video-nv-2.1.20.tar.bz2" +md5sums="e263dd0cd149b5224e92baa5a227bb00 xf86-video-nv-2.1.20.tar.bz2 +855434c62515bc1f619788a4472e13de mibstore.patch" +sha256sums="8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf xf86-video-nv-2.1.20.tar.bz2 +0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46 mibstore.patch" +sha512sums="f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373 xf86-video-nv-2.1.20.tar.bz2 +f63c1803b3c7f0b6326ca85ba36b3953c0c856d698574265334ab038d9d8d783ec9ee4f8a88095b3f5163a78a4fbe3443d349cc71ef2cf84e7a04f5f25f7fbd8 mibstore.patch" diff --git a/main/xf86-video-nv/mibstore.patch b/main/xf86-video-nv/mibstore.patch new file mode 100644 index 0000000000..ef5a4f2d9d --- /dev/null +++ b/main/xf86-video-nv/mibstore.patch @@ -0,0 +1,81 @@ +From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:49 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/g80_driver.c b/src/g80_driver.c +index cc4e197..719b96c 100644 +--- a/src/g80_driver.c ++++ b/src/g80_driver.c +@@ -34,7 +34,6 @@ + #include <xf86Resources.h> + #endif + #include <mipointer.h> +-#include <mibstore.h> + #include <micmap.h> + #include <xf86cmap.h> + #include <fb.h> +@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/nv_driver.c b/src/nv_driver.c +index 6dad6e5..8f35334 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pNv->NoAccel) + NVAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/nv_include.h b/src/nv_include.h +index fb190bf..f174eef 100644 +--- a/src/nv_include.h ++++ b/src/nv_include.h +@@ -24,9 +24,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "micmap.h" + + #include "xf86DDC.h" +diff --git a/src/riva_driver.c b/src/riva_driver.c +index e0667ef..759501e 100644 +--- a/src/riva_driver.c ++++ b/src/riva_driver.c +@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pRiva->NoAccel) + RivaAccelInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/riva_include.h b/src/riva_include.h +index f2c5302..c7aeef7 100644 +--- a/src/riva_include.h ++++ b/src/riva_include.h +@@ -22,9 +22,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + #include "micmap.h" + + #include "xf86DDC.h" +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD index 799b30045c..9613cd2190 100644 --- a/main/xf86-video-openchrome/APKBUILD +++ b/main/xf86-video-openchrome/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-openchrome pkgver=0.3.1 -pkgrel=1 +pkgrel=3 pkgdesc="X.Org driver for VIA/S3G cards" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-qxl/APKBUILD b/main/xf86-video-qxl/APKBUILD index a9b2e7aabd..80f92f48b5 100644 --- a/main/xf86-video-qxl/APKBUILD +++ b/main/xf86-video-qxl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-qxl pkgver=0.1.0 -pkgrel=2 +pkgrel=4 pkgdesc="Xorg X11 qxl video driver" url="http://www.x.org" arch="all" @@ -12,7 +12,8 @@ makedepends="xorg-server-dev spice-dev xorg-server xproto fontsproto randrproto renderproto videoproto xf86dgaproto" install="" subpackages="$pkgname-doc" -source="http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2 + mibstore.patch" _builddir="$srcdir"/xf86-video-qxl-$pkgver prepare() { @@ -43,4 +44,9 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/*/*.la } -md5sums="3d854268744ff92751430d83b8acaeb6 xf86-video-qxl-0.1.0.tar.bz2" +md5sums="3d854268744ff92751430d83b8acaeb6 xf86-video-qxl-0.1.0.tar.bz2 +b90a966c4d4a9d1584112f534f52c459 mibstore.patch" +sha256sums="5ca3c1039fc195e73fa68558d0d7ee2b97cf10f4e7474ca533732a5d39ebbce5 xf86-video-qxl-0.1.0.tar.bz2 +241bd977f4ba6e914fc4abf3dbffdebf7c2166989df68218d4436c03937e9d52 mibstore.patch" +sha512sums="4ff5f4ca60bf54769833e13ef030fe08bad84955be20c86d26d82687ccb4cd58770e03cfbeaa49dc64b2ff99400d380769b30e3b86cf746377c6d621aa405e1f xf86-video-qxl-0.1.0.tar.bz2 +1027ec2adfff285c418be7ef06d6d115bb69babbd9fa5b66ab2b00522b2668b72424f125b1f1e13ba67855b48d27ad64fef8263b6a60e4963f352a0a2e78bad9 mibstore.patch" diff --git a/main/xf86-video-qxl/mibstore.patch b/main/xf86-video-qxl/mibstore.patch new file mode 100644 index 0000000000..4f11f1d01f --- /dev/null +++ b/main/xf86-video-qxl/mibstore.patch @@ -0,0 +1,21 @@ +From 819b1f62efbecf33db7bb0b4402a798262ae4574 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Thu, 10 Jan 2013 03:55:47 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h +index ad83963..e3c581c 100644 +--- a/src/uxa/uxa-priv.h ++++ b/src/uxa/uxa-priv.h +@@ -45,7 +45,6 @@ + #include "pixmapstr.h" + #include "windowstr.h" + #include "servermd.h" +-#include "mibstore.h" + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD index b98bcdeab6..aedd198e4c 100644 --- a/main/xf86-video-r128/APKBUILD +++ b/main/xf86-video-r128/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-r128 pkgver=6.9.1 -pkgrel=1 +pkgrel=3 pkgdesc="ATI Rage128 video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD index 8b09d88241..e2d02188a5 100644 --- a/main/xf86-video-rendition/APKBUILD +++ b/main/xf86-video-rendition/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-rendition pkgver=4.2.5 -pkgrel=1 +pkgrel=3 pkgdesc="Rendition video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,7 +11,8 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" prepare() { cd "$srcdir"/$pkgname-$pkgver @@ -35,4 +36,9 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="6db439a0f89e6f00c4f5175510d8e0c1 xf86-video-rendition-4.2.5.tar.bz2" +md5sums="6db439a0f89e6f00c4f5175510d8e0c1 xf86-video-rendition-4.2.5.tar.bz2 +bf6125aff3bcce84b6d289c1b8ae510b mibstore.patch" +sha256sums="39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb xf86-video-rendition-4.2.5.tar.bz2 +93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c mibstore.patch" +sha512sums="203529e2a9c917362ac7c9b4247a9a0a4a7e1911bd022a26b00f467ec4cfd9ce742465aba29618cbfaa5ac5ff0b43e5a54f651e45e81aa950776685e4f74ba72 xf86-video-rendition-4.2.5.tar.bz2 +f05cfc55def69453152d2f45d50cadb5641601cd7f7f8a197482a7ea6cfbec271c5872cdfff3fc3c9dea9a878990a4a943685c383095d925e17641a3c4a2acba mibstore.patch" diff --git a/main/xf86-video-rendition/mibstore.patch b/main/xf86-video-rendition/mibstore.patch new file mode 100644 index 0000000000..77c4d34dea --- /dev/null +++ b/main/xf86-video-rendition/mibstore.patch @@ -0,0 +1,35 @@ +From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:50 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/rendition.c b/src/rendition.c +index 7c74f76..888bb4a 100644 +--- a/src/rendition.c ++++ b/src/rendition.c +@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL) + fbPictureInit (pScreen, 0, 0); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + + /*********************************************************/ + /* The actual setup of the driver-specific code */ +diff --git a/src/rendition.h b/src/rendition.h +index f7f13d4..297117e 100644 +--- a/src/rendition.h ++++ b/src/rendition.h +@@ -28,9 +28,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi colormap manipulation need this */ + #include "micmap.h" + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD index 379c30aee3..162c8b529a 100644 --- a/main/xf86-video-s3/APKBUILD +++ b/main/xf86-video-s3/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-s3 pkgver=0.6.5 -pkgrel=1 +pkgrel=3 pkgdesc="X.Org driver for s3 cards" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,35 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2 + mibstore.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="37248d5c5a04d7f91c6f634cc592b304 xf86-video-s3-0.6.5.tar.bz2" +md5sums="37248d5c5a04d7f91c6f634cc592b304 xf86-video-s3-0.6.5.tar.bz2 +39197ff01d61fd5e536a04c275568cd3 mibstore.patch" +sha256sums="4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39 xf86-video-s3-0.6.5.tar.bz2 +7cdf5381c9ad1a9f654e803f767a2b2b07346088501cc6293fcce1992a78fe66 mibstore.patch" +sha512sums="bd7d93008dae33b0b7943b2c81de5f39b1d8224ccebd0cdb9e8d22e7ea7fb0981adf6afd44e24162fa8a076d3e250f93316fd3a25cada2d65166a6bc4d13c267 xf86-video-s3-0.6.5.tar.bz2 +72a4176d178f968e769b8cd61e2f2eed6524c75f8f0c9d2f51acece24e0b7ad1953c9c4d271c9af02b4ee68ad75dd06d9cce71b3bce6fdf5965e1e9b40d6eb49 mibstore.patch" diff --git a/main/xf86-video-s3/mibstore.patch b/main/xf86-video-s3/mibstore.patch new file mode 100644 index 0000000000..fbec7122dc --- /dev/null +++ b/main/xf86-video-s3/mibstore.patch @@ -0,0 +1,18 @@ +--- ./src/s3_driver.c.orig 2013-03-07 10:10:59.468190736 +0000 ++++ ./src/s3_driver.c 2013-03-07 10:11:57.695325050 +0000 +@@ -52,7 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "inputstr.h" + #include "shadowfb.h" +@@ -822,7 +821,6 @@ + fbPictureInit (pScreen, 0, 0); + S3DGAInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* framebuffer manager setup */ diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD index ae27b70ca0..d4cb83a8f8 100644 --- a/main/xf86-video-s3virge/APKBUILD +++ b/main/xf86-video-s3virge/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-s3virge pkgver=1.10.6 -pkgrel=1 +pkgrel=2 pkgdesc="S3 ViRGE video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD index 6d561c47c4..a6cc5b86e7 100644 --- a/main/xf86-video-savage/APKBUILD +++ b/main/xf86-video-savage/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-savage pkgver=2.3.6 -pkgrel=1 +pkgrel=3 pkgdesc="S3 Savage video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD index 821dd3bde1..d1c3ad2ce4 100644 --- a/main/xf86-video-siliconmotion/APKBUILD +++ b/main/xf86-video-siliconmotion/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-siliconmotion pkgver=1.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="Silicon Motion video driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD index 36e079201e..18ba6e91ca 100644 --- a/main/xf86-video-sis/APKBUILD +++ b/main/xf86-video-sis/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-sis pkgver=0.10.7 -pkgrel=1 +pkgrel=4 pkgdesc="X.org SiS video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,14 +12,21 @@ makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto fontsproto xf86dgaproto xineramaproto randrproto xextproto mesa-dev xf86driproto glproto libxi-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 + sis-0.10.7-git.patch" +_builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 @@ -27,9 +34,14 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="f01e5e20e37342acf1983d269886171b xf86-video-sis-0.10.7.tar.bz2" +md5sums="f01e5e20e37342acf1983d269886171b xf86-video-sis-0.10.7.tar.bz2 +268a460c217b9108c2e43608a066198a sis-0.10.7-git.patch" +sha256sums="be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0 xf86-video-sis-0.10.7.tar.bz2 +7cc3c746f0921b72b4a2cae599790d115424f813dde8b74a0fe8222152a9c4cf sis-0.10.7-git.patch" +sha512sums="095fd47803e8296ca3769b5c62e9399b6759023660c42b215b708dfed456e3cf2dad93b8abcb48887bd40e0d0b1435d4e1d711a721f5cb55bef4d7093ab387fa xf86-video-sis-0.10.7.tar.bz2 +985e067fbf21d5151b96d497a4325d98d1fcb4f8b3bb3fa7bf7be7574a343b4bca2460545cb60048ec8b023c03249c18062db0c80cadb899a20d9a3dc41563e4 sis-0.10.7-git.patch" diff --git a/main/xf86-video-sis/fix-bios-read-on-650-760.patch b/main/xf86-video-sis/fix-bios-read-on-650-760.patch deleted file mode 100644 index c948c833a8..0000000000 --- a/main/xf86-video-sis/fix-bios-read-on-650-760.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8370499d4035ec7a5c8e1f1b04d5a6c404883442 Mon Sep 17 00:00:00 2001 -From: Matteo Delfino <kendatsuba@gmail.com> -Date: Wed, 21 Oct 2009 14:26:45 +0000 -Subject: Fix BIOS read on 650 and 760. (#19070) - -Signed-off-by: Matteo Delfino <kendatsuba@gmail.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/sis_driver.c b/src/sis_driver.c -index 994b02d..b19e7a9 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - case SIS_315H: - case SIS_330: - case SIS_340: -+ case SIS_650: -+ case SIS_760: - case XGI_40: readpci = TRUE; - break; - case XGI_20: readpci = TRUE; --- -cgit v0.8.2 diff --git a/main/xf86-video-sis/sis-0.10.7-git.patch b/main/xf86-video-sis/sis-0.10.7-git.patch new file mode 100644 index 0000000000..8652375520 --- /dev/null +++ b/main/xf86-video-sis/sis-0.10.7-git.patch @@ -0,0 +1,121 @@ +diff --git a/src/sis.h b/src/sis.h +index 46fca2a..20e6134 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -75,7 +75,6 @@ + + #include "compiler.h" + #include "xf86Pci.h" +-#include "xf86Priv.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 61e8075..0fd83d7 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -57,7 +57,6 @@ + #include "fb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + #include "edid.h" + + #define SIS_NEED_inSISREG +@@ -94,6 +93,10 @@ + #include "dri.h" + #endif + ++#ifndef DEFAULT_DPI ++#define DEFAULT_DPI 96 ++#endif ++ + /* + * LookupWindow was removed with video abi 11. + */ +@@ -7344,7 +7347,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBase) { + pSiSEnt->MapCountIOBase--; + if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBase = NULL; + pSiSEnt->MapCountIOBase = 0; + pSiSEnt->forceUnmapIOBase = FALSE; +@@ -7355,7 +7362,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBaseDense) { + pSiSEnt->MapCountIOBaseDense--; + if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBaseDense = NULL; + pSiSEnt->MapCountIOBaseDense = 0; + pSiSEnt->forceUnmapIOBaseDense = FALSE; +@@ -7366,7 +7377,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountFbBase) { + pSiSEnt->MapCountFbBase--; + if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#endif + pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL; + pSiSEnt->MapCountFbBase = 0; + pSiSEnt->forceUnmapFbBase = FALSE; +@@ -7376,13 +7391,25 @@ SISUnmapMem(ScrnInfoPtr pScrn) + } + } else { + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBase = NULL; + #ifdef __alpha__ ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBaseDense = NULL; + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#endif + pSiS->FbBase = pSiS->RealFbBase = NULL; + #ifdef SISDUALHEAD + } +@@ -8859,7 +8886,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) + } + pSiS->SiSFastVidCopyDone = TRUE; + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +@@ -9352,7 +9378,14 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + } + if(doit) { + sigstate = xf86BlockSIGIO(); +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18 ++ { ++ double dx = x, dy = y; ++ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL); ++ x = (int)dx; ++ y = (int)dy; ++ } ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 + { + double dx = x, dy = y; + miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); diff --git a/main/xf86-video-tseng/APKBUILD b/main/xf86-video-sunleo/APKBUILD index 8506f2e6d3..04307e20b0 100644 --- a/main/xf86-video-tseng/APKBUILD +++ b/main/xf86-video-sunleo/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=xf86-video-tseng -pkgver=1.2.5 -pkgrel=1 -pkgdesc="Tseng Labs video driver" +pkgname=xf86-video-sunleo +pkgver=1.2.1 +pkgrel=0 +pkgdesc="Leo video driver" url="http://xorg.freedesktop.org/" arch="all" license="custom" @@ -13,15 +13,6 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" -prepare() { - cd "$srcdir"/$pkgname-$pkgver - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - build() { cd "$srcdir"/$pkgname-$pkgver export LDFLAGS="$LDFLAGS -Wl,-z,lazy" @@ -35,4 +26,6 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="116ec66b4efcd378a5152defa769da33 xf86-video-tseng-1.2.5.tar.bz2" +md5sums="6f998ea58bf3c86307991cce67720940 xf86-video-sunleo-1.2.1.tar.bz2" +sha256sums="1ace84e14edbbf76728d61af7b1440a461ddf22f1dba0f025879d286311f491d xf86-video-sunleo-1.2.1.tar.bz2" +sha512sums="52f1578dba4f77e2d999ea2017325df6ac324d60ec2e62677ef9a900aabb183650bcd0923b5a0a1cd7c13c9e80c8a47223b96be651e5a5ecb635654f3eb67af1 xf86-video-sunleo-1.2.1.tar.bz2" diff --git a/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch b/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch new file mode 100644 index 0000000000..e0d229cc6d --- /dev/null +++ b/main/xf86-video-tdfx/0001-Remove-mibstore.h.patch @@ -0,0 +1,36 @@ +From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 08:54:59 -0400 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/tdfx_driver.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c +index ddd5431..412da07 100644 +--- a/src/tdfx_driver.c ++++ b/src/tdfx_driver.c +@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +1.8.0.2 + diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD index e6d3168bb3..8a72dd7680 100644 --- a/main/xf86-video-tdfx/APKBUILD +++ b/main/xf86-video-tdfx/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-tdfx pkgver=1.4.5 -pkgrel=1 +pkgrel=4 pkgdesc="3Dfx video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -12,19 +12,36 @@ 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" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + 0001-Remove-mibstore.h.patch" + + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="1b4a7815a604b3764900b520336a75ea xf86-video-tdfx-1.4.5.tar.bz2" +md5sums="1b4a7815a604b3764900b520336a75ea xf86-video-tdfx-1.4.5.tar.bz2 +11d1ec9437791cc8851124c19e9129da 0001-Remove-mibstore.h.patch" +sha256sums="70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859 xf86-video-tdfx-1.4.5.tar.bz2 +986b4c032003a27f91941ae71bc4734b6e606850bf0bd3f835c703acfedecd30 0001-Remove-mibstore.h.patch" +sha512sums="721f487fe2f08c51fe4622bbbbdbf5c2b8f078f811e18d03e707fd2ab121a8e0a95165934e1567f4280e2613e94fdf5dd35c6c6ddd1ff935a07cfbb485670555 xf86-video-tdfx-1.4.5.tar.bz2 +9fbe484ab0eb34513a7dc4418a8e5725db35b37fb83f6ae5120f88db8471589e667c310ebad4c98ab3fa00e27ab06725c67d3486dce641575223537c14b06b73 0001-Remove-mibstore.h.patch" diff --git a/main/xf86-video-v4l/APKBUILD b/main/xf86-video-v4l/APKBUILD index c866e4eb96..90eddc922c 100644 --- a/main/xf86-video-v4l/APKBUILD +++ b/main/xf86-video-v4l/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-v4l pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="video4linux driver" url="http://xorg.freedesktop.org/" arch="all" diff --git a/main/xf86-video-vesa/0002-Remove-mibstore.h.patch b/main/xf86-video-vesa/0002-Remove-mibstore.h.patch new file mode 100644 index 0000000000..df8a233421 --- /dev/null +++ b/main/xf86-video-vesa/0002-Remove-mibstore.h.patch @@ -0,0 +1,35 @@ +From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 08:55:03 -0400 +Subject: [PATCH 2/2] Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/vesa.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/vesa.c b/src/vesa.c +index 11cd26c..b73d104 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -49,9 +49,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* Colormap handling */ + #include "micmap.h" + #include "xf86cmap.h" +@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) + VESADGAInit(pScrn, pScreen); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +1.8.0.2 + diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD index a5a8f183af..aac853ca6b 100644 --- a/main/xf86-video-vesa/APKBUILD +++ b/main/xf86-video-vesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-vesa pkgver=2.3.2 -pkgrel=1 +pkgrel=3 pkgdesc="X.org vesa video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,19 +11,36 @@ depends= makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto videoproto renderproto" -source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + 0002-Remove-mibstore.h.patch" + + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="3eddd393fba79550e012d717499d58ad xf86-video-vesa-2.3.2.tar.bz2" +md5sums="3eddd393fba79550e012d717499d58ad xf86-video-vesa-2.3.2.tar.bz2 +f0641dbc1afa0ac59c8665ccdffb21f6 0002-Remove-mibstore.h.patch" +sha256sums="144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3 xf86-video-vesa-2.3.2.tar.bz2 +b74675347d2b96962776fb3a62e20408cb9c2373be910c250d1a5e66d469360c 0002-Remove-mibstore.h.patch" +sha512sums="5da0da391fe5d3a5a88e36dcf0b75435b6c1b7389425da253633a293f3eeb0dc91760d0e66b3e98e227dabfa888dbf085fcc5fd973381da4df01ed81c8db288e xf86-video-vesa-2.3.2.tar.bz2 +bf163ce3ce5ff1d979221587d09a7affd3131ce3f9dd1b8d814e4572cb2e6fe8a010d88f3b28f7fcf60ed2cf6adfeb3edd3406197f70f956f8d2fa1e07956dca 0002-Remove-mibstore.h.patch" diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD index 77ba891ed2..8bda6149fa 100644 --- a/main/xf86-video-vmware/APKBUILD +++ b/main/xf86-video-vmware/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-vmware pkgver=13.0.0 -pkgrel=0 +pkgrel=2 pkgdesc="X.org VMWare video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -11,7 +11,7 @@ depends= makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto libdrm-dev fontsproto xf86dgaproto xineramaproto randrproto xextproto libxi-dev" -patches="" +patches="mibrestore.patch" source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 $patches" @@ -37,4 +37,9 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="b72be57517cbc7a56362f2ee0f092269 xf86-video-vmware-13.0.0.tar.bz2" +md5sums="b72be57517cbc7a56362f2ee0f092269 xf86-video-vmware-13.0.0.tar.bz2 +26baa4516d64878e3b982dc0a9deefd1 mibrestore.patch" +sha256sums="44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6 xf86-video-vmware-13.0.0.tar.bz2 +f016b5e605f806caf43f7d532a58474af3a7bc41baa2ed3b745248dcc2b13413 mibrestore.patch" +sha512sums="4106c17469dc1d7fd3d6a9acd5c45d0cdae0d7c8c5ad9463d24de138fd67dbdf09cd32e0665063822d12dad512b27ccd16497097484551778fffabf7db8d5cfe xf86-video-vmware-13.0.0.tar.bz2 +4a9d6d1903cd8eea555f33578222d7cf019f4ba4523aecc2df9d1f6ce0fe050a4a73f0026280d5a11902cd37277d35a83f9d2ae9faed0f60fd07b33541e3552a mibrestore.patch" diff --git a/main/xf86-video-vmware/mibrestore.patch b/main/xf86-video-vmware/mibrestore.patch new file mode 100644 index 0000000000..822c6bcb9e --- /dev/null +++ b/main/xf86-video-vmware/mibrestore.patch @@ -0,0 +1,59 @@ +From b91093db9412b35c7c930f88bc41402d212dd91d Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 9 Jan 2013 23:10:16 -0500 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + saa/saa_priv.h | 1 - + src/vmware.c | 2 -- + vmwgfx/vmwgfx_driver.c | 1 - + 3 files changed, 4 deletions(-) + +diff --git a/saa/saa_priv.h b/saa/saa_priv.h +index 6652054..5d81453 100644 +--- a/saa/saa_priv.h ++++ b/saa/saa_priv.h +@@ -48,7 +48,6 @@ + #include "pixmapstr.h" + #include "windowstr.h" + #include "servermd.h" +-#include "mibstore.h" + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" +diff --git a/src/vmware.c b/src/vmware.c +index 41201f1..6b74e14 100644 +--- a/src/vmware.c ++++ b/src/vmware.c +@@ -23,7 +23,6 @@ char rcsId_vmware[] = + #include "xf86Pci.h" /* pci */ + + #include "mipointer.h" /* sw cursor */ +-#include "mibstore.h" /* backing store */ + #include "micmap.h" /* mi color map */ + #include "vgaHW.h" /* VGA hardware */ + #include "fb.h" +@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) + * If backing store is to be supported (as is usually the case), + * initialise it. + */ +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c +index 9959ffb..7863ba2 100644 +--- a/vmwgfx/vmwgfx_driver.c ++++ b/vmwgfx/vmwgfx_driver.c +@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) + (ms->only_hw_presents) ? "enabled" : "disabled"); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); +-- +1.8.0.2 + diff --git a/main/xf86-video-xgixp/APKBUILD b/main/xf86-video-xgixp/APKBUILD index 0b83d557ff..c835545b41 100644 --- a/main/xf86-video-xgixp/APKBUILD +++ b/main/xf86-video-xgixp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-xgixp pkgver=1.8.1 -pkgrel=0 +pkgrel=3 pkgdesc="X.org XGIXP video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -9,7 +9,8 @@ license="custom" subpackages="$pkgname-doc" depends= makedepends="xorg-server-dev libdrm-dev xf86driproto glproto mesa-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 + mibstore.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -35,4 +36,9 @@ package() { rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="590ec61b6368fee3805623958eb843cb xf86-video-xgixp-1.8.1.tar.bz2" +md5sums="590ec61b6368fee3805623958eb843cb xf86-video-xgixp-1.8.1.tar.bz2 +a0a94fbe8a52e447239c50b5b10709a0 mibstore.patch" +sha256sums="e1c6cbbc5756c8bac92334b77863ef406ad8e5ddf07c8af89204299ca0c41d55 xf86-video-xgixp-1.8.1.tar.bz2 +746906ed2b6f8506e022645b0707cd6a806c60cc7ad6408c57d8463d6b0d8dcb mibstore.patch" +sha512sums="ab45909e4b48cc9dfa3daf5d2cb50dff6ad7d841fe1dc75ea699a7c555d70a6f565d97b7c68f4c58da16ad022b973892e229f8d0f4059c8712cf513c1ec10f84 xf86-video-xgixp-1.8.1.tar.bz2 +903d5dc755e78dd1438eb808beec2b845bebadf7c14e9666a8cde695326a71c5598096854c3cfc915f604c08525d6abe444dfecbe0b08381205898a74fa20a79 mibstore.patch" diff --git a/main/xf86-video-xgixp/mibstore.patch b/main/xf86-video-xgixp/mibstore.patch new file mode 100644 index 0000000000..bf56d1527c --- /dev/null +++ b/main/xf86-video-xgixp/mibstore.patch @@ -0,0 +1,33 @@ +From a84753dd495bcfd724406cae470e17d0c561d0c3 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:05 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index 580a03a..8ce071b 100644 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -53,8 +53,6 @@ + + /* initialise a SW cursor */ + #include "mipointer.h" +-/* implementing backing store */ +-#include "mibstore.h" + + /* colormap initialization */ + #include "micmap.h" +@@ -2041,10 +2039,6 @@ pScrn->pScreen = pScreen; + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "FB Manager init failed \n"); + } + +- /* If backing store is to be supported (as is usually the case), initialise it. */ +- miInitializeBackingStore(pScreen); +- XGIDebug(DBG_FUNCTION, "[DBG] Jong 06142006-After miInitializeBackingStore()\n"); +- + xf86SetBackingStore(pScreen); + XGIDebug(DBG_FUNCTION, "[DBG] Jong 06142006-After xf86SetBackingStore()\n"); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/main/xfdesktop/0001-fix-use-after-free-in-xfdesktop_regular_file_icon_pe.patch b/main/xfdesktop/0001-fix-use-after-free-in-xfdesktop_regular_file_icon_pe.patch deleted file mode 100644 index 48a4388f8a..0000000000 --- a/main/xfdesktop/0001-fix-use-after-free-in-xfdesktop_regular_file_icon_pe.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7669f5b3bc23658ac4f339fd288d8e8f9f30419e Mon Sep 17 00:00:00 2001 -From: Stefan Seyfried <seife+obs@b1-systems.com> -Date: Wed, 27 Jun 2012 09:42:55 +0200 -Subject: [PATCH] fix use-after-free in - xfdesktop_regular_file_icon_peek_tooltip - -xfce_rc_close() actually free()s "comment", so it needs to come after -we have strdup()ed its contents, not before. -This was introduced in commit 2fac2c92 (fix for bug 8509) -Fixes bug 9059. ---- - src/xfdesktop-regular-file-icon.c | 25 ++++++++++++------------- - 1 file changed, 12 insertions(+), 13 deletions(-) - -diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c -index ff5d074..6e4b71d 100644 ---- a/src/xfdesktop-regular-file-icon.c -+++ b/src/xfdesktop-regular-file-icon.c -@@ -552,6 +552,10 @@ xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon) - G_FILE_ATTRIBUTE_TIME_MODIFIED); - time_string = xfdesktop_file_utils_format_time_for_display(mtime); - -+ regular_file_icon->priv->tooltip = -+ g_strdup_printf(_("Type: %s\nSize: %s\nLast modified: %s"), -+ description, size_string, time_string); -+ - /* Extract the Comment entry from the .desktop file */ - if(is_desktop_file) - { -@@ -563,23 +567,18 @@ xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon) - xfce_rc_set_group(rcfile, "Desktop Entry"); - comment = xfce_rc_read_entry(rcfile, "Comment", NULL); - } -+ /* Prepend the comment to the tooltip */ -+ if(comment != NULL) { -+ gchar *tooltip = regular_file_icon->priv->tooltip; -+ regular_file_icon->priv->tooltip = g_strdup_printf("%s\n%s", -+ comment, -+ tooltip); -+ g_free(tooltip); -+ } - - xfce_rc_close(rcfile); - } - -- regular_file_icon->priv->tooltip = -- g_strdup_printf(_("Type: %s\nSize: %s\nLast modified: %s"), -- description, size_string, time_string); -- -- /* Prepend the comment to the tooltip */ -- if(is_desktop_file && comment != NULL) { -- gchar *tooltip = regular_file_icon->priv->tooltip; -- regular_file_icon->priv->tooltip = g_strdup_printf("%s\n%s", -- comment, -- tooltip); -- g_free(tooltip); -- } -- - g_free(time_string); - g_free(size_string); - g_free(description); --- -1.7.10.4 - diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD index f855f50167..ccfc76f606 100644 --- a/main/xfdesktop/APKBUILD +++ b/main/xfdesktop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfdesktop -pkgver=4.10.0 -pkgrel=1 +pkgver=4.10.1 +pkgrel=0 pkgdesc="A desktop manager for Xfce" url="http://www.xfce.org/" arch="all" @@ -12,7 +12,6 @@ makedepends="garcon-dev thunar-dev libxfce4ui-dev libwnck-dev libnotify-dev exo-dev" install= source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - 0001-fix-use-after-free-in-xfdesktop_regular_file_icon_pe.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -40,5 +39,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="d5f6fb9fdde3ddff5804b2a251892936 xfdesktop-4.10.0.tar.bz2 -9d76c3d1b4972b61c4a052b1a1dd733a 0001-fix-use-after-free-in-xfdesktop_regular_file_icon_pe.patch" +md5sums="b1a67e9a2649ed8a452ebfb8aec259d0 xfdesktop-4.10.1.tar.bz2" +sha256sums="2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad xfdesktop-4.10.1.tar.bz2" +sha512sums="d650b7d7704e38827e9a729e9e86d4d8f48c52296d22bbd697c96ae7525c6489892611d1f84b0cba9de738c32b465fc04666390b94b2860457bf626be56de6b8 xfdesktop-4.10.1.tar.bz2" diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 4f8260fad5..65fb83540d 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.13.2 -pkgrel=1 +pkgver=1.14.0 +pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" @@ -154,6 +154,12 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="553fd7902e1156115f15cc1656f46a6f xorg-server-1.13.2.tar.bz2 +md5sums="86110278b784e279381b7f6f2295c508 xorg-server-1.14.0.tar.bz2 ea4852dedbb89550f6bc113ca66348a2 autoconfig-nvidia.patch 825ca99ea9348c66abdf2c479e0af485 autoconfig-sis.patch" +sha256sums="1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630 xorg-server-1.14.0.tar.bz2 +66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162 autoconfig-nvidia.patch +7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50 autoconfig-sis.patch" +sha512sums="d727adfe828636be6c5e01dc8e7b57f0b193052e9bfa25230e90c0859bd70ae471d21a46f5cda791aae978fbb82601d2ec8f147a8992d7180cf6e10ee2a65d2d xorg-server-1.14.0.tar.bz2 +4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447 autoconfig-nvidia.patch +30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch" diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD index b4636b7b3b..11c982b61c 100644 --- a/main/xscreensaver/APKBUILD +++ b/main/xscreensaver/APKBUILD @@ -1,29 +1,35 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xscreensaver -pkgver=5.20 -pkgrel=1 +pkgver=5.21 +pkgrel=0 pkgdesc="screensavers for X11 environment" url="http://www.jwz.org/xscreensaver/" license="GPL" depends="bc" makedepends="gtk+-dev libjpeg-turbo-dev mesa-dev gettext-dev libxmu-dev perl-dev - libxml2-dev libglade-dev libxinerama-dev libxrandr-dev" + libxml2-dev libglade-dev libxinerama-dev libxrandr-dev glu-dev" install= subpackages="$pkgname-doc $pkgname-gl-extras:gl $pkgname-extras $pkgname-lang" -source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz + intl-libs.patch" arch="all" _builddir="$srcdir"/$pkgname-$pkgver _libexecdir=/usr/lib/xscreensaver _confdir=/usr/share/xscreensaver/config + prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { cd "$_builddir" - [ "$ALPINE_LIBC" != "eglibc"] && export LIBS="-lintl" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -66,4 +72,9 @@ extras() { mv "$pkgdir"/$_confdir/* "$subpkgdir"/$_confdir } -md5sums="1faec61c61e29dc11f6ec9e4750ab877 xscreensaver-5.20.tar.gz" +md5sums="1e9828ab7146d443c9d109cf2a1a4ed2 xscreensaver-5.21.tar.gz +7ab63bb0d5b5d043c94128dbd98cf311 intl-libs.patch" +sha256sums="90f9a4574880c6e6d24796b5c386405a4bbf27a7d764a00f858d43ce07788868 xscreensaver-5.21.tar.gz +d13e51b406e84f02901bd16f401c9ae897400b0567182f4b8092df1fcd51e754 intl-libs.patch" +sha512sums="3e74f786df8374d96969493094934a478a7023107efadc84ec58ebd9def6993ea069512f7850e0a2ffe65ff43dc5e251b0057246fc39a67846085d2d0990cba7 xscreensaver-5.21.tar.gz +3a4d750350bb1e5248fb03ea094001797e0628fb38c0ef854b9d30efd5d7a7f5a5b31fbac73816ae26a221201119be954c74fddbb863216ced4a5a63609720a2 intl-libs.patch" diff --git a/main/xscreensaver/intl-libs.patch b/main/xscreensaver/intl-libs.patch new file mode 100644 index 0000000000..c1fb71675e --- /dev/null +++ b/main/xscreensaver/intl-libs.patch @@ -0,0 +1,11 @@ +--- ./driver/Makefile.in.orig 2013-03-05 14:39:59.352107702 +0000 ++++ ./driver/Makefile.in 2013-03-05 14:41:18.676188601 +0000 +@@ -207,7 +207,7 @@ + SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \ + $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ + -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ +- $(PASSWD_LIBS) ++ $(PASSWD_LIBS) $(INTL_LIBS) + + CMD_LIBS = $(LIBS) $(X_LIBS) \ + $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 6ff04395e7..3466efba74 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -5,7 +5,7 @@ _realname=xtables-addons _name=$_realname-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _realver=1.47 _mypkgrel=0 diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index 74e24ef72e..f9d187b112 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -3,7 +3,7 @@ pkgname=xulrunner pkgver=19.0.1 _ffoxver=$pkgver -pkgrel=0 +pkgrel=1 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" arch="all" diff --git a/main/zsnes/APKBUILD b/main/zsnes/APKBUILD index f21710c052..a0d52404e9 100644 --- a/main/zsnes/APKBUILD +++ b/main/zsnes/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zsnes pkgver=1.51 -pkgrel=7 +pkgrel=8 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" arch="x86" diff --git a/testing/ansible/APKBUILD b/testing/ansible/APKBUILD index ae9d307128..6c1a02a6c7 100644 --- a/testing/ansible/APKBUILD +++ b/testing/ansible/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=ansible -pkgver=0.9 -pkgrel=0 +pkgver=1.0 +pkgrel=1 pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework" url="http://ansible.github.com/" arch="noarch" @@ -12,7 +12,7 @@ depends_dev="" makedepends="python-dev" install="" subpackages="$pkgname-doc" -source="https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -36,6 +36,8 @@ package() { mkdir -p "$pkgdir"/etc/$pkgname install -m755 -D "$_builddir"/examples/hosts \ "$pkgdir"/etc/$pkgname/hosts || return 1 + install -m755 -D "$_builddir"/examples/ansible.cfg \ + "$pkgdir"/etc/$pkgname/ansible.cfg || return 1 mkdir -p "$pkgdir"/usr/share/$pkgname install -m755 -D "$_builddir"/library/* \ "$pkgdir"/usr/share/$pkgname/ || return 1 @@ -47,4 +49,6 @@ package() { done } -md5sums="bbabdb7d934218de8fce0148eadce7e1 ansible-0.9.tar.gz" +md5sums="9184385fdf22c3516ce831a229f7d945 v1.0.tar.gz" +sha256sums="6e9bba5eef2575284bfc533c0cc751468d7a07dd608845437c2f96fc57653a54 v1.0.tar.gz" +sha512sums="d5f84184cb7c0bc086ee726188d5e13533172cb219b6dde0a570b165540f08f64ca708b515e52fb95b1675755f1f90550a962c3b51fd085763389daa12ec971a v1.0.tar.gz" diff --git a/testing/arping/APKBUILD b/testing/arping/APKBUILD index 1baa13348e..4a94e78f6d 100644 --- a/testing/arping/APKBUILD +++ b/testing/arping/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Francesco Colista <francesco.colista@gmail.com> -# Maintainer: Francesco Colista <francesco.colista@gmail.com> +# Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=arping -pkgver=2.12 +pkgver=2.13 pkgrel=0 -pkgdesc="ARP ping utility" +pkgdesc="An ARP ping utility" url="http://www.habets.pp.se/synscan/programs.php?prog=arping" arch="all" license="GPL2+" @@ -35,4 +35,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="47e0db7fed9f1297c598a24cd476911d arping-2.12.tar.gz" +md5sums="698e4a87d4ea6c8535b07b06d9ed503e arping-2.13.tar.gz" +sha256sums="b2bd992dbbc38251a06daef6db09edb1276a3745f16166177a7542f995549a32 arping-2.13.tar.gz" +sha512sums="93ac04ea1ba7f0d714a1ef26c99e291bd50dbdb07c6883ebd311808b8a33bfcf49fd3bb3e4a931089308575edb46c406d92348cac1ea9bdf1d23f7858bea99f4 arping-2.13.tar.gz" diff --git a/testing/calcurse/APKBUILD b/testing/calcurse/APKBUILD index f59a50daf9..c53585b267 100644 --- a/testing/calcurse/APKBUILD +++ b/testing/calcurse/APKBUILD @@ -1,29 +1,32 @@ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> - pkgname=calcurse -pkgver=3.1.2 +pkgver=3.1.4 pkgrel=1 -pkgdesc='A text-based personal organizer.' -url='http://calcurse.org/' -license='BSD' -arch='all' -makedepends='libiconv-dev ncurses-dev' +pkgdesc="A text-based personal organizer" +url="http://calcurse.org/" +license="BSD" +arch="all" +makedepends="libiconv-dev ncurses-dev" subpackages="$pkgname-doc" source="http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-docs \ - --without-asciidoc - make + cd "$_builddir" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-docs \ + --without-asciidoc \ + || return 1 + make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 } -md5sums="9ad32bd0efa9c8ed1e1d7df49aef5663 calcurse-3.1.2.tar.gz" +md5sums="e354bdb7636daffa99ffb98534d04cb2 calcurse-3.1.4.tar.gz" +sha256sums="4121b3b14ded3583af7613a99646332701ee2ccc8cf2b87397eb3c07b97390e3 calcurse-3.1.4.tar.gz" +sha512sums="efdb655f96a176ca45a23a6246987735413a69046e5273efafffd5d2087f880969f84e387dd84672dacc8fae670a86ee7b132f6a4662e072ba92121492fd7ca7 calcurse-3.1.4.tar.gz" diff --git a/testing/charybdis/APKBUILD b/testing/charybdis/APKBUILD index 9051e34748..2fb9be527c 100644 --- a/testing/charybdis/APKBUILD +++ b/testing/charybdis/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=charybdis pkgver=3.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="A highly-scalable IRCv3-compliant IRC daemon" url="http://www.atheme.org/project/charybdis" arch="all" @@ -15,8 +15,18 @@ install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc" source="saveas-http://www.stack.nl/~jilles/irc/$pkgname-$pkgver.tbz2/$pkgname-$pkgver.tar.bz2 $pkgname.initd - $pkgname.confd" + $pkgname.confd + avoid-fd-4096.patch" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { cd "$_builddir" ./configure \ @@ -51,10 +61,13 @@ package() { md5sums="54245396b829f8d19d3958cde9c3bd65 charybdis-3.4.2.tar.bz2 ce8dc0025b4e50fbec2aa643a947c1b0 charybdis.initd -11d70cc7c9fa0eb5ad52af35801d57c6 charybdis.confd" +11d70cc7c9fa0eb5ad52af35801d57c6 charybdis.confd +d6a17f178bbd7e73312501ca0ad92a56 avoid-fd-4096.patch" sha256sums="8a38e67072d90147c40202918c82237765e339cbc849456da54994ce6e31b754 charybdis-3.4.2.tar.bz2 3bd4b0b58189518fa72b9d0c2226e83499ab718189f054a889f4e680f3a20e18 charybdis.initd -3d1d8b8e722efe6a9eb3171a65d96651bb93c8d6265bd4980bcbb4b8d500f6ad charybdis.confd" +3d1d8b8e722efe6a9eb3171a65d96651bb93c8d6265bd4980bcbb4b8d500f6ad charybdis.confd +845caa6a82fa8b75c72532df6f398624b8ad04c6d62115cf3025219b860a7640 avoid-fd-4096.patch" sha512sums="4bd4126cbb023e8ca1ec3003d92893dd44f9bdd8ce5d3fb471fed0b62eb4aa5ff410a6e769ee7daab4864492d49ff594e3e8c7fea05318eb2308efc2195dc8a3 charybdis-3.4.2.tar.bz2 fef24d361acd96f1e5891e484cbba8ef1dd4a0091550e6a7ae7fe6d053311b80fcdfe4f2307ebf1c4af7ec08ce35ba15bf4a8d499a0c9eb4956b00cd28cf8487 charybdis.initd -1886b312b0ea40945de45db7a379bff2a3af426155fb77676e03f21f8d1d733e057fb5c3cb65fb72bb56008c4c92f3d2d0010563f871fd0802446de443ddfd5e charybdis.confd" +1886b312b0ea40945de45db7a379bff2a3af426155fb77676e03f21f8d1d733e057fb5c3cb65fb72bb56008c4c92f3d2d0010563f871fd0802446de443ddfd5e charybdis.confd +47b420beab2e423c31d4b764d342e094ed013cee7678d5f221857c229a9d41b3dc70b190890aa4aae446cc676635b8d7088485bb8e8afcf22101f1b893434ffa avoid-fd-4096.patch" diff --git a/testing/charybdis/avoid-fd-4096.patch b/testing/charybdis/avoid-fd-4096.patch new file mode 100644 index 0000000000..8649849854 --- /dev/null +++ b/testing/charybdis/avoid-fd-4096.patch @@ -0,0 +1,13 @@ +diff --git a/include/hash.h b/include/hash.h +index 6dc2d4e..a103241 100644 +--- a/include/hash.h ++++ b/include/hash.h +@@ -46,7 +46,7 @@ extern struct Dictionary *nd_dict; + #define U_MAX 131072 /* 2^17 */ + + /* Client fd hash table size, used in hash.c */ +-#define CLI_FD_MAX 4096 ++#define CLI_FD_MAX 16384 + + /* Channel hash table size, hash.c/s_debug.c */ + #define CH_MAX_BITS 16 diff --git a/testing/clutter/APKBUILD b/testing/clutter/APKBUILD index 821e27b76a..b935dc262f 100644 --- a/testing/clutter/APKBUILD +++ b/testing/clutter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=clutter pkgver=1.6.20 -pkgrel=1 +pkgrel=2 pkgdesc="library for creating fast, visually-appealing interfaces" url="http://www.clutter-project.org/" arch="all" diff --git a/testing/compiz/APKBUILD b/testing/compiz/APKBUILD index 1eb198d0a0..82ef486230 100644 --- a/testing/compiz/APKBUILD +++ b/testing/compiz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=compiz pkgver=0.8.8 -pkgrel=4 +pkgrel=5 pkgdesc="opengl window and composition manager" url="http://www.compiz.org/" arch="all" diff --git a/testing/crunch/APKBUILD b/testing/crunch/APKBUILD new file mode 100644 index 0000000000..9db89b1394 --- /dev/null +++ b/testing/crunch/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=crunch +pkgver=3.4 +pkgrel=0 +pkgdesc="A wordlist generator" +url="http://sourceforge.net/projects/crunch-wordlist/" +arch="all" +license="GPL2" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/project/crunch-wordlist/crunch-wordlist/$pkgname-$pkgver.tgz + crunch-3.4-destdir.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p2 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" geninstall || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="3f658a60d8227025df12cfb4ff4b9e15 crunch-3.4.tgz +a75466c9dae86223f913f622208eef86 crunch-3.4-destdir.patch" diff --git a/testing/crunch/crunch-3.4-destdir.patch b/testing/crunch/crunch-3.4-destdir.patch new file mode 100644 index 0000000000..09dcf9a48c --- /dev/null +++ b/testing/crunch/crunch-3.4-destdir.patch @@ -0,0 +1,25 @@ +--- src/crunch-3.4/Makefile.orig ++++ src/crunch-3.4/Makefile +@@ -58,16 +58,16 @@ + # Install generic target
+ geninstall: build
+ @echo "Creating directories..."
+- $(INSTALL) -d -m 755 $(INSTALL_OPTIONS) $(BINDIR)
+- $(INSTALL) -d -m 755 $(INSTALL_OPTIONS) $(MANDIR)
++ $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
++ $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)
+ @echo "Copying binary..."
+- $(INSTALL) crunch -m 755 $(INSTALL_OPTIONS) $(BINDIR)
++ $(INSTALL) crunch -m 755 $(DESTDIR)$(BINDIR)
+ @echo "Copying charset.lst..."
+- $(INSTALL) charset.lst -m 644 $(INSTALL_OPTIONS) $(BINDIR)
++ $(INSTALL) charset.lst -m 644 $(DESTDIR)$(BINDIR)
+ @echo "Copying GPL.TXT..."
+- $(INSTALL) GPL.TXT -m 644 $(INSTALL_OPTIONS) $(BINDIR)
++ $(INSTALL) GPL.TXT -m 644 $(DESTDIR)$(BINDIR)
+ @echo "Installing man page..."
+- $(INSTALL) crunch.1 -m 644 $(INSTALL_OPTIONS) $(MANDIR)
++ $(INSTALL) crunch.1 -m 644 $(DESTDIR)$(MANDIR)
+ @echo ""
+
+ # Install BT specific target
diff --git a/testing/ddrescue/APKBUILD b/testing/ddrescue/APKBUILD index bc85d650e0..f06d0389af 100644 --- a/testing/ddrescue/APKBUILD +++ b/testing/ddrescue/APKBUILD @@ -1,21 +1,19 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=ddrescue -pkgver=1.12 +pkgver=1.16 pkgrel=0 pkgdesc="Data recovery tool for block devices with errors" url="http://www.gnu.org/s/ddrescue/ddrescue.html" arch="all" -license="GPL" -depends= -depends_dev= +license="GPL3+" +depends="" +depends_dev="" makedepends="$depends_dev" -install= +install="" subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" - _builddir="$srcdir"/$pkgname-$pkgver - prepare() { cd "$_builddir" return 0 @@ -26,17 +24,17 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + || return 1 make || return 1 + make check || return 1 } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install - - # remove the 2 lines below (and this) if there is no init.d script - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + make DESTDIR="$pkgdir" install || return 1 } -md5sums="b3d8a9a9098b87939fba05a45848bd8d ddrescue-1.12.tar.gz" +md5sums="57b67407e882c6418531d48a2f20d16b ddrescue-1.16.tar.gz" +sha256sums="76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6 ddrescue-1.16.tar.gz" +sha512sums="c775ac34701b63ab7efd0a56cecf5c8b198874239e48383142db0ccb83c193c7101335374dc89efaa815b466258181f458a3589ea4abb230804b553fb42b345d ddrescue-1.16.tar.gz" diff --git a/testing/dhex/APKBUILD b/testing/dhex/APKBUILD index 5f6fb193d0..325befddd7 100644 --- a/testing/dhex/APKBUILD +++ b/testing/dhex/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhex -pkgver=0.67 +pkgver=0.68 pkgrel=0 pkgdesc="Ncurses hex editor" url="http://www.dettus.net/dhex/" @@ -37,5 +37,9 @@ package() { prefix=/usr/bin || return 1 } -md5sums="46d24d11b6e389509fff07404aedabb6 dhex_0.67.tar.gz +md5sums="5109b3d50053553e41d75c8e5c0a0175 dhex_0.68.tar.gz de16e09d3b416650d84ef39235cd2917 makefile.patch" +sha256sums="126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08 dhex_0.68.tar.gz +e29f8279a25c6bcc6f43f61c80d08948e40cea67866eed5e745ea5f63af3d291 makefile.patch" +sha512sums="9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421 dhex_0.68.tar.gz +0e2aa694723afd859f97f8ea02a79fec02bcbd70b9f4bd8ba1e33743f1fa72fa8810bfb7bac2c7a855bf407cd7c0cbb3ef82c7fea1fcb19a2701ab2d55baf7e3 makefile.patch" diff --git a/testing/dstat/APKBUILD b/testing/dstat/APKBUILD index 62d3ae3aff..d6f6f2498b 100644 --- a/testing/dstat/APKBUILD +++ b/testing/dstat/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="A versatile resource statistics tool" url="http://dag.wieers.com/home-made/dstat/" arch="noarch" -license="GPL" +license="GPL2+" depends="python" depends_dev="python-dev" makedepends="$depends_dev" @@ -26,11 +26,12 @@ prepare() { build() { cd "$_builddir" - make DESTDIR=$pkgdir install + return 0 } package() { cd "$_builddir" + make DESTDIR=$pkgdir install || return 1 } md5sums="bfea4dc8037a0b18fc40a4dfc104dcc8 dstat-0.7.2.tar.bz2" diff --git a/testing/erlang/APKBUILD b/testing/erlang/APKBUILD index 02a338d0aa..3149a24347 100644 --- a/testing/erlang/APKBUILD +++ b/testing/erlang/APKBUILD @@ -6,26 +6,26 @@ # http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=blob;f=erlang.spec pkgname=erlang -pkgver=14.2.02 +pkgver=16.2 # note: versioning scheme is weird. the .2. -> B # needs to be updated manually -_ver=${pkgver%%.*}B${pkgver##*.} -pkgrel=1 +_ver=${pkgver%%.*}B +#_ver=${pkgver%%.*}B${pkgver##*.} +pkgrel=0 pkgdesc="General-purpose programming language and runtime environment" url="http://www.erlang.org/" license="ERPL" arch="all" -depends= +depends="" makedepends="perl-dev zlib-dev ncurses-dev openssl-dev" -install= +install="" subpackages="$pkgname-dev" - -# patch found: http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=tree +# Patches found: http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=tree source="http://www.erlang.org/download/otp_src_R$_ver.tar.gz - otp-0004-Do-not-install-C-sources.patch" + otp-0002-Remove-rpath.patch + otp-0003-Do-not-install-C-sources.patch" _builddir="$srcdir"/otp_src_R$_ver - prepare() { local i cd "$_builddir" @@ -63,8 +63,15 @@ build() { package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="229fb8f193b09ac04a57a9d7794349b7 otp_src_R14B02.tar.gz -e7e4b43883e5fc860bf18701850512b1 otp-0004-Do-not-install-C-sources.patch" +md5sums="7ee131515bc496e7522e0dec2a4c26e3 otp_src_R16B.tar.gz +2978a60b60f62ad7e46834489e81d06a otp-0002-Remove-rpath.patch +10d9990675b1be003ead2a8862fc4fe6 otp-0003-Do-not-install-C-sources.patch" +sha256sums="f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd otp_src_R16B.tar.gz +d7c494ba1f37e2f3d45d7455c8d771268bcbeba2143078b51d42ffa874a34761 otp-0002-Remove-rpath.patch +98de7e14f9d8e94c3a2d117125048f1f4c1bff242112e3149cd775a967fb6d6f otp-0003-Do-not-install-C-sources.patch" +sha512sums="ca8587df663ef3066aaca868a8f79cc002a9ee4d6d57162c75cd54d5e6dcc02a9477fa4a58110cb82f25f50f316ddaf2660010c4b43b8c7b36135b00e0e9221e otp_src_R16B.tar.gz +f1c5251d8f532322bd8cdd1fba3104ec2916dfaad42026112f1ea59bcf081725781b51f8c6c3bb3bf6af9d404e343bd0e22c3266ff2797ec01ffc91c92fdba4a otp-0002-Remove-rpath.patch +e2ec4488ce5587e2a5af67a11aca2c619db7056cbc37520ff054123faee878fb9f726a34719013245d7cfc2ec23362207018efa5bf73f98387fbd1b53b02c014 otp-0003-Do-not-install-C-sources.patch" diff --git a/testing/erlang/otp-0002-Remove-rpath.patch b/testing/erlang/otp-0002-Remove-rpath.patch new file mode 100644 index 0000000000..2192c39a1a --- /dev/null +++ b/testing/erlang/otp-0002-Remove-rpath.patch @@ -0,0 +1,36 @@ +From: Peter Lemenkov <lemenkov@gmail.com> +Date: Thu, 25 Feb 2010 16:57:43 +0300 +Subject: [PATCH] Remove rpath + +Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index a20ddff..e890927 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -85,7 +85,7 @@ endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ + + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) +-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ ++SSL_DED_LD_RUNTIME_LIBRARY_PATH = + CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) + EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB + else +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index 0989f14..0d29444 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o + # ---------------------------------------------------- + + $(SO_NIFLIB): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_NIFLIB): $(OBJS) diff --git a/testing/erlang/otp-0003-Do-not-install-C-sources.patch b/testing/erlang/otp-0003-Do-not-install-C-sources.patch new file mode 100644 index 0000000000..705b48fc04 --- /dev/null +++ b/testing/erlang/otp-0003-Do-not-install-C-sources.patch @@ -0,0 +1,168 @@ +From: Peter Lemenkov <lemenkov@gmail.com> +Date: Fri, 18 Jun 2010 23:41:33 +0400 +Subject: [PATCH] Do not install C sources + +Don't install *.c and *.o files. + +Excepts ones from the internal erl_interface. These +API headers are necessary. See rhbz #818419 for the +explanation why they're necessary for the low-level +interaction with the Erlang nodes: + +https://bugzilla.redhat.com/818419 + +Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> +--- + lib/asn1/c_src/Makefile | 2 -- + lib/crypto/c_src/Makefile.in | 4 ---- + lib/erl_interface/src/Makefile.in | 16 ++++++++-------- + lib/ic/c_src/Makefile.in | 2 -- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/odbc/c_src/Makefile.in | 3 --- + lib/os_mon/c_src/Makefile.in | 2 -- + lib/runtime_tools/c_src/Makefile.in | 2 -- + lib/tools/c_src/Makefile.in | 2 -- + 9 files changed, 9 insertions(+), 26 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 7023833..8bf8eb9 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -107,8 +107,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib" +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" +- $(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src" + + release_docs_spec: + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index e890927..1377654 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -160,13 +160,9 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" +- $(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj" +- $(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib" + ifeq ($(DYNAMIC_CRYPTO_LIB),yes) +- $(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib" + endif + +diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in +index ebacc1c..388e27e 100644 +--- a/lib/erl_interface/src/Makefile.in ++++ b/lib/erl_interface/src/Makefile.in +@@ -872,14 +872,14 @@ ifneq ($(EXE_TARGETS),) + $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" + endif + $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) connect/*.[ch] "$(RELSYSDIR)/src/connect" +- $(INSTALL_DATA) decode/*.[ch] "$(RELSYSDIR)/src/decode" +- $(INSTALL_DATA) encode/*.[ch] "$(RELSYSDIR)/src/encode" +- $(INSTALL_DATA) epmd/*.[ch] "$(RELSYSDIR)/src/epmd" +- $(INSTALL_DATA) misc/*.[ch] "$(RELSYSDIR)/src/misc" +- $(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry" +- $(INSTALL_DATA) legacy/*.[ch] "$(RELSYSDIR)/src/legacy" +- $(INSTALL_DATA) prog/*.[ch] "$(RELSYSDIR)/src/prog" ++ $(INSTALL_DATA) connect/*.h "$(RELSYSDIR)/src/connect" ++ $(INSTALL_DATA) decode/*.h "$(RELSYSDIR)/src/decode" ++ $(INSTALL_DATA) encode/*.h "$(RELSYSDIR)/src/encode" ++ $(INSTALL_DATA) epmd/*.h "$(RELSYSDIR)/src/epmd" ++ $(INSTALL_DATA) misc/*.h "$(RELSYSDIR)/src/misc" ++ $(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry" ++ $(INSTALL_DATA) legacy/*.h "$(RELSYSDIR)/src/legacy" ++ $(INSTALL_DATA) prog/*.h "$(RELSYSDIR)/src/prog" + + release_docs: + +diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in +index 856823b..d000273 100644 +--- a/lib/ic/c_src/Makefile.in ++++ b/lib/ic/c_src/Makefile.in +@@ -146,10 +146,8 @@ $(OBJDIR)/%.o: %.c + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" +- $(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src" + $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib" + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 6111cf2..bd62e8b 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -270,7 +270,7 @@ release_spec: opt + $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) +- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex" ++ $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib" + endif + +diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in +index 6572d28..c7093ae 100644 +--- a/lib/odbc/c_src/Makefile.in ++++ b/lib/odbc/c_src/Makefile.in +@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + ifdef EXE_TARGET +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" +- $(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src" + $(INSTALL_DIR) "$(RELSYSDIR)/priv" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" +- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin" + endif + +diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in +index 51569f6..4e4d729 100644 +--- a/lib/os_mon/c_src/Makefile.in ++++ b/lib/os_mon/c_src/Makefile.in +@@ -124,8 +124,6 @@ $(OBJDIR)/memsup.o: memsup.h + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" + $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" + +diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in +index d315a90..7b4b9fb 100644 +--- a/lib/runtime_tools/c_src/Makefile.in ++++ b/lib/runtime_tools/c_src/Makefile.in +@@ -177,9 +177,7 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" +- $(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib" + + release_docs_spec: +diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in +index aea5686..a0c8883 100644 +--- a/lib/tools/c_src/Makefile.in ++++ b/lib/tools/c_src/Makefile.in +@@ -189,8 +189,6 @@ include ../vsn.mk + RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) + + release_spec: all +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" +- $(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src" + ifneq ($(PROGS),) + $(INSTALL_DIR) "$(RELSYSDIR)/bin" + $(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin" diff --git a/testing/erlang/otp-0004-Do-not-install-C-sources.patch b/testing/erlang/otp-0004-Do-not-install-C-sources.patch deleted file mode 100644 index d4f380c0fa..0000000000 --- a/testing/erlang/otp-0004-Do-not-install-C-sources.patch +++ /dev/null @@ -1,168 +0,0 @@ -From: Peter Lemenkov <lemenkov@gmail.com> -Date: Fri, 18 Jun 2010 23:41:33 +0400 -Subject: [PATCH] Do not install C sources - -Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> ---- - lib/asn1/c_src/Makefile | 2 -- - lib/crypto/c_src/Makefile.in | 3 --- - lib/erl_interface/src/Makefile.in | 18 ------------------ - lib/ic/c_src/Makefile.in | 2 -- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/odbc/c_src/Makefile.in | 3 --- - lib/os_mon/c_src/Makefile.in | 1 - - lib/ssl/c_src/Makefile.in | 9 --------- - lib/tools/c_src/Makefile.in | 2 -- - 9 files changed, 1 insertions(+), 41 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 9e9cb18..1d73d3c 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -125,8 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib - $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib -- $(INSTALL_DIR) $(RELSYSDIR)/c_src -- $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src - - release_docs_spec: - -diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 48f931d..4a7a183 100644 ---- a/lib/crypto/c_src/Makefile.in -+++ b/lib/crypto/c_src/Makefile.in -@@ -136,10 +136,7 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_DATA) $(NIF_MAKEFILE) $(RELSYSDIR)/priv/obj -- $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj - $(INSTALL_PROGRAM) $(NIF_LIB) $(RELSYSDIR)/priv/lib - - release_docs_spec: -diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 8ff142a..d785902 100644 ---- a/lib/erl_interface/src/Makefile.in -+++ b/lib/erl_interface/src/Makefile.in -@@ -876,29 +876,11 @@ release: opt - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/lib - $(INSTALL_DIR) $(RELSYSDIR)/bin -- $(INSTALL_DIR) $(RELSYSDIR)/src/auxdir -- $(INSTALL_DIR) $(RELSYSDIR)/src/connect -- $(INSTALL_DIR) $(RELSYSDIR)/src/decode -- $(INSTALL_DIR) $(RELSYSDIR)/src/encode -- $(INSTALL_DIR) $(RELSYSDIR)/src/epmd -- $(INSTALL_DIR) $(RELSYSDIR)/src/legacy -- $(INSTALL_DIR) $(RELSYSDIR)/src/misc -- $(INSTALL_DIR) $(RELSYSDIR)/src/prog -- $(INSTALL_DIR) $(RELSYSDIR)/src/registry - $(INSTALL_DATA) $(HEADERS) $(RELSYSDIR)/include - $(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib - ifneq ($(EXE_TARGETS),) - $(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin - endif -- $(INSTALL_DATA) $(EXTRA) $(RELSYSDIR)/src -- $(INSTALL_DATA) connect/*.[ch] $(RELSYSDIR)/src/connect -- $(INSTALL_DATA) decode/*.[ch] $(RELSYSDIR)/src/decode -- $(INSTALL_DATA) encode/*.[ch] $(RELSYSDIR)/src/encode -- $(INSTALL_DATA) epmd/*.[ch] $(RELSYSDIR)/src/epmd -- $(INSTALL_DATA) misc/*.[ch] $(RELSYSDIR)/src/misc -- $(INSTALL_DATA) registry/*.[ch] $(RELSYSDIR)/src/registry -- $(INSTALL_DATA) legacy/*.[ch] $(RELSYSDIR)/src/legacy -- $(INSTALL_DATA) prog/*.[ch] $(RELSYSDIR)/src/prog - - release_docs: - -diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index 6eef782..091895b 100644 ---- a/lib/ic/c_src/Makefile.in -+++ b/lib/ic/c_src/Makefile.in -@@ -144,10 +144,8 @@ $(OBJDIR)/%.o: %.c - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/c_src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib -- $(INSTALL_DATA) ic.c ic_tmo.c $(RELSYSDIR)/c_src - $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) $(RELSYSDIR)/include - $(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 5af651d..2ccf2a9 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -279,7 +279,7 @@ release_spec: opt - $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) -- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -+ $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex - $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib - endif - -diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index ed3eeb1..c01d9bf 100644 ---- a/lib/odbc/c_src/Makefile.in -+++ b/lib/odbc/c_src/Makefile.in -@@ -131,11 +131,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - ifdef EXE_TARGET -- $(INSTALL_DIR) $(RELSYSDIR)/c_src -- $(INSTALL_DATA) $(C_FILES) $(H_FILES) $(RELSYSDIR)/c_src - $(INSTALL_DIR) $(RELSYSDIR)/priv - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin -- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj - $(INSTALL_PROGRAM) $(EXE_TARGET) $(RELSYSDIR)/priv/bin - endif - -diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index 1a371eb..62eac66 100644 ---- a/lib/os_mon/c_src/Makefile.in -+++ b/lib/os_mon/c_src/Makefile.in -@@ -136,7 +136,6 @@ release_spec: - else - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin - endif -diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index 5e6c74e..bf4843b 100644 ---- a/lib/ssl/c_src/Makefile.in -+++ b/lib/ssl/c_src/Makefile.in -@@ -199,15 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin --ifneq ($(SSL_MAKEFILE),) -- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj -- $(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj -- sed -e "s;%BINDIR%;../bin;" \ -- -e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \ -- -e "s;%OBJS;$(OBJS);" \ -- -e "s;%LIBS%;$(LIBS);" ./Makefile.dist \ -- > $(RELSYSDIR)/priv/obj/Makefile --endif - - release_docs_spec: - -diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 65a7f5f..144c1ba 100644 ---- a/lib/tools/c_src/Makefile.in -+++ b/lib/tools/c_src/Makefile.in -@@ -190,8 +190,6 @@ include ../vsn.mk - RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) - - release_spec: all -- $(INSTALL_DIR) $(RELSYSDIR)/c_src -- $(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) $(RELSYSDIR)/c_src - ifneq ($(PROGS),) - $(INSTALL_DIR) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(PROGS) $(RELSYSDIR)/bin diff --git a/testing/etracer/APKBUILD b/testing/etracer/APKBUILD index 8bc720c4d3..b8589db6cc 100644 --- a/testing/etracer/APKBUILD +++ b/testing/etracer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=etracer pkgver=0.4 -pkgrel=3 +pkgrel=4 pkgdesc="racing game where you race tux down a mountain" url="http://extremetuxracer.com/" arch="all" diff --git a/testing/evas/APKBUILD b/testing/evas/APKBUILD index 622fc788f4..1926607d9d 100644 --- a/testing/evas/APKBUILD +++ b/testing/evas/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=evas pkgver=1.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="hardware-accelerated retained canvas API" url="http://trac.enlightenment.org/e/wiki/Evas" arch="all" diff --git a/testing/fakechroot/APKBUILD b/testing/fakechroot/APKBUILD index 96525b3bad..bba493cf67 100644 --- a/testing/fakechroot/APKBUILD +++ b/testing/fakechroot/APKBUILD @@ -2,19 +2,19 @@ # Maintainer: pkgname=fakechroot pkgver=2.16 -pkgrel=0 -pkgdesc="fakeroot-like utility for chrooting" +pkgrel=1 +pkgdesc="A fakeroot-like utility for chrooting" url="http://github.com/fakechroot/fakechroot" arch="all" -license="LGPL" +license="LGPL2+" depends="" depends_dev="" -makedepends="$depends_dev" +makedepends="$depends_dev autoconf automake libtool" install="" subpackages="$pkgname-doc" -source="http://cloud.github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz" +source="fakechroot-$pkgver.tar.gz::https://github.com/fakechroot/fakechroot/archive/${pkgver}.tar.gz" -_builddir="${srcdir}/fakechroot-${pkgver}" +_builddir="${srcdir}/$pkgname-${pkgver}" prepare() { local i cd "$_builddir" @@ -23,13 +23,15 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + ./autogen.sh } build() { cd "$_builddir" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc || return 1 - make + make || return 1 } package() { @@ -38,4 +40,6 @@ package() { rm "$pkgdir"/usr/lib/fakechroot/*.la } -md5sums="3ea5efb76664e787450e0cfcefc1b807 fakechroot-2.16.tar.gz" +md5sums="f5f7326eaddaaf0229d70f22a0aef859 fakechroot-2.16.tar.gz" +sha256sums="c9baaa6aea853c1602ef5f3d8bdb153d5b5765f1e69cdf8244bab7417d61700c fakechroot-2.16.tar.gz" +sha512sums="c8cebf44ddd3ff21630db745b83f98984320d4730b53fbdaa9b7df545341146c87b8b9c2d85a4f31a516b7dcbc15aa83c5a9bf2bfc426de6e75fc88ce4e710f9 fakechroot-2.16.tar.gz" diff --git a/testing/flunym0us/APKBUILD b/testing/flunym0us/APKBUILD new file mode 100644 index 0000000000..41a04297c5 --- /dev/null +++ b/testing/flunym0us/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=flunym0us +pkgver=2.1 +pkgrel=0 +pkgdesc="A vulnerability scanner for wordpress and moodle" +url="http://code.google.com/p/flunym0us/" +arch="noarch" +license="GPL3" +depends="python" +depends_dev="" +makedepends="python-dev" +install="" +subpackages="" +source="http://flunym0us.googlecode.com/files/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + for _file in moodle-plugins.lst wp-plugins.lst; do + install -Dm644 "$srcdir"/$pkgname-$pkgver/$pkgname/$_file \ + "$pkgdir"/usr/share/$pkgname/$_file || return 1 + done +} + +md5sums="5f437c2797b39b03b6f80e8c1ef66f85 flunym0us-2.1.tar.gz" +sha256sums="97dc5896ca61b0a1e16933cb5c6369efe0b8bc83d2538a951bd03d5ffdd0675a flunym0us-2.1.tar.gz" +sha512sums="3ff2e0d3727604af8602b1fc2257c6cba90a96d19aff3b30d6793692086b533a234118698db24c5efcef7286196c29c21e8e54a47236e7a25c278cac301bf611 flunym0us-2.1.tar.gz" diff --git a/testing/fossil/APKBUILD b/testing/fossil/APKBUILD index d539b65400..72f0c1f6e8 100644 --- a/testing/fossil/APKBUILD +++ b/testing/fossil/APKBUILD @@ -1,8 +1,7 @@ # Contributor: Paul Onyschuk <blink@bojary.koba.pl> # Maintainer: pkgname=fossil -pkgver=1.22 -_pkgver=20120317175325 +pkgver=20130216000435 pkgrel=0 pkgdesc="Simple, high-reliability, distributed software configuration management" url="http://www.fossil-scm.org" @@ -10,14 +9,16 @@ arch="all" license="BSD" depends="" makedepends="openssl-dev zlib-dev" -source="http://www.fossil-scm.org/download/$pkgname-src-$_pkgver.tar.gz" -_builddir="$srcdir"/$pkgname-src-$_pkgver +source="http://www.fossil-scm.org/download/$pkgname-src-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-src-$pkgver build() { cd "$_builddir" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man || return 1 + --mandir=/usr/share/man \ + || return 1 make TCC="${CC:-gcc} $CFLAGS" || return 1 } @@ -26,4 +27,6 @@ package() { install -Dm 755 $pkgname "$pkgdir"/usr/bin/$pkgname || return 1 } -md5sums="a7106450722e8477972d230fa535702f fossil-src-20120317175325.tar.gz" +md5sums="f2de8262d1147c93c0f73a5b761bc445 fossil-src-20130216000435.tar.gz" +sha256sums="6fc0068a9174fc24ec9323cf7fddd771320248d9befc4a417746839a442c8de1 fossil-src-20130216000435.tar.gz" +sha512sums="7b80d74b3bc89e60a5fcee7ce6a4a96699260b8e204d245a264ac4ba3bfb09befcb4f764747fe8da3e68321383e31e91da80c0e90aa9b79ad4a84ccb6392f4d9 fossil-src-20130216000435.tar.gz" diff --git a/testing/ftgl/APKBUILD b/testing/ftgl/APKBUILD index 860f0c56f9..be42709cf5 100644 --- a/testing/ftgl/APKBUILD +++ b/testing/ftgl/APKBUILD @@ -3,7 +3,7 @@ pkgname=ftgl pkgver=2.1.3_rc5 _pkgver=2.1.3-rc5 -pkgrel=3 +pkgrel=4 pkgdesc="freetype OpenGL layer" url="http://ftgl.wiki.sourceforge.net/" arch="all" diff --git a/testing/getmail/APKBUILD b/testing/getmail/APKBUILD index 1cba0fe192..3facef3b60 100644 --- a/testing/getmail/APKBUILD +++ b/testing/getmail/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=getmail -pkgver=4.34.0 +pkgver=4.39.0 pkgrel=0 pkgdesc="POP3, IMAP4, and SDPS mail retriever with Maildir delivery" url="http://pyropus.ca/software/getmail/" @@ -13,8 +13,8 @@ makedepends="python-dev" install="" subpackages="$pkgname-doc" source="http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/$pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -35,4 +35,6 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="50e0f794de9ca947f837f0eee929d81b getmail-4.34.0.tar.gz" +md5sums="1ca7e1bc034cf5578e8ceb251668962a getmail-4.39.0.tar.gz" +sha256sums="d9ed32e8a745af9e6b2b39e8a65b7f181eb3b619534aadabb8b6e6b0026066ac getmail-4.39.0.tar.gz" +sha512sums="d700e7dd680dddf6c9473489fac75597dcb249f8c2d26372c91a5d32b5857b832810f25fce69c4c72a8e099cbd3963145fcb1d99ec7f2f155ee1d0a7244a3419 getmail-4.39.0.tar.gz" diff --git a/testing/gitstats/APKBUILD b/testing/gitstats/APKBUILD index d07ecd9cf1..fa7ab43433 100644 --- a/testing/gitstats/APKBUILD +++ b/testing/gitstats/APKBUILD @@ -1,22 +1,20 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=gitstats -git=ad7efbb9399e60cee6cb217c6b47e604174a8093 -pkgver=0 -pkgrel=0.${git:0:6} +pkgver=2012.08.30 +pkgrel=0 pkgdesc="Git history statistics generator" url="http://gitstats.sourceforge.net/" -arch="" +arch="noarch" license="GPL2+" depends="python gnuplot git" depends_dev="" makedepends="" install="" subpackages="" -source="http://repo.or.cz/w/gitstats.git/snapshot/$git.tar.gz - output.patch" +source="http://ftp.de.debian.org/debian/pool/main/g/$pkgname/"$pkgname"_$pkgver.orig.tar.bz2" -_builddir="$srcdir"/$pkgname +_builddir="$srcdir"/$pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -43,5 +41,6 @@ package() { } -md5sums="a5ae0f3c25aacea3b8f4656411791f07 ad7efbb9399e60cee6cb217c6b47e604174a8093.tar.gz -fa02fcd794241fdb9748f98403b8cdf2 output.patch" +md5sums="38481d75933bd98491fe3257f97d1050 gitstats_2012.08.30.orig.tar.bz2" +sha256sums="3763840ce17a679a5b5a065e796990e76b08d0ddb9da4018c0bf3c1dc4779262 gitstats_2012.08.30.orig.tar.bz2" +sha512sums="abbf0b7b406232851705d117200a8380bdb3cef14da1cf871f63f07de8a869989239538679f8a982a750ea849146ba07a05235880406023f6b986b16d39a47d9 gitstats_2012.08.30.orig.tar.bz2" diff --git a/testing/gitstats/output.patch b/testing/gitstats/gitstats-output.patch index 118a4cbb34..118a4cbb34 100644 --- a/testing/gitstats/output.patch +++ b/testing/gitstats/gitstats-output.patch diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD index 1f56f67ff3..db70b7338f 100644 --- a/testing/gnash/APKBUILD +++ b/testing/gnash/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=gnash pkgver=0.8.10 -pkgrel=4 +pkgrel=5 pkgdesc="GNU flash player implementation" url="http://www.gnashdev.org/" arch="all" diff --git a/testing/gnuplot/APKBUILD b/testing/gnuplot/APKBUILD index 273d236f55..892172f690 100644 --- a/testing/gnuplot/APKBUILD +++ b/testing/gnuplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=gnuplot -pkgver=4.6.0 +pkgver=4.6.1 pkgrel=0 pkgdesc="Utility for plotting graphs" url="http://www.gnuplot.info/" @@ -43,4 +43,6 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="8e6e92b4596ea0eb75e16a57fc79efec gnuplot-4.6.0.tar.gz" +md5sums="4c9a06461f402482c30cf94e267eb877 gnuplot-4.6.1.tar.gz" +sha256sums="f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 gnuplot-4.6.1.tar.gz" +sha512sums="a6a05da6708a7f5629d8356901e93ab622d4a3a6325e050fc1f8dce652e6061164783a98ff5cbc2dede65f6f0cb5be6a1ab2fcaeb778f6879215bae7056bd3ed gnuplot-4.6.1.tar.gz" diff --git a/testing/halfscan6/APKBUILD b/testing/halfscan6/APKBUILD new file mode 100644 index 0000000000..2c9c14b63f --- /dev/null +++ b/testing/halfscan6/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=halfscan6 +pkgver=0.2 +pkgrel=0 +pkgdesc="An simple IPv6 tcp port scanner" +url="http://www.habets.pp.se/synscan/programs.php?prog=halfscan6" +arch="all" +license="GPL2+" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="" +source="http://www.habets.pp.se/synscan/files/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + install -Dm755 halfscan6 "$pkgdir"/usr/bin/$pkgname +} + +md5sums="a77f0341aa2ccde43cd41157103fbd92 halfscan6-0.2.tar.gz" +sha256sums="544531f7bc114f97c57872ad8d803ef44245cebcdd6d1e6c106b1be10ca98050 halfscan6-0.2.tar.gz" +sha512sums="b363714edd60ee66547d401811a042a9760dd8e94faef7ceeb68d0e88e03c0d179e82b7c8ddd0ccca5b9f67a1fad05b446a6c762a903cfc0a205049536e5933e halfscan6-0.2.tar.gz" diff --git a/testing/inotify-tools/APKBUILD b/testing/inotify-tools/APKBUILD index 730b05c23e..5a06822c78 100644 --- a/testing/inotify-tools/APKBUILD +++ b/testing/inotify-tools/APKBUILD @@ -6,15 +6,14 @@ pkgrel=1 pkgdesc="C library and CLI tools providing a simple interface to inotify" url="http://github.com/rvoicilas/inotify-tools" arch="all" -license="GPL" -depends= -makedepends="wget" -install= +license="GPL2" +depends="" +makedepends="" +install="" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/downloads/rvoicilas/$pkgname/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver - prepare() { cd "$_builddir" # apply patches here @@ -26,7 +25,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + || return 1 make || return 1 } @@ -37,3 +37,5 @@ package() { } md5sums="b43d95a0fa8c45f8bab3aec9672cf30c inotify-tools-3.14.tar.gz" +sha256sums="222bcca8893d7bf8a1ce207fb39ceead5233b5015623d099392e95197676c92f inotify-tools-3.14.tar.gz" +sha512sums="6074d510e89bba5da0d7c4d86f2562c662868666ba0a7ea5d73e53c010a0050dd1fc01959b22cffdb9b8a35bd1b0b43c04d02d6f19927520f05889e8a9297dfb inotify-tools-3.14.tar.gz" diff --git a/testing/irrlicht/APKBUILD b/testing/irrlicht/APKBUILD index 84ce83a056..d40a373a55 100644 --- a/testing/irrlicht/APKBUILD +++ b/testing/irrlicht/APKBUILD @@ -1,8 +1,11 @@ # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org> pkgname=irrlicht -pkgver=1.7.3 -_pkgmajver=1.7 -pkgrel=1 +pkgver=1.8 +case $pkgver in +*.*.*) _pkgmajver=${pkgver%.*};; +*.*) _pkgmajver=${pkgver};; +esac +pkgrel=0 pkgdesc="3D graphics engine" url="http://irrlicht.sourceforge.net" arch="all" @@ -11,6 +14,7 @@ depends= depends_dev="mesa-dev jpeg-dev bzip2 libpng-dev zlib-dev" makedepends="$depends_dev" install="" +subpackages="$pkgname-dev $pkgname-doc" source="http://downloads.sourceforge.net/irrlicht/irrlicht-$pkgver.zip" _builddir="$srcdir"/$pkgname-$pkgver/source/Irrlicht @@ -74,4 +78,6 @@ package() { install -m755 "$srcdir"/$pkgname-$pkgver/bin/Linux/* "$pkgdir"/usr/share/$pkgname/examples/bin/ } -md5sums="cfbdc8c68fbca544c7c8dfb3623ae086 irrlicht-1.7.3.zip" +md5sums="d06329d8f466658caaf4838ba349e393 irrlicht-1.8.zip" +sha256sums="f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642 irrlicht-1.8.zip" +sha512sums="07aa6e49252f073e352fbd715b77d171b6d25d22e6b0faccaf7328b28693e6851f37498cfb4094f7b09d122170c491571431bf8f698828e82c2aa9d7ff792af7 irrlicht-1.8.zip" diff --git a/testing/krb5/APKBUILD b/testing/krb5/APKBUILD new file mode 100644 index 0000000000..1cde8e7e18 --- /dev/null +++ b/testing/krb5/APKBUILD @@ -0,0 +1,127 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=krb5 +pkgver=1.11 +pkgrel=0 +pkgdesc="The Kerberos network authentication system" +url="http://web.mit.edu/kerberos/www/" +arch="all" +license="MIT" +depends="" +depends_dev="" +makedepends="$depends_dev libverto-dev openldap-dev e2fsprogs-dev openssl-dev + keyutils-dev bison flex perl" +install="" +subpackages="$pkgname-dev $pkgname-doc $pkgname-server + $pkgname-server-ldap:ldap $pkgname-pkinit $pkgname-libs" +source="http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-$pkgver-signed.tar + mit-krb5-1.11_uninitialized.patch + mit-krb5_krb5-config_LDFLAGS.patch + krb5kadmind.initd + krb5kdc.initd + krb5kpropd.initd + " + +_builddir="$srcdir"/krb5-$pkgver +unpack() { + default_unpack + cd "$srcdir" + tar -zxf krb5-$pkgver.tar.gz +} + + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir"/src + ./configure \ + CPPFLAGS="$CPPFLAGS -fPIC -I/usr/include/et" \ + --prefix=/usr \ + --localstatedir=/var/lib \ + --enable-shared \ + --disable-static \ + --disable-rpath \ + --with-system-et \ + --with-system-ss \ + --with-system-verto \ + --without-tcl \ + --with-ldap \ + --with-crypto-impl=openssl \ + || return 1 + make +} + +package() { + cd "$_builddir"/src + make install DESTDIR="$pkgdir" || return 1 + mkdir -p "$pkgdir"/usr/share/doc/$pkgname + mv "$pkgdir"/usr/share/examples "$pkgdir"/usr/share/doc/$pkgname/ + + for i in $source; do + case $i in + *.initd) install -Dm755 "$srcdir"/$i \ + "$pkgdir"/etc/init.d/${i%.initd};; + esac + done +} + +server() { + pkgdesc="The KDC and related programs for Kerberos 5" + mkdir -p "$subpkgdir"/usr/share \ + "$subpkgdir"/usr/bin \ + "$subpkgdir"/etc/ + mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/ || return 1 + mv "$pkgdir"/usr/share/gnats "$subpkgdir"/usr/share/ || return 1 + mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/ || return 1 + # used for testing server + mv "$pkgdir"/usr/bin/sclient "$subpkgdir"/usr/bin/ + +} + +ldap() { + pkgdesc="The LDAP storage plugin for the Kerberos 5 KDC" + mkdir -p "$subpkgdir"/usr/lib/krb5/plugins/kdb + mv "$pkgdir"/usr/lib/krb5/plugins/kdb/kldap.so \ + "$subpkgdir"/usr/lib/krb5/plugins/kdb/ || return 1 + mv "$pkgdir"/usr/lib/libkdb_ldap* \ + "$subpkgdir"/usr/lib/ +} + +pkinit() { + pkgdesc="The PKINIT module for Kerberos 5" + mkdir -p "$subpkgdir"/usr/lib/krb5/plugins/preauth + mv "$pkgdir"/usr/lib/krb5/plugins/preauth/pkinit.so \ + "$subpkgdir"/usr/lib/krb5/plugins/preauth/pkinit.so +} + +libs() { + pkgdesc="The shared libraries used by Kerberos 5" + mkdir -p "$subpkgdir"/usr/ + mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ +} + +md5sums="1a13c53899806c4da99a798a04d25545 krb5-1.11-signed.tar +597cd7ab74a8113b86e3405c15ccfecb mit-krb5-1.11_uninitialized.patch +656e242de9b5ada1edf398983db51eef mit-krb5_krb5-config_LDFLAGS.patch +29906e70e15025dda8b315d8209cab4c krb5kadmind.initd +47efe7f24c98316d38ea46ad629b3517 krb5kdc.initd +3e0b8313c1e5bfb7625f35e76a5e53f1 krb5kpropd.initd" +sha256sums="fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651 krb5-1.11-signed.tar +81a0d432b6d1686587b25b6ce70f0b8558e0c693da4c63b9de881962ae01c043 mit-krb5-1.11_uninitialized.patch +9ebfc38cc167bbf451105807512845cd961f839d64b7e2904a6c4e722e41fe2b mit-krb5_krb5-config_LDFLAGS.patch +c7a1ec03472996daaaaf1a4703566113c80f72ee8605d247098a25a13dad1f5f krb5kadmind.initd +709309dea043aa306c2fcf0960e0993a6db540c220de64cf92d6b85f1cca23c5 krb5kdc.initd +86b15d691e32b331ac756ee368b7364de6ab238dcae5adfed2a00b57d1b64ef4 krb5kpropd.initd" +sha512sums="ee6194d3d504c3d40cb025b9988dcdcabbfdcf5de4711c3475f9ac1d4178095fe2114691c0f212c21d2b99d771ecc42cdd14bd18e7c987681c0092e6ce46068f krb5-1.11-signed.tar +4d2ea5189971df13bf874d29bcf89fa3bfeb1d25b3bd9245ee7c88f5c4834e950c5978ce13df3b8fc05f98dd7d5510dad43af0440436958fa23f9e1a51f60f76 mit-krb5-1.11_uninitialized.patch +8118518e359cb5e69e3321b7438b200d5d74ceeac16b4623bf4e4bfb4ead6c656de6fa153f9bcc454097b45a512bc8cd0798b1f062a2c4a09f75253b204a7a17 mit-krb5_krb5-config_LDFLAGS.patch +561af06b4e0f0e130dda345ad934bcdb9984ec00cc38d871df1d3bb3f9e1c7d86f06db5b03229707c88b96ad324e3a2222420f8494aa431002cacea0246b1153 krb5kadmind.initd +d6d0076886ce284fc395fafc2dc253b4b3ee97b2986dea51388d96a1e1294680fb171f475efc7844559e2c6aac44b26678a9255921db9a58dcf2e7164f0aeec5 krb5kdc.initd +f97d33fa977c132a470d95fd539d8e8db018e03f28dbc9d3e04faf78ebb7392196e7d5135f138c2390979bf37b3ae0265e6827f0c17b44b277eb2dfff0a96f77 krb5kpropd.initd" diff --git a/testing/krb5/krb5kadmind.initd b/testing/krb5/krb5kadmind.initd new file mode 100644 index 0000000000..a1cdfef822 --- /dev/null +++ b/testing/krb5/krb5kadmind.initd @@ -0,0 +1,25 @@ +#!/sbin/runscript + +#--------------------------------------------------------------------------- +# This script starts/stops the MIT Kerberos 5 Admin daemon +#--------------------------------------------------------------------------- + +daemon="MIT Kerberos 5 Admin daemon" +exec="/usr/sbin/kadmind" + +depend() { + need krb5kdc + use net +} + +start() { + ebegin "Starting $daemon" + start-stop-daemon --start --quiet --exec ${exec} 1>&2 + eend $? "Error starting $daemon" +} + +stop() { + ebegin "Stopping $daemon" + start-stop-daemon --stop --quiet --exec ${exec} 1>&2 + eend $? "Error stopping $daemon" +} diff --git a/testing/krb5/krb5kdc.initd b/testing/krb5/krb5kdc.initd new file mode 100644 index 0000000000..94f1f79379 --- /dev/null +++ b/testing/krb5/krb5kdc.initd @@ -0,0 +1,24 @@ +#!/sbin/runscript + +#--------------------------------------------------------------------------- +# This script starts/stops the MIT Kerberos 5 KDC +#--------------------------------------------------------------------------- + +daemon="MIT Kerberos 5 KDC" +exec="/usr/sbin/krb5kdc" + +depend() { + use net +} + +start() { + ebegin "Starting $daemon" + start-stop-daemon --start --quiet --exec ${exec} 1>&2 + eend $? "Error starting $daemon" +} + +stop() { + ebegin "Stopping $daemon" + start-stop-daemon --stop --quiet --exec ${exec} 1>&2 + eend $? "Error stopping $daemon" +} diff --git a/testing/krb5/krb5kpropd.initd b/testing/krb5/krb5kpropd.initd new file mode 100644 index 0000000000..8b4b82975e --- /dev/null +++ b/testing/krb5/krb5kpropd.initd @@ -0,0 +1,24 @@ +#!/sbin/runscript + +#--------------------------------------------------------------------------- +# This script starts/stops the MIT Kerberos 5 kpropd +#--------------------------------------------------------------------------- + +daemon="MIT Kerberos 5 kpropd" +exec="/usr/sbin/kpropd" + +depend() { + use net krb5kdc krb5kadmind +} + +start() { + ebegin "Starting $daemon" + start-stop-daemon --start --quiet --exec ${exec} -- -S 1>&2 + eend $? "Error starting $daemon" +} + +stop() { + ebegin "Stopping $daemon" + start-stop-daemon --stop --quiet --exec ${exec} 1>&2 + eend $? "Error stopping $daemon" +} diff --git a/testing/krb5/mit-krb5-1.11_uninitialized.patch b/testing/krb5/mit-krb5-1.11_uninitialized.patch new file mode 100644 index 0000000000..a32d01d51f --- /dev/null +++ b/testing/krb5/mit-krb5-1.11_uninitialized.patch @@ -0,0 +1,81 @@ +--- a/src/slave/kprop.c ++++ b/src/slave/kprop.c +@@ -91,7 +91,7 @@ main(argc, argv) + int argc; + char **argv; + { +- int fd, database_fd, database_size; ++ int fd = -1, database_fd, database_size; + krb5_error_code retval; + krb5_context context; + krb5_creds *my_creds; +--- a/src/kadmin/ktutil/ktutil_funcs.c ++++ b/src/kadmin/ktutil/ktutil_funcs.c +@@ -64,7 +64,7 @@ + krb5_kt_list *list; + int idx; + { +- krb5_kt_list lp, prev; ++ krb5_kt_list lp, prev = NULL; + int i; + + for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { +--- a/src/lib/kadm5/alt_prof.c ++++ b/src/lib/kadm5/alt_prof.c +@@ -164,7 +164,7 @@ + char **values; + char *valp; + int idx; +- krb5_boolean val; ++ krb5_boolean val = 0; + + kret = krb5_aprof_getvals (acontext, hierarchy, &values); + if (kret) +--- a/src/lib/krb5/unicode/ucstr.c ++++ b/src/lib/krb5/unicode/ucstr.c +@@ -109,7 +109,7 @@ + krb5_data ** newdataptr, + unsigned flags) + { +- int i, j, len, clen, outpos, ucsoutlen, outsize; ++ int i, j, len, clen, outpos = 0, ucsoutlen, outsize; + char *out = NULL, *outtmp, *s; + krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL; + krb5_data *newdata; +diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c +index 7dc5b47..cd90db8 100644 +--- a/src/util/profile/prof_init.c ++++ b/src/util/profile/prof_init.c +@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile) + { + errcode_t err; + void *cbdata; +- profile_t new_profile; ++ profile_t new_profile = NULL; + + *ret_new_profile = NULL; + +--- a/src/lib/krb5/krb/preauth2.c 2012-12-24 12:39:18.432678497 +0100 ++++ b/src/lib/krb5/krb/preauth2.c 2012-12-24 12:50:49.444099126 +0100 +@@ -956,7 +956,7 @@ + size_t i, h; + int out_pa_list_size = 0; + krb5_pa_data **out_pa_list = NULL; +- krb5_error_code ret, module_ret; ++ krb5_error_code ret, module_ret = 0; + krb5_responder_fn responder = opte->opt_private->responder; + static const int paorder[] = { PA_INFO, PA_REAL }; + +--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c.orig 2013-02-15 14:38:43.742293824 +0000 ++++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c 2013-02-15 14:41:06.806870075 +0000 +@@ -1359,8 +1359,8 @@ + goto cleanup; + + for (i=0; bvalues[i] != NULL; ++i) { +- krb5_int16 n_kd; +- krb5_key_data *kd; ++ krb5_int16 n_kd = 0; ++ krb5_key_data *kd = NULL; + krb5_data in; + + if (bvalues[i]->bv_len == 0) diff --git a/testing/krb5/mit-krb5_krb5-config_LDFLAGS.patch b/testing/krb5/mit-krb5_krb5-config_LDFLAGS.patch new file mode 100644 index 0000000000..0b300cb44a --- /dev/null +++ b/testing/krb5/mit-krb5_krb5-config_LDFLAGS.patch @@ -0,0 +1,12 @@ +Bug #448778 +--- krb5-1.11/src/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 ++++ krb5-1.11/src/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 +@@ -217,7 +217,7 @@ + -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ +- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ ++ -e 's#\$(LDFLAGS)##' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)##'` + diff --git a/testing/libcli/APKBUILD b/testing/libcli/APKBUILD index 5d44f8319e..f49874bb2e 100644 --- a/testing/libcli/APKBUILD +++ b/testing/libcli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=libcli -pkgver=1.9.6 +pkgver=1.9.7 pkgrel=0 pkgdesc="A library for including a Cisco-like command-line interface" url="https://github.com/dparrish/libcli" @@ -12,7 +12,7 @@ depends_dev="" makedepends="$depends_dev" install="" subpackages="$pkgname-dev" -source="https://github.com/downloads/dparrish/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://github.com/dparrish/libcli/archive/v$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -36,4 +36,6 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="e52866b2cf1592d1557d2193db592f94 libcli-1.9.6.tar.gz" +md5sums="f33e0fdb8ae8e14e66036424704b201b v1.9.7.tar.gz" +sha256sums="7ddda6b6e044a1498cf3a27e49ed5d7b97840bbe5a036c43fb0532b5e431886c v1.9.7.tar.gz" +sha512sums="b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f v1.9.7.tar.gz" diff --git a/testing/libdvdcss/APKBUILD b/testing/libdvdcss/APKBUILD index c9e443b053..f79838be6b 100644 --- a/testing/libdvdcss/APKBUILD +++ b/testing/libdvdcss/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libdvdcss -pkgver=1.2.11 +pkgver=1.2.13 pkgrel=0 -pkgdesc="a library to access (encrypted) DVDs like a block device" +pkgdesc="A library to access (encrypted) DVDs like a block device" url="http://www.videolan.org/developers/libdvdcss.html" arch="all" -license="GPL" +license="GPL2+" depends="" depends_dev="" makedepends="$depends_dev" @@ -34,6 +34,7 @@ build() { --localstatedir=/var \ || return 1 make || return 1 + make test || return 1 } package() { @@ -42,4 +43,6 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="d25d906c3f9007ccd91b1efb909f93e7 libdvdcss-1.2.11.tar.bz2" +md5sums="53cfc52a60a156763c425572e5179273 libdvdcss-1.2.13.tar.bz2" +sha256sums="84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c libdvdcss-1.2.13.tar.bz2" +sha512sums="b7d912ef87854bca052c2f38709d49eeb72be9148b6598a7f71f9ccb1ad7f43a521f9533821fbd8d7ef16e2c36fe140209c9183f5ca91e8f806150cc16645717 libdvdcss-1.2.13.tar.bz2" diff --git a/testing/libewf/APKBUILD b/testing/libewf/APKBUILD index 9c26ad3ce9..46e4dbced3 100644 --- a/testing/libewf/APKBUILD +++ b/testing/libewf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=libewf -pkgver=20120504 +pkgver=20130303 pkgrel=0 pkgdesc="Library to support the Expert Witness Compression Format" url="http://libewf.sourceforge.net" @@ -12,9 +12,9 @@ depends_dev="zlib-dev" makedepends="$depends_dev" install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://downloads.sourceforge.net/libewf/libewf-$pkgver.tar.gz" -_builddir="$srcdir"/libewf-$pkgver +source="http://libewf.googlecode.com/files/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver prepare() { local i cd "$_builddir" @@ -40,4 +40,6 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="1b96b845476173353839ca72bca12097 libewf-20120504.tar.gz" +md5sums="adbdffca0edc7f8d30748a9009a5a2ce libewf-20130303.tar.gz" +sha256sums="a4a3a0179f882d0f392ea19893275da4146fb412d5211280d2d06d9f238451a5 libewf-20130303.tar.gz" +sha512sums="92f029c932265d0e0ee8f1a7e47ab02efd51977c13f1c811cca7d7137478ec33c99da1f8e07d8d2e71c8d5740a7ed15532440d9529bb2753704fad03fc66c01b libewf-20130303.tar.gz" diff --git a/testing/liblo/APKBUILD b/testing/liblo/APKBUILD index a7c9c18722..54ce604337 100644 --- a/testing/liblo/APKBUILD +++ b/testing/liblo/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="Open Sound Control library" url="http://liblo.sourceforge.net" arch="all" -license="LGPLv2+" +license="LGPL2+" depends="" makedepends="" install="" diff --git a/testing/liboping/APKBUILD b/testing/liboping/APKBUILD index 438b967e71..27ff74023f 100644 --- a/testing/liboping/APKBUILD +++ b/testing/liboping/APKBUILD @@ -1,26 +1,22 @@ # Contributor: Harry # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=liboping -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=0 -pkgdesc="A Ping Lib" +pkgdesc="A C library to generate ICMP echo requests" url="http://verplant.org/liboping/" arch="all" -license=GPL -depends= -# make install needs setcap provided by libcap -makedepends="ncurses-dev libcap" -source="http://verplant.org/liboping/files/$pkgname-$pkgver.tar.bz2" +license="LGPL2+" +depends="" +makedepends="ncurses-dev" subpackages="$pkgname-dev $pkgname-doc" +source="http://verplant.org/liboping/files/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir/$pkgname-$pkgver" -prepare() { - cd "$_builddir" -} - build() { cd "$_builddir" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --libdir=/usr/lib \ --without-perl-bindings \ --disable-static \ @@ -34,4 +30,6 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="748554a18e1771913f4f402ee9f957c9 liboping-1.6.1.tar.bz2" +md5sums="64a6f31310093d2517cfe7f05aa011e0 liboping-1.6.2.tar.bz2" +sha256sums="5f4ab4b127b5a8a79ab771002604bff0e2903622393e5602f336cad258bb73cf liboping-1.6.2.tar.bz2" +sha512sums="6e09cff67f0d87382a0c63b7b515de5bae0db97996b450aba5432a2bcd05d0b5c7481323c23d839c8937dd132bc9cfc5bb1a4ca50a3746653f4893fccd27357f liboping-1.6.2.tar.bz2" diff --git a/testing/libprojectm/APKBUILD b/testing/libprojectm/APKBUILD index f7c476ff6d..3bb14afdd7 100644 --- a/testing/libprojectm/APKBUILD +++ b/testing/libprojectm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libprojectm pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="milkdrop-like music visualizer using opengl" url="http://projectm.sourceforge.net/" arch="all" diff --git a/testing/mongrel2/APKBUILD b/testing/mongrel2/APKBUILD new file mode 100644 index 0000000000..eb7dd24420 --- /dev/null +++ b/testing/mongrel2/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=mongrel2 +pkgver=1.8.0 +pkgrel=0 +pkgdesc="Web server for web applications" +url="http://mongrel2.org/" +arch="all" +license="GPL" +depends= +makedepends="zeromq-dev sqlite-dev" +install= +subpackages="" +source="$pkgname-$pkgver.tar.gz::https://github.com/zedshaw/mongrel2/archive/v$pkgver.tar.gz" + +_builddir="$srcdir"/mongrel2-$pkgver +prepare() { + # apply patches here + return 0 +} + +build() { + cd "$_builddir" + make PREFIX=/usr -j1 || return 1 +} + +package() { + cd "$_builddir" + make PREFIX=/usr DESTDIR="$pkgdir" install +} + +md5sums="2492b774e46299434e344b1ec797b250 mongrel2-1.8.0.tar.gz" +sha256sums="67d15f6a32a1011010c5c7f51480b697d9f7ba9becdb9dad4998dc4681096373 mongrel2-1.8.0.tar.gz" +sha512sums="2ca95d275b8ea5648fc60a49866e4aa1482abab46970e43bfb7e398fcd76de153b174237892bb1e8b0480d841b92b9d03b7b4ea283a4aa1697fb2126f30f2a73 mongrel2-1.8.0.tar.gz" diff --git a/testing/netsink/APKBUILD b/testing/netsink/APKBUILD new file mode 100644 index 0000000000..36f0bc7cd1 --- /dev/null +++ b/testing/netsink/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=netsink +pkgver=0.1 +pkgrel=0 +pkgdesc="A Network Sinkhole for Isolated Malware Analysis" +url="https://github.com/shendo/netsink" +arch="noarch" +license="GPL3+" +depends="python py-dnslib" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="5972b1560bd3143aba87955e9af34725 netsink-0.1.tar.gz" +sha256sums="5cfa58284d51f1491dc3cea7b32c9f1a45c54897d6bacf396763b28eb30acb72 netsink-0.1.tar.gz" +sha512sums="1322b4fec969e76185aec96b2c9a1a6bc0107301455fbdc0902cf8b258ed9528ab06747019bade0b2a6b1621cd4b4216186b642c098c70b6b1dd6c1552521455 netsink-0.1.tar.gz" diff --git a/testing/openvswitch/APKBUILD b/testing/openvswitch/APKBUILD index 1104b85672..f1af030f21 100644 --- a/testing/openvswitch/APKBUILD +++ b/testing/openvswitch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=openvswitch -pkgver=1.7.1 +pkgver=1.7.3 pkgrel=0 pkgdesc="an open virtual switch" url="http://openvswitch.org/" @@ -63,10 +63,24 @@ package() { install -Dm644 "$srcdir"/ovs-vswitchd.confd "$pkgdir"/etc/conf.d/ovs-vswitchd } -md5sums="70a7076f84cdb4c0ee86c380e7f7aa78 openvswitch-1.7.1.tar.gz +md5sums="aa0d4fefb587469b4cc70f657da58b7d openvswitch-1.7.3.tar.gz 8cc7f62777212fab9fc1c8c506a32e65 ovsdb-server.initd 9c2c1d774be02f2e69609bcc4f24a370 ovsdb-server.confd 4e6e5afd1dc2d3bc1043dab19cd9f61f ovs-controller.initd 0f5ce60dda512b29d4e20cb832e062d4 ovs-controller.confd 623db751bbdc390d9e9c076c0ce9a6b2 ovs-vswitchd.initd 2d1e0111ea62779f49e14d62678294b2 ovs-vswitchd.confd" +sha256sums="b750ce656031ec5f150f96834088d5096e351a7578fe0057f1e040fde0d5fdb1 openvswitch-1.7.3.tar.gz +c598cf6d78e7343d1491bc303c4079e20b7687a9ff4f9fa501e62f925fd722f5 ovsdb-server.initd +15c508d134fed8cda13e2d394fc7c20b9868294a30e73a952ebffd31df129251 ovsdb-server.confd +4e83dd7990ae17752ebc45e6e1648258827fd7cbe900b68d2867860e30641b2c ovs-controller.initd +950996914d7991550ead5fcfb5b262c60b5f53df6796c111105baa2a89a39431 ovs-controller.confd +14219de96680153d681254228ab47bfc00b0f8a2b79d7690a2d3bede7b64932b ovs-vswitchd.initd +cc189d5ca24708ff775a4de312df3f611c65714724b8901ec6527c9e3f22e14a ovs-vswitchd.confd" +sha512sums="3d5fdd9d06458bd3a181dd2e0cd9eeb3b42a96f46193175d3247ef77babbfda51b5762f58c6f51548c149e4a1ded8fa9d2e2c1ed3468afa9b3f67b13d42bacd7 openvswitch-1.7.3.tar.gz +a57ce90d58a3d9a2b2ae9dd1e1b4f9565a1bf6e205882be98b60bc02f4481cf884e18e1b40f80a99e79e6eebee0f5fca2844915a2acf90218a9d351b71e85de6 ovsdb-server.initd +a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa ovsdb-server.confd +b8f44f0ccbbafb5183acdebefb12b5fac3e3bd40a83fa70b7be2298ce95c58bd3eca38d7168785143a62730703bdde21adb4e56d330abfe3281d9118f4146c2e ovs-controller.initd +e8f28b01a080d4ba11db7f17e61d4352241194e723fc198cc1c7ce60717be297025b892633599be3e1dc86dec525c1be41b9f22a5c06b8a4c267555195c92dc9 ovs-controller.confd +aa37a7d6510399b90341673ea55ed0322a68d201ea722a508de1715559818abdeee4fa7983ff03487bba1ee7e54a195591f51be0b5df5fba89762fb9db2e94eb ovs-vswitchd.initd +346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd" diff --git a/testing/phonon-backend-gstreamer/APKBUILD b/testing/phonon-backend-gstreamer/APKBUILD index 3c3177a65d..b4e4e13857 100644 --- a/testing/phonon-backend-gstreamer/APKBUILD +++ b/testing/phonon-backend-gstreamer/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: pkgname=phonon-backend-gstreamer pkgver=4.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="gstreamer backend for phonon" url="http://phonon.kde.org/" arch="all" license="LGPL" depends= -depends_dev="gstreamer-dev gst-plugins-base-dev gst-plugins-good-dev phonon-dev mesa-dev alsa-lib-dev" +depends_dev="gstreamer-dev gst-plugins-base-dev gst-plugins-good phonon-dev + mesa-dev alsa-lib-dev" makedepends="$depends_dev cmake automoc4" install="" subpackages="" diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD index feb883f692..1da57603f3 100644 --- a/testing/proftpd/APKBUILD +++ b/testing/proftpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net> pkgname=proftpd -pkgver=1.3.4b +pkgver=1.3.4c pkgrel=0 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" @@ -54,7 +54,15 @@ package() { "$pkgdir"/etc/conf.d/$pkgname || return 1 } -md5sums="0871e0b93c9c3c88ca950b6d9a04aed2 proftpd-1.3.4b.tar.gz +md5sums="65f61e953bea249f8377e681594143a5 proftpd-1.3.4c.tar.gz cee983fba72533440d1a95c87bbbefc3 mempcpy.patch 175ce0cef2fb410d0ac8929ad421f941 proftpd.initd aab5852ac574e87781f1c9c4942e699b proftpd.confd" +sha256sums="fb80dd422969b8c900920a30a56f5e272862275d244d3857a980f5f2386ea912 proftpd-1.3.4c.tar.gz +8d6167cf16551df61139e0410309303721fa58d3898fe9243648c319b61b7135 mempcpy.patch +afcc8971c7ddba740979117f62a01b70453e53b36806c2b2328ca32f47a5964d proftpd.initd +36677336553d5b6bc96b36be766d9eadcc42946a25cb38c0824ff509ede31955 proftpd.confd" +sha512sums="8482217075412cc5c578822124f866b0eec502172e49407d962198010a575d914664cb580bc7f2ffa7c4da0d60a4156959135f56f50013543bf00f6cf6fbb7b3 proftpd-1.3.4c.tar.gz +50973de4bb234d455d8ec076c80b692b694a179f07a3903f821887bf75adce1f0672f62c97840c08e0d99bfce05f5b710aa15818031580b3f768ed7c77d2971e mempcpy.patch +a2aedcfe4c1e78c7591a21943e63f4880eb461935130ed93d4037a80374e7f70b42f37959c23bd82bf965e67b8c9fab6488d84d01628d23231a5c65270b06a74 proftpd.initd +ea06653f14484b6e3b4267cd964a37d3218c5bcff141c6a33a2e1b46c1f43eaa2996f0d9c3c3eb40c8a8ae9534be09803f53979c37d5fb760d7231a5d3003977 proftpd.confd" diff --git a/testing/py-acl/APKBUILD b/testing/py-acl/APKBUILD new file mode 100644 index 0000000000..23a6ff3b23 --- /dev/null +++ b/testing/py-acl/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-acl +_pkgname=acl +pkgver=0.2 +pkgrel=0 +pkgdesc="A python network access control list parsing library" +url="https://github.com/jathanism/acl" +arch="noarch" +license="Apache2" +depends="python" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="b86adc869292e0fa29f29e78dc33ae8a acl-0.2.tar.gz" +sha256sums="30c7257ace2f3b607ba64f1bdf5114af57f3ea191481d77bc985386c8bdef048 acl-0.2.tar.gz" +sha512sums="7307fcc13ed888d137ff26d960a465b44ca6d43a8aa591c1eb7e37a3e3612cf079c428204a36dc9293fff98e84cc96f139da04bb179e87f5fa545bed4c20c717 acl-0.2.tar.gz" diff --git a/testing/py-awake/APKBUILD b/testing/py-awake/APKBUILD new file mode 100644 index 0000000000..a94712aad2 --- /dev/null +++ b/testing/py-awake/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-awake +_pkgname=awake +pkgver=1.0 +pkgrel=0 +pkgdesc="A command and library to 'wake on lan' a remote host" +url="https://github.com/cyraxjoe/awake" +arch="noarch" +license="GPL3" +depends="python" +depends_dev="" +makedepends="python-dev" +install="" +subpackages="$pkgname-doc" +source="$_pkgname-$pkgver.tar.gz::https://github.com/cyraxjoe/awake/archive/v$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +doc() { + # Doc files + _docs="CHANGES LICENSE README" + for _doc in $_docs; do + install -Dm644 "$srcdir"/$_pkgname-$pkgver/$_doc \ + "$subpkgdir"/usr/share/doc/$pkgname/$_doc || return 1 + done +} + +md5sums="3ecbe84d477e280e020f69c508f76ef6 awake-1.0.tar.gz" +sha256sums="81369a21dd32c44284ee68b1fc283d0edd0da483f3e1655877ec1db2f1c22df5 awake-1.0.tar.gz" +sha512sums="65d7c7344b1478431be59e4cebfd3b043d9034bb0bbc3562979b79064539669f496ef163ae9e71b47dac8289d3b5e6488f994135ee49e305c3ba9c95ea59c42f awake-1.0.tar.gz" diff --git a/testing/py-buildutils/APKBUILD b/testing/py-buildutils/APKBUILD index cbc08cc7a3..2ff65c319d 100644 --- a/testing/py-buildutils/APKBUILD +++ b/testing/py-buildutils/APKBUILD @@ -1,24 +1,30 @@ # Contributor: Andrew Manison <amanison@anselsystems.com> -# Maintainer: +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-buildutils _pkgname=${pkgname#py-} pkgver=0.3 pkgrel=1 -pkgdesc="buildutils is a collection of enhancements to the Python distutils" +pkgdesc="Buildutils is a collection of enhancements to the Python distutils" url="http://pypi.python.org/pypi/buildutils/0.3" -arch="all" -license="GPL" -depends="python py-setuptools" -makedepends="python-dev" -install= +arch="noarch" +license="MIT" +depends="python" +makedepends="python-dev py-setuptools" +install="" subpackages="" source="http://pypi.python.org/packages/source/b/$_pkgname/$_pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$srcdir"/$_pkgname-$pkgver - mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages - python setup.py install --root="$pkgdir" - echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } md5sums="fec620dee05f591edad386366b52e17b buildutils-0.3.tar.gz" +sha256sums="8f9921cf145a1879986b4028db0af4f028f65fe6eae29936490174037ba7dfc5 buildutils-0.3.tar.gz" +sha512sums="63e3c0e9737672abcb7f9b10909df69f93eb801eeb829f840aaabc37428fc640ed7df4232283f933e5f0bb80b0195624b1ba69aeba1b01b7a61250bf6e6b6421 buildutils-0.3.tar.gz" diff --git a/testing/py-columnize/APKBUILD b/testing/py-columnize/APKBUILD new file mode 100644 index 0000000000..2a581b594f --- /dev/null +++ b/testing/py-columnize/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-columnize +_pkgname=columnize +pkgver=0.3.4 +pkgrel=0 +pkgdesc="Python module to align in columns a simple list" +url="http://code.google.com/p/pycolumnize/" +arch="noarch" +license="MIT" +depends="" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pycolumnize.googlecode.com/files/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="fa30b7e6db805ccec5142844b8de74ce columnize-0.3.4.tar.gz" +sha256sums="86beaae6a0202fb1fa7e5e91a13c95cfc7e28e5ba0f4aa362c9742986edc71eb columnize-0.3.4.tar.gz" +sha512sums="4c12f1cfd6f1f77323a78cfbe19c82918524e1338078010a3f614daa520df806c406dddcabd86137c049ff364f1b1e1feeaf104445c9c9058376ac8160b8663c columnize-0.3.4.tar.gz" diff --git a/testing/py-dnslib/APKBUILD b/testing/py-dnslib/APKBUILD new file mode 100644 index 0000000000..cee448b5f7 --- /dev/null +++ b/testing/py-dnslib/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-dnslib +_pkgname=dnslib +pkgver=0.8.2 +pkgrel=0 +pkgdesc="A simple library to encode/decode DNS wire-format packets" +url="https://bitbucket.org/paulc/dnslib/" +arch="noarch" +license="BSD" +depends="python" +depends_dev="" +makedepends="python-dev" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="a946382e38d382b92cf3a5f253827441 dnslib-0.8.2.tar.gz" +sha256sums="ae63e795b299286db12df7de443873fe91da6f4195a0cb164f2fc2f9b881f964 dnslib-0.8.2.tar.gz" +sha512sums="c1753ce95d59322243e857b1481a2b0a6f0a59299df80280c383159e5705a999a5578212a9ee30595e845821f1e8e8edf9883af992193e95debac706eb5e8e3a dnslib-0.8.2.tar.gz" diff --git a/testing/py-dnspython/APKBUILD b/testing/py-dnspython/APKBUILD index 063bcbc835..cfdc02ac3e 100644 --- a/testing/py-dnspython/APKBUILD +++ b/testing/py-dnspython/APKBUILD @@ -2,21 +2,30 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=py-dnspython _pkgname=dnspython -pkgver=1.9.4 +pkgver=1.10.0 pkgrel=0 pkgdesc="A DNS toolkit for Python" url="http://www.dnspython.org" arch="noarch" license="BSD" depends= -depends_dev="python-dev" -makedepends="$depends_dev" +depends_dev="" +makedepends="python-dev py-setuptools" install="" subpackages="" source="http://www.dnspython.org/kits/$pkgver/$_pkgname-$pkgver.tar.gz" + _builddir="$srcdir"/$_pkgname-$pkgver +build() { + cd "$_builddir" + python setup.py build || return 1 +} + package() { cd "$_builddir" - python setup.py install --root=$pkgdir + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } -md5sums="8a89b7865251c4e9d8ec2f8cc9f8cd78 dnspython-1.9.4.tar.gz" + +md5sums="b4f60852fd7ba64fc7c3a1fa239eba33 dnspython-1.10.0.tar.gz" +sha256sums="4dc21450ec6ac94dd105b4e5f39a75b404ad45a30869ff73acb6fd4d9974f857 dnspython-1.10.0.tar.gz" +sha512sums="17c525f4e31e6759bb14ce3f5a5cba57e075222e291e67fc946d6a80b6ba1a01e72978f70f39d93b13fea83c99658a8bdb5e63c291eae6ff0b64b2b65f7060da dnspython-1.10.0.tar.gz" diff --git a/testing/py-egenix-mx-base/APKBUILD b/testing/py-egenix-mx-base/APKBUILD index c73080c18e..902353d6e7 100644 --- a/testing/py-egenix-mx-base/APKBUILD +++ b/testing/py-egenix-mx-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-egenix-mx-base _pkgname=egenix-mx-base -pkgver=3.2.3 +pkgver=3.2.5 pkgrel=0 pkgdesc="eGenix.com mx Base ccollection of Python extensions" url="http://www.egenix.com/products/python/mxBase/" @@ -27,4 +27,6 @@ package() { install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="3797b67158ef18fb5b427ff8eec1e531 egenix-mx-base-3.2.3.tar.gz" +md5sums="2f982afa5ac70691965e9990df138186 egenix-mx-base-3.2.5.tar.gz" +sha256sums="bfd0d2aeef73532697c857db26ea11a3574280b1d439d42501c36b4c1d989dce egenix-mx-base-3.2.5.tar.gz" +sha512sums="707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42 egenix-mx-base-3.2.5.tar.gz" diff --git a/testing/py-libacl/APKBUILD b/testing/py-libacl/APKBUILD index c0c1da0c83..3f6e2442c6 100644 --- a/testing/py-libacl/APKBUILD +++ b/testing/py-libacl/APKBUILD @@ -14,8 +14,8 @@ makedepends="python-dev acl-dev py-setuptools" install="" subpackages="" source="https://github.com/downloads/iustin/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -27,3 +27,5 @@ package() { } md5sums="a429256345ffdc2cea57fd24da0d980d pylibacl-0.5.1.tar.gz" +sha256sums="3338b616c5449c031d541c2885f6449a1bdcd6a170cfaef4efc2d895e4d1b3c5 pylibacl-0.5.1.tar.gz" +sha512sums="99ff95c8551a8bf3153314ca9851e0529de516d2bdab32e693e5280259513f3eca65b5ff941527a780afce3d1dbaee52bb34e09c387fed82bea32526bb42040b pylibacl-0.5.1.tar.gz" diff --git a/testing/py-logilab-common/APKBUILD b/testing/py-logilab-common/APKBUILD index e409420dce..add1753b2d 100644 --- a/testing/py-logilab-common/APKBUILD +++ b/testing/py-logilab-common/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-logilab-common _pkgname=logilab-common -pkgver=0.58.3 +pkgver=0.59.0 pkgrel=0 pkgdesc="A collection of Python packages and modules used by Logilab projects" url="http://www.logilab.org/project/logilab-common" @@ -42,4 +42,6 @@ doc() { mv "$_builddir"/doc/*.1 "$subpkgdir"/usr/share/man/man1/ || return 1 } -md5sums="d6ea36a311381de92b7d7de3ec69e018 logilab-common-0.58.3.tar.gz" +md5sums="aab8881da1a08ffe625146a312b2e28f logilab-common-0.59.0.tar.gz" +sha256sums="ebd7b84c0439fe003a85832ae5dba490ed081366866e72d30054178193afaaea logilab-common-0.59.0.tar.gz" +sha512sums="a38ba336c7877f94c93c2aedf9a8d225dd8f7d1a70b655bfb66df53f7a9ddd403ead5b85755bcefa52f6828e57967f20b397011bbf7f8964770bda4d3c12fbe0 logilab-common-0.59.0.tar.gz" diff --git a/testing/py-m2crypto/APKBUILD b/testing/py-m2crypto/APKBUILD index 4719b4e0e5..619dde1f55 100644 --- a/testing/py-m2crypto/APKBUILD +++ b/testing/py-m2crypto/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-m2crypto _pkgname=M2Crypto pkgver=0.21.1 @@ -13,9 +13,9 @@ depends_dev= makedepends="python-dev swig openssl-dev" install="" subpackages="" -source="http://pypi.python.org/packages/source/M/$_pkgname/$_pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -25,4 +25,7 @@ package() { cd "$_builddir" python setup.py install --prefix=/usr --root="$pkgdir" || return 1 } + md5sums="f93d8462ff7646397a9f77a2fe602d17 M2Crypto-0.21.1.tar.gz" +sha256sums="25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a M2Crypto-0.21.1.tar.gz" +sha512sums="b261eed84b3bda8a664c065241c2007f6443235a0fbcdd856c5a0b1f015e75662724b72a56e94aeb174414fff5c8dd71dfcb4b18f677f576ab7e30811a8adf9b M2Crypto-0.21.1.tar.gz" diff --git a/testing/py-markdown/APKBUILD b/testing/py-markdown/APKBUILD new file mode 100644 index 0000000000..71bbd6b3e7 --- /dev/null +++ b/testing/py-markdown/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-markdown +_pkgname=Markdown +pkgver=2.2.1 +pkgrel=0 +pkgdesc="A Python implementation of Markdown" +url="http://pythonhosted.org/Markdown/" +arch="noarch" +license="BSD" +depends="python" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="9e002c8051fb346cae75060f3302048a Markdown-2.2.1.tar.gz" +sha256sums="f8b9a1efceab71afe9336a7c456fde36bfb0f505fb664ebb7f3dd44eddab44b6 Markdown-2.2.1.tar.gz" +sha512sums="aa975a9d015e3e1320f35381c7e83e1f355222a3c0096e65ce4f1a1fa253fe0e3389ce1b3786b1cf40f4160863ede39d1081c655efe1c24132a766f02418fd61 Markdown-2.2.1.tar.gz" diff --git a/testing/py-mysqldb/APKBUILD b/testing/py-mysqldb/APKBUILD index 8f39849bb0..a802c6bd43 100644 --- a/testing/py-mysqldb/APKBUILD +++ b/testing/py-mysqldb/APKBUILD @@ -1,17 +1,16 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=py-mysqldb pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="MySQL Module for python" url="http://sourceforge.net/projects/mysql-python/" arch="all" -license="GPL" -depends="python" +license="GPL2+" +depends="" makedepends="python-dev py-setuptools mysql-dev" source="http://downloads.sourceforge.net/mysql-python/MySQL-python-${pkgver}.tar.gz" _builddir="$srcdir"/MySQL-python-$pkgver - build() { cd "$_builddir" python setup.py build || return 1 @@ -23,3 +22,5 @@ package() { } md5sums="215eddb6d853f6f4be5b4afc4154292f MySQL-python-1.2.3.tar.gz" +sha256sums="7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e MySQL-python-1.2.3.tar.gz" +sha512sums="8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5 MySQL-python-1.2.3.tar.gz" diff --git a/testing/py-netaddr/APKBUILD b/testing/py-netaddr/APKBUILD new file mode 100644 index 0000000000..47a1fcc94c --- /dev/null +++ b/testing/py-netaddr/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-netaddr +_pkgname=netaddr +pkgver=0.7.10 +pkgrel=0 +pkgdesc="A network address manipulation library for Python" +url="https://github.com/drkjam/netaddr" +arch="noarch" +license="BSD" +depends="python" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="https://github.com/downloads/drkjam/netaddr/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="605cfd09ff51eaeff0ffacdb485e270b netaddr-0.7.10.tar.gz" +sha256sums="9b79763141a855079b0589717696a4ccb5c56c0b807b6e584bfe12333399e0b7 netaddr-0.7.10.tar.gz" +sha512sums="28d51e81151c96df37adf3466de451fc7375624eee6cd4b5d5587c25fd82d23b2dbba0fac38938ca760b28e220fbf147d2e5fa326869b2500de036bf02b042ab netaddr-0.7.10.tar.gz" diff --git a/testing/py-netifaces/APKBUILD b/testing/py-netifaces/APKBUILD index 332c9196a8..1486d054fb 100644 --- a/testing/py-netifaces/APKBUILD +++ b/testing/py-netifaces/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=py-netifaces _pkgname=netifaces -pkgver=0.6 +pkgver=0.8 pkgrel=0 pkgdesc="Portable module to access network interface information in Python" url="http://alastairs-place.net/netifaces/" arch="all" license="MIT" depends="" -depends_dev="python-dev py-setuptools" -makedepends="$depends_dev" +depends_dev="" +makedepends="python-dev py-setuptools" install="" subpackages="$pkgname-doc" source="http://alastairs-place.net/projects/$_pkgname/$_pkgname-$pkgver.tar.gz" @@ -27,12 +27,15 @@ prepare() { build() { cd "$_builddir" - python setup.py install --root "${pkgdir}" + python setup.py build || return 1 } package() { cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 install -Dm644 README "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="6ea1e045ebd5db99dd675178e41307e5 netifaces-0.6.tar.gz" +md5sums="e57e5983f4c286fac5f8068fbfc5c873 netifaces-0.8.tar.gz" +sha256sums="53a711038db3d6e5cf7129d6f751185fd052f830f12f271fbfe17bd2671ab1ec netifaces-0.8.tar.gz" +sha512sums="b3735c4f83d4ed1d52f59937187659f148205a721fd05ce5a10e9ec89ea3519971001b2985e24bb30fb112ee741310babd847f84d4c3fbb34989edc6a743f551 netifaces-0.8.tar.gz" diff --git a/testing/py-osourcer/APKBUILD b/testing/py-osourcer/APKBUILD new file mode 100644 index 0000000000..56a8d99928 --- /dev/null +++ b/testing/py-osourcer/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-osourcer +_pkgname=osourcer +pkgver=0.1 +pkgrel=0 +pkgdesc="Tool to manage licenses in source code" +url="http://github.com/dnarvaez/osourcer" +arch="noarch" +license="Apache2" +depends="python" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="587766a048f72838558d5b3aa351f525 osourcer-0.1.tar.gz" +sha256sums="bf754d6c8dd4ecb5091ab2a461223b97bdf01757ece8cc1095d22c9129e8dde0 osourcer-0.1.tar.gz" +sha512sums="20726cca90bb7b3854595b8f1e42ea4d9da25a5a07562c1ced3d08bf58d884b9aa76b8b1c5b98be1b0b50317d004c2f78f0e60c5984c2100fa503a0b660fd4dd osourcer-0.1.tar.gz" diff --git a/testing/py-twisted-conch/APKBUILD b/testing/py-twisted-conch/APKBUILD new file mode 100644 index 0000000000..49503e740f --- /dev/null +++ b/testing/py-twisted-conch/APKBUILD @@ -0,0 +1,36 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=py-twisted-conch +pkgver=12.2.0 +pkgrel=0 +pkgdesc="SSH and SFTP protocol implementation together with clients and servers" +url="http://twistedmatrix.com/trac/wiki/TwistedConch" +arch="noarch" +license="MIT" +depends="py-twisted py-crypto py-asn1" +makedepends="python-dev" +source="http://twistedmatrix.com/Releases/Conch/${pkgver%.*}/TwistedConch-$pkgver.tar.bz2" + +_builddir="$srcdir"/TwistedConch-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="a8f07749465eb7c514c9cce0ea4dcfb0 TwistedConch-12.2.0.tar.bz2" +sha256sums="2d1d6d4dcf8a6c9fd7f7c03e74111049566618765f93fae1da999643caf13cd2 TwistedConch-12.2.0.tar.bz2" +sha512sums="6b81ed588aeb568e14ad341530ebceabd34e3025da612aa54effe0ff96ff6c20c466b296795209b6ee761890d27f26075915de114459dbc84547587444520da9 TwistedConch-12.2.0.tar.bz2" diff --git a/testing/py-xattr/APKBUILD b/testing/py-xattr/APKBUILD index 9c8b9712d4..ece10bf523 100644 --- a/testing/py-xattr/APKBUILD +++ b/testing/py-xattr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py-xattr _pkgname=pyxattr -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A python module for accessing filesystem Extended Attributes" url="http://pyxattr.k1024.org/" @@ -13,9 +13,9 @@ depends_dev="" makedepends="python-dev attr-dev py-setuptools" install="" subpackages="" -source="https://github.com/downloads/iustin/pyxattr/pyxattr-$pkgver.tar.gz" -_builddir="$srcdir"/$_pkgname-$pkgver +source="http://pyxattr.k1024.org/downloads/$_pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$_pkgname-$pkgver build() { cd "$_builddir" python setup.py build || return 1 @@ -26,4 +26,6 @@ package() { python setup.py install --root="$pkgdir" || return 1 } -md5sums="bb9560510b17625015aa45f2fbc3b520 pyxattr-0.5.1.tar.gz" +md5sums="9ff2e4218badc201b689b6d254290001 pyxattr-0.5.2.tar.gz" +sha256sums="19accb3927a833b36b1fb0fddeae45c32b08715cce38b1b106faff22c4ba79d9 pyxattr-0.5.2.tar.gz" +sha512sums="8dfe6583b1bb54c1674ca90ea99ad50d7ad51b858a1f40bfd4a3660fcba71b59540e5957bb601d816e82c9fec91985394f51193e5a2452c4b1b27cb5edf51e2f pyxattr-0.5.2.tar.gz" diff --git a/testing/py-yurl/APKBUILD b/testing/py-yurl/APKBUILD new file mode 100644 index 0000000000..9055e5c938 --- /dev/null +++ b/testing/py-yurl/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=py-yurl +_pkgname=YURL +pkgver=0.10 +pkgrel=0 +pkgdesc="An alternative Python url manipulation library" +url="https://github.com/homm/yurl/" +arch="noarch" +license="unknown" +depends="" +depends_dev="" +makedepends="python-dev py-setuptools" +install="" +subpackages="" +source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 +} + +md5sums="ece0bba0c9b0902964f80c236760a2f3 YURL-0.10.tar.gz" +sha256sums="10b8fd15b7b582fade998b350c67686ca827f68938406fbb0025fd3a10dddbdb YURL-0.10.tar.gz" +sha512sums="c37d172a96fbb5e69ec1566f2e93f3a2cbd66ad31229d7bac1010460e2dddb726b579c4c56f6345975977f4cbf6188408bdf9b48616047ddcab9e95823e1ffc4 YURL-0.10.tar.gz" diff --git a/testing/python3/APKBUILD b/testing/python3/APKBUILD index 6df07c3068..8f435ef964 100644 --- a/testing/python3/APKBUILD +++ b/testing/python3/APKBUILD @@ -1,36 +1,37 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> pkgname=python3 -pkgver=3.2.3 -_pkgver=3.2 +pkgver=3.3.0 +_pkgver=3.3 pkgrel=0 pkgdesc="A high-level scripting language" url="http://www.python.org" arch="all" license="custom" subpackages="$pkgname-dev $pkgname-doc $pkgname-tests" -depends= +depends="" makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev - sqlite-dev libffi-dev tcl-dev" -source="http://www.python.org/ftp/python/$_pkgver/Python-$_pkgver.tar.bz2" + sqlite-dev libffi-dev tcl-dev" +source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz" -_builddir="$srcdir"/Python-$_pkgver +_builddir="$srcdir"/Python-$pkgver build() { cd "$_builddir" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --enable-shared \ --with-threads \ --with-system-ffi \ --enable-unicode=ucs4 \ --with-dbmliborder=ndbm \ + --disable-rpath \ || return 1 - make || return 1 } package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install - mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.1 + make -j1 DESTDIR="$pkgdir" install || return 1 + mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.3 install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } @@ -51,4 +52,6 @@ tests() { _mv_files } -md5sums="92e94b5b6652b96349d6362b8337811d Python-3.2.tar.bz2" +md5sums="2e7533b4009ac4adae62a7797a442e7a Python-3.3.0.tar.xz" +sha256sums="09994d2885a8ef61b4b2389527a9805a4a05e3e0f121dbc8e4222f9010f5bbd7 Python-3.3.0.tar.xz" +sha512sums="36aacc516d7486c8123656171a9400e3881146464abaa56b8dd1c8e3d0c1c31e305529157eacf6e29e3dd0a065c7ff8452addd1d178578bf8db4c9f5c1b7380f Python-3.3.0.tar.xz" diff --git a/testing/siege/APKBUILD b/testing/siege/APKBUILD new file mode 100644 index 0000000000..f4774825b3 --- /dev/null +++ b/testing/siege/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +pkgname=siege +pkgver=2.74 +pkgrel=0 +pkgdesc="HTTP regression testing and benchmarking utility" +url="http://www.joedog.org/JoeDog/Siege" +arch="all" +license="GPL2+" +depends="" +depends_dev="" +makedepends="openssl-dev sed" +install="" +subpackages="$pkgname-doc" +source="http://www.joedog.org/pub/siege/$pkgname-$pkgver.tar.gz + siege-2.72-good.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + sed -i.orig doc/siegerc.in -e 's/^# logfile = *$/logfile = ${HOME}\/siege.log/' +} + +build() { + cd "$_builddir" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="a23c8670d69f4b78f534095921c90969 siege-2.74.tar.gz +6b1d2956e8cba62cdd44a4faaacbe4cd siege-2.72-good.patch" +sha256sums="cdd686a5695f1c953caab3914c722f7eb81a616102ffb36bb39eb8bcb5ebc802 siege-2.74.tar.gz +15ceaf81547f80d0cbfd947458129e2b7c3c3fe49dbcb37f6444b53f414c91ca siege-2.72-good.patch" +sha512sums="cd551beb79ac69c97b89b7ba4603dfe41190f0a65befbea53c096161e74dff33ea8f41a3d383d75fbec9535fcc229542da91a80c89a50beb7526a0748558835d siege-2.74.tar.gz +a32b459b23e72af06095911905ef58e365a22a9d7c0c7fac13897ce9440484b41c86505da19cbcabb25432aabe60986ffb2b013c75ac22382ce1c8b4a9f28393 siege-2.72-good.patch" diff --git a/testing/siege/siege-2.72-good.patch b/testing/siege/siege-2.72-good.patch new file mode 100644 index 0000000000..93da6b6eb5 --- /dev/null +++ b/testing/siege/siege-2.72-good.patch @@ -0,0 +1,62 @@ +diff -up siege-2.69/doc/Makefile.in.good siege-2.69/doc/Makefile.in +--- siege-2.69/doc/Makefile.in.good 2009-07-04 11:12:24.411980518 -0300 ++++ siege-2.69/doc/Makefile.in 2009-07-04 11:13:19.914733285 -0300 +@@ -498,32 +498,32 @@ uninstall-man: uninstall-man1 uninstall- + + + install-exec-hook: +- @if test -f $(SIEGERC); then \ +- if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \ +- else \ +- echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \ +- $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \ +- echo "#####################################################"; \ +- echo "WARNING: File $(SIEGERC) already exists."; \ +- echo " A new resource file has been installed as"; \ +- echo " $(SIEGERC).new. You may want to"; \ +- echo " consider using the newer version in order to"; \ +- echo " take advantage of any new features."; \ +- echo "#####################################################"; \ +- fi; \ +- else \ +- $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \ +- fi +- @if test -f $(URLSTXT); then \ +- if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \ +- else \ +- echo "WARNING: File $(URLSTXT) already exists."; \ +- echo " It was NOT replaced with this installation."; \ +- fi; \ +- else \ +- $(mkinstalldirs) $(sysconfdir); \ +- $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \ +- fi ++ #@if test -f $(SIEGERC); then \ ++ # if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \ ++ # else \ ++ # echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \ ++ # $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \ ++ # echo "#####################################################"; \ ++ # echo "WARNING: File $(SIEGERC) already exists."; \ ++ # echo " A new resource file has been installed as"; \ ++ # echo " $(SIEGERC).new. You may want to"; \ ++ # echo " consider using the newer version in order to"; \ ++ # echo " take advantage of any new features."; \ ++ # echo "#####################################################"; \ ++ # fi; \ ++ #else \ ++ # $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \ ++ #fi ++ #@if test -f $(URLSTXT); then \ ++ # if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \ ++ # else \ ++ # echo "WARNING: File $(URLSTXT) already exists."; \ ++ # echo " It was NOT replaced with this installation."; \ ++ # fi; \ ++ #else \ ++ # $(mkinstalldirs) $(sysconfdir); \ ++ # $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \ ++ #fi + + uninstall: + rm -f $(SIEGERC) diff --git a/testing/sipcrack/APKBUILD b/testing/sipcrack/APKBUILD index b8e7e5efbc..39a56481eb 100644 --- a/testing/sipcrack/APKBUILD +++ b/testing/sipcrack/APKBUILD @@ -13,8 +13,8 @@ makedepends="libpcap-dev openssl-dev" install="" subpackages="" source="http://ftp.de.debian.org/debian/pool/main/s/$pkgname/"$pkgname"_"$pkgver".orig.tar.gz" -_builddir="$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/$pkgname-$pkgver build() { cd "$_builddir" make || return 1 diff --git a/testing/snowstorm/APKBUILD b/testing/snowstorm/APKBUILD index 4a74d0573c..5d09d8c257 100644 --- a/testing/snowstorm/APKBUILD +++ b/testing/snowstorm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=snowstorm pkgver=2.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="snowstorm viewer for secondlife (and compatible servers)" url="http://wiki.secondlife.com/wiki/Project_Snowstorm" arch="" diff --git a/testing/spectools/APKBUILD b/testing/spectools/APKBUILD index e8d09a4a19..3c10fe79a8 100644 --- a/testing/spectools/APKBUILD +++ b/testing/spectools/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=spectools -pkgver=201004 -_pkgver=2010-04-R1 +pkgver=201108 +_pkgver=2011-08-R1 pkgrel=0 pkgdesc="Utilities for using Wi-Spy USB spectrum analyzer" url="https://www.kismetwireless.net/spectools/" arch="all" -license="GPL-2" +license="GPL2+" depends="" depends_dev="gtk+2.0-dev bash cairo-dev libusb-compat-dev" makedepends="$depends_dev" @@ -28,7 +28,8 @@ prepare() { build() { cd "$_builddir" autoreconf --install - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc/ make || return 1 } @@ -38,4 +39,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="1574813385fbe652736b439accec7120 spectools-2010-04-R1.tar.gz" +md5sums="b742d5c7dec6fbd3c5070e54d43e6570 spectools-2011-08-R1.tar.gz" +sha256sums="ce981cd2b86c6246dc7cb9c0166b85e586e5f5835d3ed147e8901ef18f00220e spectools-2011-08-R1.tar.gz" +sha512sums="92c80b34049055cec6d677db165fb2d06d75fbff9f04d41ab81fa57900f639936e6a9a01f06165aea863b35760964016f0984f17816859d054bc9d14353e847b spectools-2011-08-R1.tar.gz" diff --git a/testing/spl-git-grsec/APKBUILD b/testing/spl-git-grsec/APKBUILD index 0e6ef68827..dc2477a5f5 100644 --- a/testing/spl-git-grsec/APKBUILD +++ b/testing/spl-git-grsec/APKBUILD @@ -6,7 +6,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _mypkgrel=0 _date=20121116 diff --git a/testing/spl-grsec/APKBUILD b/testing/spl-grsec/APKBUILD index fcaaa5bde1..c0b48ad9e0 100644 --- a/testing/spl-grsec/APKBUILD +++ b/testing/spl-grsec/APKBUILD @@ -6,7 +6,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _realver=0.6.0-rc13 _mypkgrel=0 diff --git a/testing/sqstat/APKBUILD b/testing/sqstat/APKBUILD index 9489e7960f..e802394f23 100644 --- a/testing/sqstat/APKBUILD +++ b/testing/sqstat/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Natanael Copa +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sqstat pkgver=1.20 pkgrel=0 @@ -6,14 +6,13 @@ pkgdesc="SqStat is a script which allows to look through active squid users conn url="http://samm.kiev.ua/sqstat/" arch="all" license="ISC" -depends= -makedepends= -install= -subpackages= +depends="" +makedepends="" +install="" +subpackages="" source="http://samm.kiev.ua/sqstat/sqstat-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver - prepare() { cd "$_builddir" } diff --git a/testing/stunnel/APKBUILD b/testing/stunnel/APKBUILD index 59f1478efc..36aebb651b 100644 --- a/testing/stunnel/APKBUILD +++ b/testing/stunnel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dean Takemori <deant@hawaii.rr.com> # Maintainer: pkgname=stunnel -pkgver=4.53 +pkgver=4.55 pkgrel=0 pkgdesc="SSL encryption wrapper between network client and server." url="http://www.stunnel.org/" @@ -16,33 +16,35 @@ source="ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz" _builddir="$srcdir/$pkgname-$pkgver" prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - || return 1 - make || return 1 + cd "$_builddir" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 } package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - install -m644 tools/stunnel.license \ - "$pkgdir"/usr/share/doc/$pkgname/ || return 1 - - rm -f "$pkgdir"/usr/lib/stunnel/*.la + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -m644 tools/stunnel.license \ + "$pkgdir"/usr/share/doc/$pkgname/ || return 1 + rm -f "$pkgdir"/usr/lib/stunnel/*.la } -md5sums="ab3bfc915357d67da18c73f73610d593 stunnel-4.53.tar.gz" +md5sums="ebe6670368d30c6a01ca33b9c50cb239 stunnel-4.55.tar.gz" +sha256sums="5a4acecfabd454415c727435acdfca7dc46aa542998fb278293f494a6d36d37a stunnel-4.55.tar.gz" +sha512sums="47e6a707975395e4d3106927595b3a0627246f565687e3a0d56dc6620c1ba828755d4482d0e45b9a09300cc7855b76360056534b22b42f58d5041ea159aab7a1 stunnel-4.55.tar.gz" diff --git a/testing/supertuxkart/APKBUILD b/testing/supertuxkart/APKBUILD index cc47cc6e3f..018fa8b3ef 100644 --- a/testing/supertuxkart/APKBUILD +++ b/testing/supertuxkart/APKBUILD @@ -1,17 +1,17 @@ # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org> pkgname=supertuxkart -pkgver=0.7 +pkgver=0.8 pkgrel=0 pkgdesc="Kart racing game" url="http://supertuxkart.sourceforge.net" arch="x86 x86_64" license="GPL" depends= -depends_dev="irrlicht libvorbis-dev libogg-dev openal-soft-dev mesa-dev jpeg-dev gettext-dev" -makedepends="$depends_dev" -source="http://downloads.sourceforge.net/project/$pkgname/SuperTuxKart/0.7/$pkgname-$pkgver-src.tar.bz2" +makedepends="libvorbis-dev libogg-dev openal-soft-dev mesa-dev + libjpeg-turbo-dev gettext-dev cmake curl-dev fribidi-dev" +source="http://downloads.sourceforge.net/project/$pkgname/SuperTuxKart/$pkgver/$pkgname-$pkgver-src.tar.bz2" -_builddir="$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/SuperTuxKart-$pkgver prepare() { local i @@ -25,14 +25,13 @@ prepare() { build() { cd "$_builddir" - ./configure --prefix=/usr \ - --datadir=/usr/share \ - --bindir=/usr/bin \ - --with-irrlicht=/usr/include/irrlicht \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="-lpthread -lm -ldl" \ || return 1 - # From arch pkgbuild - sed -i "s#/usr/local#/usr#" src/io/file_manager.cpp - sed -i "s#/games#/bin#" $(grep -r "/games" *) + + NDEBUG=1 make -C lib/irrlicht/source/Irrlicht || return 1 make || return 1 } @@ -40,4 +39,6 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="2806f271e4d37fee5ad8ca166e1ad489 supertuxkart-0.7-src.tar.bz2" +md5sums="0b939ce601374758938119e0b0dd1fec supertuxkart-0.8-src.tar.bz2" +sha256sums="b99f3d2311457a34db3c42ba2195662f2993a48eae4f6b1f175dbcce09ad4b8b supertuxkart-0.8-src.tar.bz2" +sha512sums="1936ff85ab896ad46633e53423a55c74aebe7a49d55024ed9bd76baf735e2e3c1ada0e83e3cc29dc7b9ff257484f2a9edb0bf5cf61b0b78fa5757f2e702a6f72 supertuxkart-0.8-src.tar.bz2" diff --git a/testing/uwsgi/APKBUILD b/testing/uwsgi/APKBUILD index 3a6a0c64b8..c724f1b38a 100644 --- a/testing/uwsgi/APKBUILD +++ b/testing/uwsgi/APKBUILD @@ -1,15 +1,18 @@ # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uwsgi -pkgver=1.4.3 -pkgrel=1 +pkgver=1.4.8 +pkgrel=2 pkgdesc="uWSGI application container server" url=http://projects.unbit.it/uwsgi/ arch=all license=GPL-2 makedepends="linux-headers lua-dev python python-dev zeromq-dev" subpackages="uwsgi-lua uwsgi-python:py" -source="http://projects.unbit.it/downloads/uwsgi-${pkgver}.tar.gz futimes.patch include-sched.patch lua-lock.patch" +source="http://projects.unbit.it/downloads/uwsgi-${pkgver}.tar.gz + futimes.patch include-sched.patch lua-cache-update.patch + uwsgi.initd uwsgi.confd + " _builddir=$srcdir/$pkgname-$pkgver prepare() { @@ -47,6 +50,11 @@ package() { local libdir=$pkgdir/usr/lib/uwsgi install -d "$libdir" install *_plugin.so "$libdir" + + install -Dm755 "$srcdir"/uwsgi.initd \ + "$pkgdir"/etc/init.d/uwsgi || return 1 + install -Dm644 "$srcdir"/uwsgi.confd \ + "$pkgdir"/etc/conf.d/uwsgi || return 1 } lua() { @@ -63,7 +71,21 @@ py() { mv "$pkgdir/usr/lib/uwsgi/python_plugin.so" "$subpkgdir/usr/lib/uwsgi" } -md5sums="98561cfdb93fb72ed68b7afb2ae4df3a uwsgi-1.4.3.tar.gz +md5sums="10af354eccaae9c447bd5bdc69bcce12 uwsgi-1.4.8.tar.gz 2c9aeb5b2adf1fa45ef4ed6bda47236a futimes.patch 02c43e001d5f44eb421079e17f9db003 include-sched.patch -b791fb4994b0350992ffab3f939002ed lua-lock.patch" +3bba1063b54043561f520d6986e35057 lua-cache-update.patch +8a8be061d7b5f3108a0f16813da68389 uwsgi.initd +3d6afe6a8c52556d1d6c52384fc38d9a uwsgi.confd" +sha256sums="3c35893927a065ed89775cf5a8f66f66d71b060618f4611efbcca76e520aac37 uwsgi-1.4.8.tar.gz +9ad8375325195e577e6b91a1cf7539817b58fbb4efef248d01a4b704a0e8749f futimes.patch +25cb58a02a9f1f62be227592a31152e960f51d44a9e9d14751375a9468152e90 include-sched.patch +fe79c823399c750618572531e8c9ccfa2394da329ce16516af79887f493c1a2d lua-cache-update.patch +58b998b025e4a9df20ca917bc93e287f9a8cf02d278d513fa461f70e1d08f799 uwsgi.initd +4cb047e311aecd0f498da1d6a4c0947dd6dc7cc98575d54cb2ef150cacf8425c uwsgi.confd" +sha512sums="7ead90c0740db0ebc28256b312a98e8de610b62cc82504c738cc2f3d2b0819ae673eb1875ea31abc3e511dc76db9af9fb15f4d1ae2a62f6b67b2a5966cfe2bab uwsgi-1.4.8.tar.gz +9e867a3483197adb5ab99334d0e9f092dab44201ddbead99a4649309fd0584e6793531a147e096459984d26d0a73754688426df1fb4686c041d3889f3d29fdef futimes.patch +d454dcc5ee0a121ff44584e0da98055e6596e8a750315fe4ce6a5fbc615697b2a19b9b32c51ac9878587a855ec3f072e87a3e4e097a8b743699f58ed0d84ec0f include-sched.patch +baf97b56448c8a38334036b11c4fb36805ccfb3b867443afe3b1ee5b91bf10981d61f690184e51fa9e492b6318b657530e2f3f11d803dce17cef1a16c56719ab lua-cache-update.patch +ab9dc6277bd05821287f6f8beb3ac2504f0e41db38e11b4d2884ac026f14ac7bfaaca138f045afa712d4f2843f94de105bf0d43fad35d18679ac33b507cd187e uwsgi.initd +9f00afb2aa574bbc59040f945475712b8c40da0c06eeb5699de5510aa116148e35ab0429fa891084cf0cd7868876d5a80e1601b7c85d0e2e9ea2a1f54cdde619 uwsgi.confd" diff --git a/testing/uwsgi/lua-cache-update.patch b/testing/uwsgi/lua-cache-update.patch new file mode 100644 index 0000000000..6943a97c9a --- /dev/null +++ b/testing/uwsgi/lua-cache-update.patch @@ -0,0 +1,45 @@ +--- uwsgi-1.4.3/plugins/lua/lua_plugin.c ++++ uwsgi-1.4.3.new/plugins/lua/lua_plugin.c +@@ -157,6 +157,34 @@ + + } + ++static int uwsgi_api_cache_update(lua_State *L) { ++ ++ int args = lua_gettop(L); ++ const char *key ; ++ const char *value ; ++ uint64_t expires = 0; ++ size_t vallen; ++ ++ ++ if (args > 1) { ++ ++ key = lua_tolstring(L, 1, NULL); ++ value = lua_tolstring(L, 2, &vallen); ++ if (args > 2) { ++ expires = lua_tonumber(L, 3); ++ } ++ ++ uwsgi_cache_set((char *)key, strlen(key), (char *)value, ++ (uint16_t) vallen, expires, ++ UWSGI_CACHE_FLAG_UPDATE); ++ ++ } ++ ++ lua_pushnil(L); ++ return 1; ++ ++} ++ + static int uwsgi_api_register_signal(lua_State *L) { + + int args = lua_gettop(L); +@@ -298,6 +326,7 @@ + {"send_message", uwsgi_api_send_message}, + {"cache_get", uwsgi_api_cache_get}, + {"cache_set", uwsgi_api_cache_set}, ++ {"cache_update", uwsgi_api_cache_update}, + {"register_signal", uwsgi_api_register_signal}, + {"register_rpc", uwsgi_api_register_rpc}, + {NULL, NULL} diff --git a/testing/uwsgi/lua-lock.patch b/testing/uwsgi/lua-lock.patch deleted file mode 100644 index 059e8e9694..0000000000 --- a/testing/uwsgi/lua-lock.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/plugins/lua/lua_plugin.c b/plugins/lua/lua_plugin.c -index 6a2a2a9..692c4ef 100644 ---- a/plugins/lua/lua_plugin.c -+++ b/plugins/lua/lua_plugin.c -@@ -291,6 +291,57 @@ static int uwsgi_api_req_fd(lua_State *L) { - return 1; - } - -+static int uwsgi_api_lock(lua_State *L) { -+ -+ int lock_num = 0; -+ -+ // the spooler cannot lock resources -+#ifdef UWSGI_SPOOLER -+ if (uwsgi.i_am_a_spooler) { -+ lua_pushstring(L, "The spooler cannot lock/unlock resources"); -+ lua_error(L); -+ } -+#endif -+ -+ if (lua_gettop(L) > 0) { -+ lock_num = lua_isnumber(L, 1) ? lua_tonumber(L, 1) : -1; -+ if (lock_num < 0 || lock_num > uwsgi.locks) { -+ lua_pushstring(L, "Invalid lock number"); -+ lua_error(L); -+ } -+ } -+ -+ uwsgi_lock(uwsgi.user_lock[lock_num]); -+ -+ return 0; -+} -+ -+ -+static int uwsgi_api_unlock(lua_State *L) { -+ -+ int lock_num = 0; -+ -+ // the spooler cannot lock resources -+#ifdef UWSGI_SPOOLER -+ if (uwsgi.i_am_a_spooler) { -+ lua_pushstring(L, "The spooler cannot lock/unlock resources"); -+ lua_error(L); -+ } -+#endif -+ -+ if (lua_gettop(L) > 0) { -+ lock_num = lua_isnumber(L, 1) ? lua_tonumber(L, 1) : -1; -+ if (lock_num < 0 || lock_num > uwsgi.locks) { -+ lua_pushstring(L, "Invalid lock number"); -+ lua_error(L); -+ } -+ } -+ -+ uwsgi_unlock(uwsgi.user_lock[lock_num]); -+ -+ return 0; -+} -+ - static const luaL_reg uwsgi_api[] = { - {"log", uwsgi_api_log}, - {"cl", uwsgi_api_cl}, -@@ -300,6 +351,8 @@ static const luaL_reg uwsgi_api[] = { - {"cache_set", uwsgi_api_cache_set}, - {"register_signal", uwsgi_api_register_signal}, - {"register_rpc", uwsgi_api_register_rpc}, -+ {"lock", uwsgi_api_lock}, -+ {"unlock", uwsgi_api_unlock}, - {NULL, NULL} - }; - diff --git a/testing/uwsgi/uwsgi.confd b/testing/uwsgi/uwsgi.confd new file mode 100644 index 0000000000..7759361981 --- /dev/null +++ b/testing/uwsgi/uwsgi.confd @@ -0,0 +1,63 @@ +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd-r3,v 1.1 2013/03/01 09:50:06 ultrabug Exp $ + +# YOU SHOULD ONLY MODIFY THIS FILE IF YOU USE THE UWSGI EMPEROR MODE! +# IF YOU WANT TO RUN A SINGLE APP INSTANCE, CREATE A COPY AND MODIFY THAT INSTEAD! + +# Path (or name) of UNIX/TCP socket to bind to +# Example : UWSGI_SOCKET=127.0.0.1:1234 +UWSGI_SOCKET= + +# Enable threads? (1 = yes, 0 = no). The default is 0 +# +UWSGI_THREADS=0 + +# The path to your uWSGI application. +# +UWSGI_PROGRAM= + +# The path to your uWSGI xml config file. +# +UWSGI_XML_CONFIG= + +# The number of child processes to spawn. The default is 1. +# +UWSGI_PROCESSES=1 + +# The log file path. If empty, log only errors +# +UWSGI_LOG_FILE= + +# If you want to run your application inside a chroot then specify the +# directory here. Leave this blank otherwise. +# +UWSGI_CHROOT= + +# If you want to run your application from a specific directiory specify +# it here. Leave this blank otherwise. +# +UWSGI_DIR= + +# The user to run your application as. If you do not specify these, +# the application will be run as user root. +# +UWSGI_USER= + +# The group to run your application as. If you do not specify these, +# the application will be run as group root. +# +UWSGI_GROUP= + +# Run the uwsgi emperor which loads vassals dynamically from this PATH +# see http://projects.unbit.it/uwsgi/wiki/Emperor +# The advised Gentoo folder is /etc/uwsgi.d/ +UWSGI_EMPEROR_PATH= + +# The group the emperor should run as. This is different from the UWSGI_GROUP +# as you could want your apps share some sockets with other processes such as +# www servers while preserving your emperor logs from being accessible by them. +UWSGI_EMPEROR_GROUP= + +# Additional options you might want to pass to uWSGI +# +UWSGI_EXTRA_OPTIONS= diff --git a/testing/uwsgi/uwsgi.initd b/testing/uwsgi/uwsgi.initd new file mode 100644 index 0000000000..15ae1a8a90 --- /dev/null +++ b/testing/uwsgi/uwsgi.initd @@ -0,0 +1,144 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd-r3,v 1.1 2013/03/01 09:50:06 ultrabug Exp $ + +PROGNAME=${SVCNAME#*.} + +UWSGI_EXEC=/usr/bin/uwsgi +if [ "${SVCNAME}" == "uwsgi" ]; then + PIDPATH=/var/run/uwsgi +else + PIDPATH="/var/run/uwsgi_${PROGNAME}" +fi +PIDFILE="${PIDPATH}/${PROGNAME}.pid" + +extra_started_commands="${opts} reload stats" + +depend() { + need net +} + +start_pre() { + checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}" +} + +start_emperor() { + local OPTIONS + OPTIONS="--daemonize" + + if [ -n "${UWSGI_LOG_FILE}" ]; then + OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}" + else + OPTIONS="${OPTIONS} /dev/null --disable-logging" + fi + + [ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/" + [ -z "${UWSGI_USER}" ] && UWSGI_USER="root" + [ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root" + + if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then + OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}" + fi + + ebegin "Starting uWSGI emperor" + cd "${UWSGI_DIR}" && \ + start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \ + --group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \ + -- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}" + return $? +} + +start_app() { + local OPTIONS + OPTIONS="--master --daemonize" + + if [ -n "${UWSGI_LOG_FILE}" ]; then + OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}" + else + OPTIONS="${OPTIONS} /dev/null --disable-logging" + fi + + [ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/" + [ -z "${UWSGI_USER}" ] && UWSGI_USER="root" + [ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root" + + if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then + OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}" + fi + + if [ "${UWSGI_THREADS}" = "1" ]; then + OPTIONS="${OPTIONS} --enable-threads" + fi + + if [ -n "${UWSGI_SOCKET}" ]; then + OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}" + fi + + if [ -n "${UWSGI_PROCESSES}" ]; then + OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}" + fi + + if [ -n "${UWSGI_CHROOT}" ]; then + OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}" + fi + + if [ -n "${UWSGI_PROGRAM}" ]; then + OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}" + fi + + if [ -n "${UWSGI_XML_CONFIG}" ]; then + OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}" + fi + + ebegin "Starting uWSGI application ${PROGNAME}" + cd "${UWSGI_DIR}" && \ + start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \ + --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}" + return $? +} + +start() { + if [ "${SVCNAME}" == "uwsgi" ]; then + if [ -n "${UWSGI_EMPEROR_PATH}" ]; then + start_emperor + eend $? + else + eerror "You are not supposed to run this script directly unless you" + eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH." + eerror "Otherwise create a symlink for the uwsgi application you want to run as well as" + eerror "a copy of the configuration file and modify it appropriately like so..." + eerror + eerror " ln -s uwsgi /etc/init.d/uwsgi.trac" + eerror " cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac" + eerror " nano /etc/conf.d/uwsgi.trac" + eerror + return 1 + fi + else + start_app + eend $? + fi +} + +stop() { + if [ -n "${UWSGI_EMPEROR_PATH}" ]; then + ebegin "Stopping uWSGI emperor" + else + ebegin "Stopping uWSGI application ${PROGNAME}" + fi + start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}" + eend $? +} + +reload() { + ebegin "Reloading uWSGI" + start-stop-daemon --signal HUP --pidfile "${PIDFILE}" + eend $? +} + +stats() { + ebegin "Logging uWSGI statistics" + start-stop-daemon --signal USR1 --pidfile "${PIDFILE}" + eend $? +} diff --git a/testing/virtualbox-additions-grsec/APKBUILD b/testing/virtualbox-additions-grsec/APKBUILD index a26c533536..eee52df223 100644 --- a/testing/virtualbox-additions-grsec/APKBUILD +++ b/testing/virtualbox-additions-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 # when chaning _ver we *must* bump _mypkgrel _ver=4.1.20 diff --git a/testing/wanpipe-grsec/APKBUILD b/testing/wanpipe-grsec/APKBUILD index 875fa92b19..e64ad808df 100644 --- a/testing/wanpipe-grsec/APKBUILD +++ b/testing/wanpipe-grsec/APKBUILD @@ -5,7 +5,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 # source the kernel version if [ -f ../../main/linux-$_flavor/APKBUILD ]; then diff --git a/testing/xf86-video-virtualbox/APKBUILD b/testing/xf86-video-virtualbox/APKBUILD index 5ac4cf9d59..8ea0a8a479 100644 --- a/testing/xf86-video-virtualbox/APKBUILD +++ b/testing/xf86-video-virtualbox/APKBUILD @@ -3,7 +3,7 @@ pkgname=xf86-video-virtualbox pkgdesc="Xorg Virtual box video driver" pkgver=4.2.0 _ver=${pkgver/_rc/_RC} -pkgrel=1 +pkgrel=2 arch="all" url='http://virtualbox.org' license="GPL custom" diff --git a/testing/xonotic/APKBUILD b/testing/xonotic/APKBUILD index 173abaa8de..95ce767904 100644 --- a/testing/xonotic/APKBUILD +++ b/testing/xonotic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=xonotic pkgver=0.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="game engine for Xonotic (quake1/nexuiz derivative)" url="http://www.xonotic.org/" arch="all" diff --git a/testing/zfs-git-grsec/APKBUILD b/testing/zfs-git-grsec/APKBUILD index ed4bd495c6..451814c37b 100644 --- a/testing/zfs-git-grsec/APKBUILD +++ b/testing/zfs-git-grsec/APKBUILD @@ -7,7 +7,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _mypkgrel=0 _date=20121116 diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD index 82466ce0db..5c9bf62fce 100644 --- a/testing/zfs-grsec/APKBUILD +++ b/testing/zfs-grsec/APKBUILD @@ -7,7 +7,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=3.6.11 -_kpkgrel=15 +_kpkgrel=16 _realver=0.6.0-rc13 _mypkgrel=0 |