From 142254a8709fb1563a1898dbeda1267508a3efe3 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 06:47:37 -0600
Subject: [PATCH 1/9] buildbot: use /bin/tail in logwatcher.py
---
srcpkgs/buildbot/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index 6ba653be69..402c154ff5 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -1,7 +1,7 @@
# Template file for 'buildbot'
pkgname=buildbot
version=0.8.6p1
-revision=2
+revision=3
noarch=yes
build_style=python-module
fulldepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted"
@@ -25,6 +25,10 @@ long_desc="
lint checks, image size, compile time, and other build parameters can be
tracked over time, are more visible, and are therefore easier to improve."
+pre_install() {
+ sed -i -e "s|usr/bin/tail|bin/tail|g" buildbot/scripts/logwatcher.py
+}
+
post_install() {
# Install all contrib modules.
local contribdir=${DESTDIR}/usr/share/buildbot/contrib
From 2e01e11c17c1f7760a25bf0b602336bec41e1e80 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 06:48:16 -0600
Subject: [PATCH 2/9] buildbot-slave: use /bin/tail in logwatcher.py
---
srcpkgs/buildbot-slave/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
index d840d8fa1f..3e8bd8ee56 100644
--- a/srcpkgs/buildbot-slave/template
+++ b/srcpkgs/buildbot-slave/template
@@ -1,7 +1,7 @@
# Template file for 'buildbot-slave'
pkgname=buildbot-slave
version=0.8.6p1
-revision=1
+revision=2
noarch=yes
build_style=python-module
fulldepends="python Twisted"
@@ -27,3 +27,7 @@ long_desc="
This package contains only the buildslave implementation. The buildbot master
is available in the buildbot package."
+
+pre_install() {
+ sed -i -e "s|usr/bin/tail|bin/tail|g" buildslave/scripts/logwatcher.py
+}
From d874c748421ac4ce5a0cf8d979df2f73b74a6bb4 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 12:46:00 -0600
Subject: [PATCH 3/9] wine-unstable: update to 1.5.7
---
srcpkgs/wine-unstable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index ea1b93d5e2..462b368911 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -1,7 +1,7 @@
# Template file for 'wine-unstable'
__pkgname=wine
pkgname=${__pkgname}-unstable
-version=1.5.6
+version=1.5.7
wrksrc=${__pkgname}-${version}
build_style=gnu-configure
configure_args="--with-x"
From 90acc72c04b59cfb969894b09617298495af7458 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 12:56:17 -0600
Subject: [PATCH 4/9] wine-unstable: update distfile checksum
---
srcpkgs/wine-unstable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 462b368911..636e21906c 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -14,7 +14,7 @@ revision=1
short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
maintainer="davehome <davehome@redthumb.info.tm>"
license="LGPL-2.1"
-checksum=b178bc34a69341a8f0a7ff73f7dadf2562ed2e5eb03dc0522b7c4d6002e53994
+checksum=c4cafaa6e8f67d548ee5f35cd486699350404b02b448dd8fd48d664b9c5f0b07
long_desc="
Wine lets you run Windows software on other operating systems. With Wine,
you can install and run these applications just like you would in
From 092a4984024206105fbfb25dc7f5aad2ea41aa55 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 22:10:33 -0600
Subject: [PATCH 5/9] nano: revbump to trigger buildbot, lol
---
srcpkgs/nano/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 272a76fa49..0f0f75bd0a 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,7 +1,7 @@
# Template file for 'nano'
pkgname=nano
version=2.3.1
-revision=2
+revision=3
distfiles="http://www.nano-editor.org/dist/v2.3/$pkgname-$version.tar.gz"
build_style=gnu-configure
makedepends="file-devel glibc-devel ncurses-devel groff"
From 24887cb238aad5818dcc8b19634e9ea4beda75ea Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 23:06:49 -0600
Subject: [PATCH 6/9] chromium: update to 20.0.1132.47
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index ba71438110..7abb3b77bc 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,6 +1,6 @@
# Template file for 'chromium'
pkgname=chromium
-version=20.0.1132.43
+version=20.0.1132.47
revision=1
wrksrc=$pkgname
create_wrksrc=yes
From de78fef23d6d1f8a2f31e391effcb9b7bab5c72d Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 23:16:42 -0600
Subject: [PATCH 7/9] chromium: update tarball checksum
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 7abb3b77bc..adff52ac5b 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -28,7 +28,7 @@ distfiles="
${_url_base}/chromium-browser-official/$pkgname-$version.tar.bz2
${_url_base}/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
checksum="
-c21bdee0ec136102e10c527a0d98e3a29e40406d8f7eb63e8e0ac23801722824
+a34e87ae916c1146b506090d30ac901dbfa88a55db90f8b2250eb29eaca3a1e5
aa836ba493e659f028e8624764ba7662ef4eccd609be4c6812a7901eaf63f6e4"
long_desc="
Chromium is an open-source browser project that aims to build a safer,
From d1c15ed2533281f6b7d6bf25b88eea66d54922be Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 23:24:08 -0600
Subject: [PATCH 8/9] chromium: grr, update nacl checksum
---
srcpkgs/chromium/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index adff52ac5b..a07472c608 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -29,7 +29,7 @@ ${_url_base}/chromium-browser-official/$pkgname-$version.tar.bz2
${_url_base}/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
checksum="
a34e87ae916c1146b506090d30ac901dbfa88a55db90f8b2250eb29eaca3a1e5
-aa836ba493e659f028e8624764ba7662ef4eccd609be4c6812a7901eaf63f6e4"
+ac371e9e8312f01856e892b29c788acfa03cbb79aaabe0b5a3ae0cd2f8399a91"
long_desc="
Chromium is an open-source browser project that aims to build a safer,
faster, and more stable way for all Internet users to experience the web.
From bfcb66f976c870f50f75a2ce0aae7ae3ac1050bb Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 28 Jun 2012 23:32:12 -0600
Subject: [PATCH 9/9] chromium: update version in patches
---
srcpkgs/chromium/patches/chromium-gcc47.patch | 20 +++++++++----------
....3-fix-out-of-scope-memory-reference.patch | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/chromium/patches/chromium-gcc47.patch b/srcpkgs/chromium/patches/chromium-gcc47.patch
index aab9ee9a29..8ac220c58f 100644
--- a/srcpkgs/chromium/patches/chromium-gcc47.patch
+++ b/srcpkgs/chromium/patches/chromium-gcc47.patch
@@ -1,5 +1,5 @@
---- chromium-20.0.1132.43/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500
-+++ chromium-20.0.1132.43/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500
+--- chromium-20.0.1132.47/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500
++++ chromium-20.0.1132.47/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500
@@ -6,6 +6,7 @@
#include <errno.h>
@@ -8,8 +8,8 @@
#include "base/auto_reset.h"
#include "base/compiler_specific.h"
---- chromium-20.0.1132.43/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500
-+++ chromium-20.0.1132.43/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500
+--- chromium-20.0.1132.47/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500
++++ chromium-20.0.1132.47/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500
@@ -3,6 +3,7 @@
// found in the LICENSE file.
@@ -18,8 +18,8 @@
#include "chrome/browser/policy/policy_path_parser.h"
---- chromium-20.0.1132.43/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500
-+++ chromium-20.0.1132.43/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500
+--- chromium-20.0.1132.47/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500
++++ chromium-20.0.1132.47/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500
@@ -9,6 +9,7 @@
#include "base/process.h"
#include "ipc/ipc_channel_handle.h"
@@ -28,8 +28,8 @@
namespace IPC {
---- chromium-20.0.1132.43/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500
-+++ chromium-20.0.1132.43/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500
+--- chromium-20.0.1132.47/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500
++++ chromium-20.0.1132.47/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500
@@ -3,10 +3,7 @@
// found in the LICENSE file.
@@ -41,8 +41,8 @@
namespace IPC {
---- chromium-20.0.1132.43/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500
-+++ chromium-20.0.1132.43/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500
+--- chromium-20.0.1132.47/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500
++++ chromium-20.0.1132.47/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500
@@ -12,6 +12,7 @@
#include <string>
#include <string.h>
diff --git a/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch b/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
index 89f5c864f0..d082e6b58e 100644
--- a/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
+++ b/srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
@@ -1,5 +1,5 @@
---- chromium-20.0.1132.43/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300
-+++ chromium-20.0.1132.43/third_party/sqlite/src/ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300
+--- chromium-20.0.1132.47/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300
++++ chromium-20.0.1132.47/third_party/sqlite/src/ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300
@@ -1238,13 +1238,13 @@ int sqlite3Fts3SegReaderPending(
Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
){