Commit 0712f738 authored by Francesco Colista's avatar Francesco Colista
Browse files
parents d9836c35 c57c1c17
......@@ -4,9 +4,9 @@
_flavor=${FLAVOR:-vserver}
_realname=dahdi-linux
_name=$_realname-$_flavor
_kver=3.4.13
_kver=3.6.3
_kpkgrel=0
_myvsver=vs2.3.3.8
_myvsver=vs2.3.4.3-noxfs-nocow
# verify the kernel version before entering chroot
if [ -f ../linux-${_flavor}/APKBUILD ]; then
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=feh
pkgver=2.6.3
pkgver=2.7
pkgrel=0
pkgdesc="feh is a fast, lightweight image viewer which uses imlib2"
url="http://www.linuxbrit.co.uk/feh/"
......@@ -24,4 +24,4 @@ package() {
make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
md5sums="676b92235067a063425f5813b0e1fb7e feh-2.6.3.tar.bz2"
md5sums="ab1d9988ba701d724fdc7194137cc6d1 feh-2.7.tar.bz2"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=galculator
pkgver=1.3.4
pkgrel=4
pkgver=2.0
pkgrel=0
pkgdesc="GTK+ based scientific calculator"
url="http://galculator.sourceforge.net/"
arch="all"
......@@ -25,7 +25,9 @@ prepare() {
build() {
cd "$_builddir"
./configure --prefix=/usr || return 1
./configure --prefix=/usr \
--disable-gtk3 \
|| return 1
make || return 1
}
......@@ -33,5 +35,5 @@ package() {
cd "$srcdir/galculator-$pkgver"
make DESTDIR="$pkgdir" install || return 1
}
md5sums="d30e6fbf5947bb1c873bc9d5a21046f1 galculator-1.3.4.tar.bz2
md5sums="2bec5c1cdab9c5421855f878f8018929 galculator-2.0.tar.bz2
467de62f8737c800eb1db93e501de3cb galculator-1.3.4-libm.patch"
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kmod
pkgver=9
pkgver=10
pkgrel=0
pkgdesc="Linux kernel module management utilities"
url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
......@@ -48,4 +48,4 @@ libs() {
mv "$pkgdir"/lib "$subpkgdir"/
}
md5sums="c8ae2d2694fbca2b28e238b30543a0cd kmod-9.tar.xz"
md5sums="e2a883c4df15a50f78a7a61d5b64089f kmod-10.tar.xz"
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libpng
pkgver=1.5.12
pkgver=1.5.13
pkgrel=0
pkgdesc="Portable Network Graphics library"
url="http://www.libpng.org/"
......@@ -36,5 +36,5 @@ package() {
rm -f "$pkgdir"/usr/lib/*.la
}
md5sums="8ea7f60347a306c5faf70b977fa80e28 libpng-1.5.12.tar.gz
7f2924b1fe0cca9080e18b8720443716 libpng-1.5.12-apng.patch.gz"
md5sums="9c5a584d4eb5fe40d0f1bc2090112c65 libpng-1.5.13.tar.gz
23c8765aa6ca188c0575386d5ea8fe70 libpng-1.5.13-apng.patch.gz"
......@@ -2,9 +2,9 @@
_flavor=vserver
pkgname=linux-${_flavor}
pkgver=3.4.13
pkgver=3.6.3
pkgrel=0
_vsver=vs2.3.3.8
_vsver=vs2.3.4.3-noxfs-nocow
if [ "${pkgver##*.*.*}" = "$pkgver" ]; then
_kernver=$pkgver
......@@ -38,6 +38,9 @@ prepare() {
unxz -c < ../patch-$pkgver.xz | patch -p1 -N || return 1
fi
# ERR is no valid signal
sed -i -e '/^trap/s/ERR//' scripts/link-vmlinux.sh
# first apply patches in specified order
for i in $source; do
i=${i##*/}
......@@ -132,8 +135,8 @@ dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz
65c1d3da2074c552e0a405a1c2f44310 patch-3.4.13.xz
a5306ddb3b03c64509a1643bd129aa33 patch-3.4.13-vs2.3.3.8.diff
0b4b3aa4d261b25c06dd3a5228c07ef1 kernelconfig.x86
fbaa6797813e2bb81d7c8feb6a50e28d kernelconfig.x86_64"
md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz
96701113d37ef4f9b785206ab8bcc71e patch-3.6.3.xz
a7c1fa5d1c41a97a9453a63de5eadb88 patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff
a2f41b951b1923e2520ef610f37ec55b kernelconfig.x86
a7ae4e8a88d495109b63354cfa8e4fcd kernelconfig.x86_64"
This diff is collapsed.
This diff is collapsed.
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=msmtp
pkgver=1.4.29
pkgver=1.4.30
pkgrel=0
pkgdesc="SMTP client with a sendmail compatible interface"
url="http://msmtp.sourceforge.net/"
......@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
md5sums="87cc6f37cb7a163ceb89382932e41535 msmtp-1.4.29.tar.bz2"
md5sums="4d32724a2b03f07aa6d4ea9d49367ad3 msmtp-1.4.30.tar.bz2"
......@@ -3,9 +3,9 @@
_flavor=vserver
_realname=open-vm-tools
_name=$_realname-$_flavor
_kver=3.4.13
_kver=3.6.3
_kpkgrel=0
_myvsver=vs2.3.3.8
_myvsver=vs2.3.4.3-noxfs-nocow
_mypkgrel=1
_realver=9.2.0_p799703
......@@ -42,6 +42,7 @@ subpackages=""
depends="linux-${_flavor}=${_kernelver}"
makedepends="glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}"
source="http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-${_realver%.*}.x/open-vm-tools-${_ver}.tar.gz
linux-3.6-build-fix.patch
vmware-modules.initd
"
install_if="linux-${_flavor}=${_kernelver} open-vm-tools"
......@@ -50,6 +51,11 @@ _builddir="$srcdir/$_realname-$_ver"
prepare() {
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() {
......@@ -78,4 +84,5 @@ package() {
}
md5sums="37341978a00a1568b898a8ce024f9da9 open-vm-tools-9.2.0-799703.tar.gz
d9ffaf628837ea6a216b96dac69705e6 linux-3.6-build-fix.patch
afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd"
diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c
--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c 2012-05-23 00:12:52.000000000 +0400
+++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c 2012-10-02 15:39:47.000000000 +0400
@@ -1801,7 +1802,7 @@
#else
if (mask & MAY_ACCESS) { /* For sys_access. */
#endif
- struct list_head *pos;
+ struct hlist_node *pos;
int dcount = 0;
struct dentry *dentry = NULL;
@@ -1817,7 +1818,7 @@
#endif
/* Find a dentry with valid d_count. Refer bug 587789. */
- list_for_each(pos, &inode->i_dentry) {
+ list_for_each(pos, inode->i_dentry.first) {
dentry = list_entry(pos, struct dentry, d_alias);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
dcount = atomic_read(&dentry->d_count);
diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c
--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c 2012-05-23 00:12:52.000000000 +0400
+++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c 2012-10-02 15:41:38.000000000 +0400
@@ -893,7 +893,7 @@
*/
if ((offset >= currentFileSize) ||
((pageFrom == 0) && (offset + pageTo) >= currentFileSize)) {
- void *kaddr = kmap_atomic(page, KM_USER0);
+ void *kaddr = kmap_atomic(page);
if (pageFrom) {
memset(kaddr, 0, pageFrom);
@@ -901,7 +901,7 @@
if (pageTo < PAGE_CACHE_SIZE) {
memset(kaddr + pageTo, 0, PAGE_CACHE_SIZE - pageTo);
}
- kunmap_atomic(kaddr, KM_USER0);
+ kunmap_atomic(kaddr);
flush_dcache_page(page);
}
}
diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c
--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c 2012-05-23 00:12:52.000000000 +0400
+++ open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c 2012-10-02 15:23:56.000000000 +0400
@@ -162,7 +162,7 @@
cancel_delayed_work(&state->thawTask);
list_for_each_safe(cur, tmp, &state->devices) {
dev = list_entry(cur, VmSyncBlockDevice, list);
- if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
+ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
thaw_bdev(dev->bdev, dev->sb);
atomic_dec(&gFreezeCount);
}
@@ -237,7 +237,7 @@
* the superblock is already frozen.
*/
if (inode->i_sb->s_bdev == NULL ||
- inode->i_sb->s_frozen != SB_UNFROZEN) {
+ inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
compat_path_release(&nd);
goto exit;
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=psqlodbc
pkgver=09.01.0100
pkgrel=1
pkgver=09.01.0200
pkgrel=0
pkgdesc="PostgreSQL ODBC driver"
url="http://www.postgresql.org"
arch="all"
......@@ -25,4 +25,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/*.la
}
md5sums="08121d9d57bb2dbab11c36c2cc8e8edb psqlodbc-09.01.0100.tar.gz"
md5sums="0f4ac0e6b0755af2452764db4cfe4e8f psqlodbc-09.01.0200.tar.gz"
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=radvd
pkgver=1.8
pkgrel=1
pkgver=1.9.1
pkgrel=0
pkgdesc="A Router Advertisement daemon"
url="http://www.litech.org/radvd/"
arch="all"
license="BSD with advertising"
depends=""
depends_dev=""
makedepends="flex bison"
makedepends="flex bison libdaemon-dev"
install=""
subpackages="$pkgname-doc"
source="http://www.litech.org/radvd/dist/radvd-$pkgver.tar.gz
......@@ -50,7 +50,7 @@ package() {
|| return 1
}
md5sums="50b4cfbdfa04d629d80437fd1d9e2aef radvd-1.8.tar.gz
md5sums="e807ad7e9a76d46b6133df391385cd31 radvd-1.9.1.tar.gz
c0297515f242d8e8e890d4cdc38bc5b4 radvd-1.1-gnu-source.patch
ed1e493b9cd46b705886b8934ebc988f radvd.initd
7593b61c3198d961cc86dd5b85b9f44a radvd.confd"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=smartmontools
pkgver=5.43
pkgver=6.0
pkgrel=0
pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
url="http://smartmontools.sourceforge.net"
......@@ -27,6 +27,6 @@ package() {
install -Dm755 ../smartd.initd "$pkgdir"/etc/init.d/smartd
install -Dm644 ../smartd.confd "$pkgdir"/etc/conf.d/smartd
}
md5sums="a1cb2c3d8cc2de377037fe9e7cef40a9 smartmontools-5.43.tar.gz
md5sums="5646a07f5f4bee8e2e649de8c6b7ae87 smartmontools-6.0.tar.gz
b33edf355a83149119d768f0d75787c8 smartd.initd
371cdb7cc9dc924b6d12224d66b193c6 smartd.confd"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ttf-liberation
pkgver=2.00.0
pkgver=2.00.1
pkgrel=0
pkgdesc="Red Hats Liberation fonts"
url="https://fedorahosted.org/liberation-fonts/"
......@@ -22,4 +22,4 @@ package() {
cp -a *.ttf "$pkgdir"/usr/share/fonts/truetype/liberation/
}
md5sums="cfbf1ac6f61bf6cf45342a0cc9381be5 liberation-fonts-ttf-2.00.0.tar.gz"
md5sums="5c781723a0d9ed6188960defba8e91cf liberation-fonts-ttf-2.00.1.tar.gz"
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tzdata
pkgver=2012f
pkgver=2012g
_tzcodever=2011i
_ptzver=0.3
pkgrel=0
......@@ -48,7 +48,7 @@ package() {
}
md5sums="cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
944ad681a8623336230dcdb306d5c9f6 tzdata2012f.tar.gz
111cd46b5c2e40b2b37ae707d48aaa50 tzdata2012g.tar.gz
99efce32b3f870e1b071ce47f3a98a18 posixtz-0.3.tar.bz2
a64ed97d1fc03c66ee8612c0d9f40507 Makefile.patch
0b4d86d855f7daa3f79c9f28f04a48f9 0001-posixtz-fix-up-lseek.patch"
# Maintainer: Michael Zhou <zhoumichaely@gmail.com>
pkgname=unionfs-fuse
pkgver=0.24
pkgver=0.26
pkgrel=0
pkgdesc="Union Filesystem in Userspace"
url="http://podgorny.cz/moin/UnionFsFuse"
......@@ -9,7 +9,7 @@ license="GPL"
depends=""
makedepends="fuse-dev libiconv-dev"
subpackages="${pkgname}-doc"
source="http://podgorny.cz/unionfs-fuse/releases/${pkgname}-${pkgver}.tar.bz2"
source="http://podgorny.cz/unionfs-fuse/releases/${pkgname}-${pkgver}.tar.xz"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
......@@ -26,4 +26,4 @@ package() {
mkdir -p "$pkgdir"/usr/share/man/man8/
make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
}
md5sums="ab00f252c55a9a7252fca13a53260bf5 unionfs-fuse-0.24.tar.bz2"
md5sums="689c636484756f6f7a728ef354cbeac2 unionfs-fuse-0.26.tar.xz"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-intel
pkgver=2.20.10
pkgver=2.20.12
pkgrel=0
pkgdesc="X.Org driver for Intel cards"
url="http://xorg.freedesktop.org/"
......@@ -40,5 +40,5 @@ package() {
find "$pkgdir" -name '*.la' -delete
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
md5sums="a0b1a491e512d8be12605c66445a12fd xf86-video-intel-2.20.10.tar.bz2
md5sums="6d9565de03c167d8f621315476c20c73 xf86-video-intel-2.20.12.tar.bz2
d5c410d504c58aa641658a19e4950ea5 O_CLOEXEC.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment