From 4c56ed76e80f387bcd0477a9d2d2ffb6fdd8e139 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 14:17:45 +0000 Subject: main/apk-tools: upgrade to 2.0 --- main/apk-tools/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index c1de1d045..6120185ed 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=apk-tools -pkgver=2.0_rc7 +pkgver=2.0 pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" @@ -40,4 +40,4 @@ static() { "$subpkgdir"/sbin/apk.static } -md5sums="8654e4e4e32ead79560890567caaea5e apk-tools-2.0_rc7.tar.bz2" +md5sums="dc827e62065c940bbcec1c93099a5718 apk-tools-2.0.tar.bz2" -- cgit v1.2.3 From 36dda31006e60f3860740260bf77fd606108a384 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 14:24:44 +0000 Subject: main/asterisk: patch to prevent run out of sockets fixes #227 --- main/asterisk/400-destroy-no-response-234131.patch | 39 ++++++++++++++++++++++ main/asterisk/APKBUILD | 4 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 main/asterisk/400-destroy-no-response-234131.patch (limited to 'main') diff --git a/main/asterisk/400-destroy-no-response-234131.patch b/main/asterisk/400-destroy-no-response-234131.patch new file mode 100644 index 000000000..16eef5109 --- /dev/null +++ b/main/asterisk/400-destroy-no-response-234131.patch @@ -0,0 +1,39 @@ +--- 1.6.0/channels/chan_sip.c 2009/12/10 16:24:36 234130 ++++ 1.6.0/channels/chan_sip.c 2009/12/10 16:30:22 234131 +@@ -4523,6 +4523,9 @@ + ast_queue_control(p->owner, AST_CONTROL_CONGESTION); + ast_channel_unlock(p->owner); + } ++ ++ /* Give the channel a chance to act before we proceed with destruction */ ++ sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); + } + sip_pvt_unlock(p); + return 0; +@@ -5186,19 +5189,20 @@ + if (needcancel) { /* Outgoing call, not up */ + if (ast_test_flag(&p->flags[0], SIP_OUTGOING)) { + /* stop retransmitting an INVITE that has not received a response */ +- struct sip_pkt *cur; +- for (cur = p->packets; cur; cur = cur->next) { +- __sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data)); +- } +- + /* if we can't send right now, mark it pending */ + if (p->invitestate == INV_CALLING) { + /* We can't send anything in CALLING state */ + ast_set_flag(&p->flags[0], SIP_PENDINGBYE); +- /* Do we need a timer here if we don't hear from them at all? */ ++ __sip_pretend_ack(p); ++ /* Do we need a timer here if we don't hear from them at all? Yes we do or else we will get hung dialogs and those are no fun. */ + sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); + append_history(p, "DELAY", "Not sending cancel, waiting for timeout"); + } else { ++ struct sip_pkt *cur; ++ ++ for (cur = p->packets; cur; cur = cur->next) { ++ __sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data)); ++ } + p->invitestate = INV_CANCELLED; + /* Send a new request: CANCEL */ + transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE); diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 48f880b75..d76ed9567 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras pkgname=asterisk pkgver=1.6.0.20 -pkgrel=0 +pkgrel=1 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" @@ -20,6 +20,7 @@ source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.g 103-rundir.patch 201-incomplete.patch 301-libpri-autoconf.patch + 400-destroy-no-response-234131.patch asterisk.initd asterisk.confd asterisk.logrotate" @@ -97,6 +98,7 @@ b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 5008f51c737ec91f5047519bc9f25b85 103-rundir.patch 57825b74526187075ff7cb6816c55467 201-incomplete.patch 5771a5ab34b187dbfe8e23950b04213b 301-libpri-autoconf.patch +e35d40d688f6e4e4034c7aca8f955f46 400-destroy-no-response-234131.patch 0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd 3e65172275684373e1a25c8a11224411 asterisk.logrotate" -- cgit v1.2.3 From ee20ced73ec58624c78f69b7fe8b6bfba678bc65 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 14:41:39 +0000 Subject: main/mkinitfs: upgrade to 2.0_rc7 --- .../0001-init-never-overwrite-existing-files.patch | 26 ---------------------- main/mkinitfs/APKBUILD | 12 ++++------ 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 main/mkinitfs/0001-init-never-overwrite-existing-files.patch (limited to 'main') diff --git a/main/mkinitfs/0001-init-never-overwrite-existing-files.patch b/main/mkinitfs/0001-init-never-overwrite-existing-files.patch deleted file mode 100644 index 970b13a0a..000000000 --- a/main/mkinitfs/0001-init-never-overwrite-existing-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bf94c9b9aa7884fc50d3110d69e2d28e413159ed Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Tue, 24 Nov 2009 12:23:38 +0000 -Subject: [PATCH] init: never overwrite existing files - -ref #197 ---- - initramfs-init.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index 04798de..bd97ace 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -372,7 +372,7 @@ if [ -n "$KOPT_chart" ]; then - fi - apkflags="--initdb --quiet --progress --force --no-network" - if [ -z "$KOPT_keep_apk_new" ]; then -- apkflags="$apkflags --clean-protected" -+ apkflags="$apkflags --clean-protected --never-overwrite" - fi - apk add --root $sysroot $repo_opt $apkflags $pkgs >/dev/null - eend $? --- -1.6.5.3 - diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index c3f3e767c..797b803e9 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,22 +1,18 @@ # Maintainer: Natanael Copa pkgname=mkinitfs -pkgver=2.0_rc6 -pkgrel=2 +pkgver=2.0_rc7 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs -depends="busybox apk-tools>=2.0_rc7" +depends="busybox apk-tools>=2.0" triggers="$pkgname.trigger:/usr/share/kernel/*" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-init-never-overwrite-existing-files.patch " license="GPL-2" build() { cd "$srcdir"/$pkgname-$pkgver - - patch -p1 -i ../0001-init-never-overwrite-existing-files.patch || return 1 make || return 1 make install DESTDIR="$pkgdir" || return 1 } -md5sums="6b8945b2e3be747caf8cfb29230f180e mkinitfs-2.0_rc6.tar.bz2 -921aadd7e302d5e565e539e611be946e 0001-init-never-overwrite-existing-files.patch" +md5sums="1e4ec2bb620f080699fddb40e273e33c mkinitfs-2.0_rc7.tar.bz2" -- cgit v1.2.3 From 0ed24d7218a2edeedf796f05fb25b99691d5e83d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 15:02:22 +0000 Subject: main/roundcubemail: update dependencies --- main/roundcubemail/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD index 0b6887c63..1c30c6cac 100644 --- a/main/roundcubemail/APKBUILD +++ b/main/roundcubemail/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa pkgname=roundcubemail pkgver=0.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="A PHP web-based mail client" url="http://www.roundcube.net" license="GPL" -depends="php" +depends="php php-imap php-xml" makedepends="" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" -- cgit v1.2.3 From b2a8080b1a70a7afc90e79091825ebeccb716dd1 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 15:05:18 +0000 Subject: main/perl: build fix for parallel builds --- main/perl/APKBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD index 016a526a3..abca94bdf 100644 --- a/main/perl/APKBUILD +++ b/main/perl/APKBUILD @@ -39,9 +39,11 @@ build() { -Ud_csh \ -Dusenm \ || return 1 -# -Dscriptdir=/usr/bin \ - make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" } -- cgit v1.2.3 From f990373f740173383baac5d5b942d190d745afea Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 15:09:51 +0000 Subject: main/vala: upgrade to 0.7.9 --- main/vala/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD index 3cb378632..1c84417fd 100644 --- a/main/vala/APKBUILD +++ b/main/vala/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=vala -pkgver=0.7.8 +pkgver=0.7.9 pkgrel=0 pkgdesc="Compiler for the GObject type system" url="http://live.gnome.org/Vala" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="22f3639e9d0eaf95a3b1830912c1e433 vala-0.7.8.tar.gz" +md5sums="a409c95ca2831c61b1f966d84e9b99ee vala-0.7.9.tar.gz" -- cgit v1.2.3 From baf8c0ac844cb9892c50db2a19ee9021c5a6bb8c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 15:10:31 +0000 Subject: main/vsftpd: upgrade to 2.2.2 --- main/vsftpd/APKBUILD | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'main') diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index 260268540..f53933cd4 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Carlo Landmeter +# Maintainer: Natanael Copa pkgname=vsftpd -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.2 +pkgrel=0 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" license="GPL" @@ -9,9 +10,9 @@ depends= makedepends="openssl-dev !libcap-dev" subpackages="$pkgname-doc" source="ftp://vsftpd.beasts.org/users/cevans/vsftpd-${pkgver}.tar.gz -vsftpd-enable-ssl.patch -vsftpd.initd -vsftpd.confd" + vsftpd-enable-ssl.patch + vsftpd.initd + vsftpd.confd" build() { cd "$srcdir/$pkgname-$pkgver" @@ -20,7 +21,10 @@ build() { patch -p0 -i "$srcdir"/vsftpd-enable-ssl.patch || return 1 make || return 1 - +} + +package() { + cd "$srcdir/$pkgname-$pkgver" install -m755 -D vsftpd "$pkgdir"/usr/sbin/vsftpd install -m644 -D vsftpd.8 "$pkgdir"/usr/share/man/man8/vsftpd.8 install -m644 -D vsftpd.conf.5 "$pkgdir"/usr/share/man/man5/vsftpd.conf.5 @@ -30,7 +34,7 @@ build() { mkdir -p "$pkgdir"/usr/share/empty } -md5sums="7890b54e7ffa6106ffbdfda53f47fa41 vsftpd-2.1.0.tar.gz +md5sums="6d6bc136af14c23f8fef6f1a51f55418 vsftpd-2.2.2.tar.gz f3cbaf364cd3c46a2a03b00de9d7e184 vsftpd-enable-ssl.patch 1a56bcc7698dba6490f0007f37c75e9b vsftpd.initd 431dfe7403323e247a88b97beade5d78 vsftpd.confd" -- cgit v1.2.3 From 5263a61052321de5d98dee0df4e68b12fccc527c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 15:15:26 +0000 Subject: main/sysstat: upgrade to 9.0.6 --- main/sysstat/APKBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'main') diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD index 1d3039d4a..e9e83abed 100644 --- a/main/sysstat/APKBUILD +++ b/main/sysstat/APKBUILD @@ -1,27 +1,30 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa pkgname=sysstat -pkgver=9.0.5 +pkgver=9.0.6 pkgrel=0 pkgdesc="Performance monitoring tools for Linux" url="http://pagesperso-orange.fr/sebastien.godard/" license="GPL" depends= -makedepends="" +makedepends= subpackages="$pkgname-doc" source="http://pagesperso-orange.fr/sebastien.godard/sysstat-$pkgver.tar.gz" build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-nls make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="767f4424f4e014c78ebeb3a6a3d4ea12 sysstat-9.0.5.tar.gz" +md5sums="c05ca01878a4069199d9af93cbe39c8e sysstat-9.0.6.tar.gz" -- cgit v1.2.3 From a41d10334fa5fdbd04fab79a704af5bd219ed69e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 23 Dec 2009 15:16:18 +0000 Subject: main/mdadm: upgrade to 3.1.1 --- main/mdadm/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main') diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD index 0dccc35af..9715d5167 100644 --- a/main/mdadm/APKBUILD +++ b/main/mdadm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter -# Maintainer: Carlo Landmeter +# Maintainer: Natanael Copa pkgname=mdadm -pkgver=3.0.3 +pkgver=3.1.1 pkgrel=0 pkgdesc="a tool for managing Linux Software RAID arrays" url="http://neil.brown.name/blog/mdadm" @@ -32,7 +32,7 @@ package() { install -m644 -D mdadm.conf-example "$pkgdir"/etc/mdadm.conf } -md5sums="80ef2a544bfe39ac2e47686485f470ef mdadm-3.0.3.tar.gz +md5sums="8bfeea282d21b5ef8e825122fb359457 mdadm-3.1.1.tar.gz ce57e798431f7ab89f9b07a7daaa4852 mdadm.initd 16d2b8eb2e17184357db503470fdd8eb mdadm.confd cf60ee08fc4fbed0450c5a2d4efc4214 mdadm-raid.initd -- cgit v1.2.3 From ce9c551ded7784c6967df896afedb68946974451 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Dec 2009 14:56:28 +0000 Subject: main/linux-grsec: disable hpwtd ref #228 --- main/linux-grsec/APKBUILD | 4 ++-- main/linux-grsec/kernelconfig.x86 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 405d9ccd2..3a71772fa 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.32.2 _kernver=2.6.32 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -121,4 +121,4 @@ firmware() { md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2 d7a5cd2c47196c628814018103719599 grsecurity-2.1.14-2.6.32.2-200912201010.patch -512be4fb8684a3a04a39b3888744d200 kernelconfig.x86" +e171958b13f21e7caf535b330b682116 kernelconfig.x86" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 8e89a2853..6e826fe03 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Sat Dec 12 18:09:46 2009 +# Linux kernel version: 2.6.32.2 +# Thu Dec 24 14:35:00 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2633,7 +2633,7 @@ CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_IT8712F_WDT=m CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m +# CONFIG_HP_WATCHDOG is not set CONFIG_SC1200_WDT=m CONFIG_SCx200_WDT=m CONFIG_PC87413_WDT=m -- cgit v1.2.3