diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /main | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-10b8b99e48384b4470cac1330080c12d2ade01de.tar.bz2 aports-10b8b99e48384b4470cac1330080c12d2ade01de.tar.xz | |
Merge remote branch 'upstream/master' into to-upstream
Diffstat (limited to 'main')
686 files changed, 14668 insertions, 12305 deletions
diff --git a/main/a2ps/APKBUILD b/main/a2ps/APKBUILD index 18409a28d6..369a94db61 100644 --- a/main/a2ps/APKBUILD +++ b/main/a2ps/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=a2ps pkgver=4.14 -pkgrel=0 +pkgrel=1 pkgdesc="a2ps is an Any to PostScript filter" url="http://www.gnu.org/software/a2ps/" license="GPL3" diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD index 8d3b868d2f..bbb41d5f10 100644 --- a/main/a52dec/APKBUILD +++ b/main/a52dec/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=a52dec pkgver=0.7.4 -pkgrel=0 +pkgrel=1 pkgdesc="liba52 is a free library for decoding ATSC A/52 streams." url="http://liba52.sourceforge.net/" license="GPL2" diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD index 8007da2ab4..c134f19920 100644 --- a/main/abiword/APKBUILD +++ b/main/abiword/APKBUILD @@ -1,24 +1,68 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abiword -pkgver=2.8.3 -pkgrel=0 +pkgver=2.8.4 +pkgrel=2 pkgdesc="A fully-featured word processor" url="http://www.abisource.com" license="GPL" makedepends="pkgconfig libglade-dev libgsf-dev enchant-dev fribidi-dev wv-dev - popt-dev jpeg-dev librsvg-dev bzip2-dev" -subpackages="$pkgname-dev" + popt-dev jpeg-dev librsvg-dev bzip2-dev goffice-dev" + +# openxml plugin +makedepends="$makedepends boost-dev" + +# collab plugin +makedepends="$makedepends gnutls-dev libsoup-dev dbus-glib-dev" + + +subpackages="$pkgname-dev $pkgname-doc $pkgname-plugins" + +_plugins="applix babelfish bmp clarisworks collab docbook eml freetranslation + garble gdict gimp google hancom hrtext iscii kword loadbindings mht + mif mswrite openwriter openxml opml paint passepartout pdb pdf + presentation s5 sdw t602 urldict wikipedia wml xslfo" + +for _i in $_plugins; do + subpackages="$subpackages $pkgname-plugin-$_i:$_i" +done + source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz" build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ + --enable-shared \ + --disable-static \ + --enable-plugins \ || return 1 make || return 1 } +# ="opendocument goffice latex" \ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="8984b09663e1514ca0e361b0627ea285 abiword-2.8.3.tar.gz" + +_do_plugin() { + local plugin="$1" + pkgdesc="Abiword $1 plugin" + local dir="usr/lib/abiword-${pkgver%.*}/plugins" + mkdir -p "$subpkgdir"/$dir + mv "$pkgdir"/$dir/$plugin.so "$subpkgdir"/$dir/ +} + +for _i in $_plugins; do + eval "$_i() { _do_plugin $_i; }" +done + +plugins() { + pkgdesc="Abiword plugins, all of them" + depends= + for _i in $_plugins; do + depends="$depends $pkgname-plugin-$_i" + done + mkdir -p "$subpkgdir" +} + +md5sums="f782ecb8e07d07ec179f7a143353cc29 abiword-2.8.4.tar.gz" diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index ed4d017cf4..989c7bebea 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.1 +pkgver=2.3 pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 @@ -12,10 +12,13 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" - make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="2268fa6147c8088139ef136184cd2ae0 abuild-2.1.tar.bz2" +md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2" diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD index c4a68c67bb..020721398e 100644 --- a/main/acct/APKBUILD +++ b/main/acct/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=acct pkgver=6.5.3 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Accounting Utilities" url="http://www.gnu.org/software/acct/" license="GPL" diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD index ec2f111cad..b0b3da27d5 100644 --- a/main/acf-weblog/APKBUILD +++ b/main/acf-weblog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-weblog -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=0 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles" url="http://git.alpinelinux.org/cgit/acf-weblog" @@ -17,4 +17,4 @@ build() { make DESTDIR="$pkgdir" install } -md5sums="8926a8178bf646363678bc9feacbc310 acf-weblog-0.5.4.tar.bz2" +md5sums="c48ef4d8d9136f16de68129404ffb3ee acf-weblog-0.5.5.tar.bz2" diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index b4eeefa3db..36e96a1f99 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for minimal alpine base" url="http://alpinelinux.org" license="GPL" depends="alpine-baselayout alpine-conf apk-tools busybox busybox-initscripts - openrc" + openrc uclibc-utils" makedepends= install= subpackages= diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD index 46a325b976..ba6c321fe9 100644 --- a/main/alpine-baselayout/APKBUILD +++ b/main/alpine-baselayout/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout pkgver=2.0_rc1 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine base dir structure and init scripts" url=http://git.alpinelinux.org/cgit/alpine-baselayout depends= @@ -11,7 +11,12 @@ license=GPL-2 build() { cd "$srcdir"/$pkgname-$pkgver + rm -f src/mkmntdirs make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make install PREFIX= DESTDIR="$pkgdir" || return 1 } md5sums="76d61057c9e21d8e3ef85933a20b814d alpine-baselayout-2.0_rc1.tar.bz2" diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 1f4bbf3fd9..64333a38c4 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.3 +pkgver=2.4 pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname @@ -9,6 +9,10 @@ source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.b license="GPL-2" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + build() { cd "$_builddir" make || return 1 @@ -21,4 +25,4 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2" +md5sums="4c8db8948a21b0435f577d1e0f8d7c8e alpine-conf-2.4.tar.bz2" diff --git a/main/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD index 587f1785e6..1b6d79cbde 100644 --- a/main/alpine-sdk/APKBUILD +++ b/main/alpine-sdk/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-sdk pkgver=0.3 +pkgrel=0 url=http://dev.alpinelinux.org/cgit pkgdesc="Alpine Software Development Kit meta package" depends="abuild build-base git cramfs cdrkit acct mkinitfs mtools" diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD index eda8c61241..1b4503c92b 100644 --- a/main/alsa-lib/APKBUILD +++ b/main/alsa-lib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alsa-lib -pkgver=1.0.22 -pkgrel=0 +pkgver=1.0.23 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" url="http://www.alsa-project.org" license="GPL" @@ -19,6 +19,7 @@ build() { --enable-seq \ --enable-aload \ --disable-dependency-tracking \ + --without-versioned \ || return 1 make || return 1 } @@ -27,4 +28,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir" install } -md5sums="b28a12348905fb6915bc41f0edb2ecce alsa-lib-1.0.22.tar.bz2" +md5sums="f48b50421d8a69d2d806d9c47e534f0d alsa-lib-1.0.23.tar.bz2" diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD index 6929217100..ad9ef36e46 100644 --- a/main/amavisd-new/APKBUILD +++ b/main/amavisd-new/APKBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="High-performance interface between mailer (MTA) and content checkers" url="http://www.ijs.si/software/amavisd" license="GPL-2" -depends="uclibc sed file perl perl-archive-zip perl-convert-tnef +depends="sed file perl perl-archive-zip perl-convert-tnef perl-convert-uulib perl-mime-tools perl-mail-tools perl-net-server perl-io-stringy perl-unix-syslog perl-db perl-mail-dkim" makedepends="" diff --git a/main/antiword/APKBUILD b/main/antiword/APKBUILD index a6134c9f2f..d7b80c7709 100644 --- a/main/antiword/APKBUILD +++ b/main/antiword/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=antiword pkgver=0.37 -pkgrel=0 +pkgrel=1 pkgdesc="free MS Word reader" url="http://www.winfield.demon.nl" license="GPL" diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD index c9b29fa28d..4193348f20 100644 --- a/main/apcupsd/APKBUILD +++ b/main/apcupsd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apcupsd pkgver=3.14.8 -pkgrel=1 +pkgrel=2 pkgdesc="A Daemon to control APC UPSes" subpackages="$pkgname-doc" url="http://www.apcupsd.org" diff --git a/main/apg/APKBUILD b/main/apg/APKBUILD index 98d41665a6..8912b5f3e1 100644 --- a/main/apg/APKBUILD +++ b/main/apg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apg pkgver=2.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Automated Password Generator." url="http://www.adel.nursat.kz/apg/index.shtml" license="custom" diff --git a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch new file mode 100644 index 0000000000..4df956bf36 --- /dev/null +++ b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch @@ -0,0 +1,27 @@ +From 87420aaf295f58847332ba3aa89691a0259baace Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Wed, 5 May 2010 08:56:06 +0300 +Subject: [PATCH 1/5] info: fix querying of removed, but referenced packages + +Check that package name has packages associated with it before +dereferencing the pointer. Fixes #345. +--- + src/info.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/info.c b/src/info.c +index 7ca486c..d944fca 100644 +--- a/src/info.c ++++ b/src/info.c +@@ -283,7 +283,7 @@ static int info_package(struct info_ctx *ctx, struct apk_database *db, + + for (i = 0; i < argc; i++) { + name = apk_db_query_name(db, APK_BLOB_STR(argv[i])); +- if (name == NULL) { ++ if (name == NULL || name->pkgs == NULL) { + apk_error("Not found: %s", argv[i]); + return 1; + } +-- +1.7.1 + diff --git a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch new file mode 100644 index 0000000000..2e20152ddf --- /dev/null +++ b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch @@ -0,0 +1,42 @@ +From 47bac8c29c9a3c3fbebfd20e907170f24f9d677c Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 11 May 2010 09:31:20 +0000 +Subject: [PATCH 2/5] upgrade: reset versioned deps in world when doing upgrade -a + +Doing "apk add file.apk" adds a versioned dependency to allow +downgrading, and sticky version. Most often this is to install +single packages from newer repository. So it would make sense +to reset them to non-versioned if doing: + + apk upgrade -a + +fixes #346 +--- + src/upgrade.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/upgrade.c b/src/upgrade.c +index f91e8cc..879e14c 100644 +--- a/src/upgrade.c ++++ b/src/upgrade.c +@@ -41,10 +41,15 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg + goto err; + + for (i = 0; i < db->world->num; i++) { +- r = apk_state_lock_dependency(state, &db->world->item[i]); ++ struct apk_dependency *dep = &db->world->item[i]; ++ if (dep->version && (apk_flags & APK_PREFER_AVAILABLE)) { ++ dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER; ++ dep->version = NULL; ++ } ++ r = apk_state_lock_dependency(state, dep); + if (r != 0) { + apk_error("Unable to upgrade '%s'", +- db->world->item[i].name->name); ++ dep->name->name); + goto err; + } + } +-- +1.7.1 + diff --git a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch new file mode 100644 index 0000000000..f2947c635a --- /dev/null +++ b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch @@ -0,0 +1,221 @@ +From d9bf4aabff801164b4c54e51b38c5f6eab2da114 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 19 May 2010 16:48:40 +0300 +Subject: [PATCH 3/5] search: add search for reverse dependencies in index + +So it'll be easier to rebuild affected packages. Fixes #349. +--- + src/search.c | 148 +++++++++++++++++++++++++++++++++++---------------------- + 1 files changed, 91 insertions(+), 57 deletions(-) + +diff --git a/src/search.c b/src/search.c +index 91c2913..e5e5d55 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -18,18 +18,14 @@ + #include "apk_state.h" + + struct search_ctx { +- int (*action)(struct apk_database *db, int argc, char **argv); ++ int (*match)(struct apk_package *pkg, const char *str); ++ int (*print)(struct apk_package *pkg); ++ int argc; ++ char **argv; + }; + +-struct search_query_ctx { +- struct apk_database *db; +- const char *query; +-}; +- +-static int search_list_print(apk_hash_item item, void *ctx) ++static int print_match(struct apk_package *pkg) + { +- struct apk_package *pkg = (struct apk_package *) item; +- + printf("%s", pkg->name->name); + if (apk_verbosity > 0) + printf("-%s", pkg->version); +@@ -41,61 +37,50 @@ static int search_list_print(apk_hash_item item, void *ctx) + return 0; + } + +-static int search_query_print(apk_hash_item item, void *ctx) ++static int print_rdepends(struct apk_package *pkg) + { +- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx; +- struct apk_package *pkg = (struct apk_package *) item; ++ struct apk_name *name, *name0; ++ struct apk_package *pkg0; ++ struct apk_dependency *dep; ++ int i, j, k; + +- if (fnmatch(ictx->query, pkg->name->name, 0) != 0) ++ name = pkg->name; ++ if (name->rdepends == NULL) + return 0; +- search_list_print(item, ictx->db); +- +- return 0; +-} +- +-static int search_list(struct apk_database *db, int argc, char **argv) +-{ +- int i; +- struct search_query_ctx ctx; +- +- ctx.db = db; + +- if (argc == 0) +- apk_hash_foreach(&db->available.packages, search_list_print, db); +- else +- for (i=0; i<argc; i++) { +- ctx.query = argv[i]; +- apk_hash_foreach(&db->available.packages, search_query_print, &ctx); ++ printf("%s-%s:", pkg->name->name, pkg->version); ++ for (i = 0; i < name->rdepends->num; i++) { ++ name0 = name->rdepends->item[i]; ++ if (name0->pkgs == NULL) ++ continue; ++ for (j = 0; j < name0->pkgs->num; j++) { ++ pkg0 = name0->pkgs->item[j]; ++ if (pkg0->depends == NULL) ++ continue; ++ for (k = 0; k < pkg0->depends->num; k++) { ++ dep = &pkg0->depends->item[k]; ++ if (name == dep->name && ++ (apk_version_compare(pkg->version, dep->version) ++ & dep->result_mask)) { ++ printf(" %s-%s", pkg0->name->name, pkg0->version); ++ } ++ } + } ++ } ++ printf("\n"); + + return 0; + } + +-static int search_query_desc_print(apk_hash_item item, void *ctx) ++static int search_pkgname(struct apk_package *pkg, const char *str) + { +- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx; +- struct apk_package *pkg = (struct apk_package *) item; +- +- if( strstr(pkg->description, ictx->query) == NULL ) +- return 0; +- search_list_print(item, ictx->db); +- +- return 0; ++ return fnmatch(str, pkg->name->name, 0) == 0; + } + +-static int search_desc(struct apk_database *db, int argc, char **argv) ++static int search_desc(struct apk_package *pkg, const char *str) + { +- int i; +- struct search_query_ctx ctx; +- +- ctx.db = db; +- +- for (i=0; i<argc; i++) { +- ctx.query = argv[i]; +- apk_hash_foreach(&db->available.packages, search_query_desc_print, &ctx); +- } +- +- return 0; ++ return strstr(pkg->name->name, str) != NULL || ++ strstr(pkg->description, str) != NULL; + } + + static int search_parse(void *ctx, struct apk_db_options *dbopts, +@@ -105,7 +90,10 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, + + switch (optch) { + case 'd': +- ictx->action = search_desc; ++ ictx->match = search_desc; ++ break; ++ case 'r': ++ ictx->print = print_rdepends; + break; + default: + return -1; +@@ -113,23 +101,69 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, + return 0; + } + ++static int match_packages(apk_hash_item item, void *ctx) ++{ ++ struct search_ctx *ictx = (struct search_ctx *) ctx; ++ struct apk_package *pkg = (struct apk_package *) item; ++ int i; ++ ++ for (i = 0; i < ictx->argc; i++) ++ if (ictx->match(pkg, ictx->argv[i])) ++ break; ++ if (ictx->argc == 0 || i < ictx->argc) ++ ictx->print(pkg); ++ ++ return 0; ++} ++ + static int search_main(void *ctx, struct apk_database *db, int argc, char **argv) + { + struct search_ctx *ictx = (struct search_ctx *) ctx; ++ struct apk_name *name; ++ int rc = 0, i, j, slow_search; ++ ++ slow_search = ictx->match != NULL || argc == 0; ++ if (!slow_search) { ++ for (i = 0; i < argc; i++) ++ if (strcspn(argv[i], "*?[") != strlen(argv[i])) { ++ slow_search = 1; ++ break; ++ } ++ } ++ ++ if (ictx->match == NULL) ++ ictx->match = search_pkgname; ++ if (ictx->print == NULL) ++ ictx->print = print_match; ++ else if (argc == 0) ++ return -1; + +- if (ictx->action != NULL) +- return ictx->action(db, argc, argv); ++ if (slow_search) { ++ ictx->argc = argc; ++ ictx->argv = argv; ++ rc = apk_hash_foreach(&db->available.packages, ++ match_packages, ictx); ++ } else { ++ for (i = 0; i < argc; i++) { ++ name = apk_db_query_name(db, APK_BLOB_STR(argv[i])); ++ if (name == NULL || name->pkgs == NULL) ++ continue; ++ for (j = 0; j < name->pkgs->num; j++) ++ ictx->print(name->pkgs->item[j]); ++ } ++ } + +- return search_list(db, argc, argv); ++ return rc; + } + + static struct apk_option search_options[] = { +- { 'd', "description", "Search also package descriptions" }, ++ { 'd', "description", "Search also package descriptions" }, ++ { 'r', "rdepends", "Print reverse dependencies of package" }, + }; + + static struct apk_applet apk_search = { + .name = "search", +- .help = "Search package names (and descriptions) by wildcard PATTERN.", ++ .help = "Search package by PATTERNs or by indexed dependencies.", + .arguments = "PATTERN", + .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE, + .context_size = sizeof(struct search_ctx), +-- +1.7.1 + diff --git a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch new file mode 100644 index 0000000000..818eeb1e79 --- /dev/null +++ b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch @@ -0,0 +1,27 @@ +From fe55da70741621f7bac2cd943b64cc13e25f9427 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 26 May 2010 14:30:08 +0300 +Subject: [PATCH 4/5] package: don't leak signing key file fd + +openssl BIO does not close the fd unless we explicitly tell it to +do so. +--- + src/package.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/package.c b/src/package.c +index b265468..b97c412 100644 +--- a/src/package.c ++++ b/src/package.c +@@ -441,7 +441,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx, + if (fd < 0) + return 0; + +- bio = BIO_new_fp(fdopen(fd, "r"), 0); ++ bio = BIO_new_fp(fdopen(fd, "r"), BIO_CLOSE); + ctx->signature.pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL); + if (ctx->signature.pkey != NULL) { + if (fi->name[6] == 'R') +-- +1.7.1 + diff --git a/main/apk-tools/0005-cache-display-more-than-one-error.patch b/main/apk-tools/0005-cache-display-more-than-one-error.patch new file mode 100644 index 0000000000..6e85218b18 --- /dev/null +++ b/main/apk-tools/0005-cache-display-more-than-one-error.patch @@ -0,0 +1,55 @@ +From d21303960544b5f11b7d69d0335f0903fb93d180 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 13 May 2010 09:26:19 +0000 +Subject: [PATCH 5/5] cache: display more than one error + +Display all packages that are bad in world rather than only first +before exiting. +--- + src/cache.c | 15 ++++++++------- + 1 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/cache.c b/src/cache.c +index 85d9777..49a71fa 100644 +--- a/src/cache.c ++++ b/src/cache.c +@@ -30,7 +30,7 @@ static int cache_download(struct apk_database *db) + struct apk_package *pkg; + struct apk_repository *repo; + char item[PATH_MAX], cacheitem[PATH_MAX]; +- int i, r = 0; ++ int i, r = 0, errors = 0; + + if (db->world == NULL) + return 0; +@@ -41,12 +41,13 @@ static int cache_download(struct apk_database *db) + + for (i = 0; i < db->world->num; i++) { + r = apk_state_lock_dependency(state, &db->world->item[i]); +- if (r != 0) { +- apk_error("Unable to select version for '%s': %d", +- db->world->item[i].name->name, r); +- goto err; +- } ++ errors += r; ++ if (r != 0) ++ apk_error("Unable to select version for '%s'", ++ db->world->item[i].name->name); + } ++ if (errors) ++ goto err; + + list_for_each_entry(change, &state->change_list_head, change_list) { + pkg = change->newpkg; +@@ -67,7 +68,7 @@ static int cache_download(struct apk_database *db) + err: + if (state != NULL) + apk_state_unref(state); +- return r; ++ return errors; + } + + static int cache_clean(struct apk_database *db) +-- +1.7.1 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 7b36613784..07b602dfaf 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,26 +1,34 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.0.2 -pkgrel=0 +pkgrel=6 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= makedepends="zlib-dev openssl-dev pkgconfig" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-info-fix-querying-of-removed-but-referenced-packages.patch + 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch + 0003-search-add-search-for-reverse-dependencies-in-index.patch + 0004-package-don-t-leak-signing-key-file-fd.patch + 0005-cache-display-more-than-one-error.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" license=GPL-2 -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" sed -i -e 's:-Werror::' Make.rules for i in ../*.patch; do [ -f $i ] || continue patch -p1 -i $i || return 1 done +} +build() { + cd "$srcdir/$pkgname-$pkgver" make || return 1 make static || return 1 make DESTDIR="$pkgdir" install @@ -40,4 +48,9 @@ static() { "$subpkgdir"/sbin/apk.static } -md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2" +md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2 +c590e894c2580cbb092b150fca9af3cf 0001-info-fix-querying-of-removed-but-referenced-packages.patch +5c53eaa29dd9722c25b6878cde392d05 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch +6baca299fbf00b97f78fa8fbd0e82f5b 0003-search-add-search-for-reverse-dependencies-in-index.patch +175470e6d5b2d20fe02d6fb61f8ec6d1 0004-package-don-t-leak-signing-key-file-fd.patch +0ab64b75b09f37b4d265df3f7b5b7e83 0005-cache-display-more-than-one-error.patch" diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD index 4c52e5235c..45133a2c29 100644 --- a/main/apr-util/APKBUILD +++ b/main/apr-util/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apr-util pkgver=1.3.9 -pkgrel=0 +pkgrel=1 pkgdesc="The Apache Portable Runtime" url="http://apr.apache.org/" license="APACHE" diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD index 98891c9ab2..efef9c19cd 100644 --- a/main/apr/APKBUILD +++ b/main/apr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apr pkgver=1.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="The Apache Portable Runtime" url="http://apr.apache.org/" license="APACHE" diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD index a18f88c3ea..5b47cd0db5 100644 --- a/main/arpon/APKBUILD +++ b/main/arpon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=arpon pkgver=1.90 -pkgrel=1 +pkgrel=2 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects" url="http://arpon.sourceforge.net/" license="GPL" diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD index ff97c65b20..4907a65cb9 100644 --- a/main/arpwatch/APKBUILD +++ b/main/arpwatch/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=arpwatch pkgver=2.1a15 -pkgrel=1 +pkgrel=2 pkgdesc="Ethernet monitoring program" url="http://www-nrg.ee.lbl.gov/" license="GPL" diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD index 3a3cef36aa..34cd720d4e 100644 --- a/main/aspell/APKBUILD +++ b/main/aspell/APKBUILD @@ -2,28 +2,29 @@ pkgname=aspell pkgver=0.60.6 _pkgmajorver=${pkgver%.*} -pkgrel=0 +pkgrel=2 pkgdesc="A spell checker designed to eventually replace Ispell" url="http://aspell.net/" license="LGPL" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="ncurses-dev uclibc++-dev perl" +makedepends="ncurses-dev perl" install= source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz libmath.patch" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver - export CXX=${CXX_UC:-g++-uc} - ./configure --prefix=/usr || return 1 # we want add -lm to linker flag for libaspell so wil build that # separately. this is just an ugly workaround make libaspell.la LDFLAGS="$LDFLAGS -lm" || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 ln -s $pkgname-${_pkgmajorver} "$pkgdir"/usr/lib/$pkgname || return 1 } diff --git a/main/asterisk-addons/APKBUILD b/main/asterisk-addons/APKBUILD new file mode 100644 index 0000000000..92fb199000 --- /dev/null +++ b/main/asterisk-addons/APKBUILD @@ -0,0 +1,75 @@ +# Contributor: Carlo Landmeter +# Maintainer: +pkgname=asterisk-addons +pkgver=1.6.2.1 +pkgrel=1 +pkgdesc="Asterisk addons" +url="http://www.asterisk.org" +license="GPL2" +makedepends="mysql-dev asterisk-dev autoconf automake" +install= +subpackages="$pkgname-mysql $pkgname-mp3 $pkgname-ooh323 $pkgname-saycountpl" +depends="$subpackages" +source="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-addons-1.6.2.1.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + ./bootstrap.sh +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + + make -j1 || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" samples + # we are not building the mobile module because aports does not have bluez so we delete mobile.conf + rm -rf "$pkgdir"/etc +} + +_find_and_move() { + local pattern="$1" + cd "$pkgdir" || return 1 + find -name "$pattern" -type f | while read f; do + local dest="$subpkgdir/${f%/*}" + mkdir -p "$dest" + mv "$f" "$dest" + done +} + +mysql() { + pkgdesc="Asterisk mysql addons" + depends="asterisk" + _find_and_move '*mysql*' +} + +mp3() { + pkgdesc="Asterisk mp3 addon" + depends="asterisk" + _find_and_move '*mp3*' +} + +ooh323() { + pkgdesc="Asterisk h323 channel driver" + depends="asterisk" + _find_and_move '*ooh323*' +} + +saycountpl() { + pkgdesc="Asterisk say count pl application" + depends="asterisk" + _find_and_move '*saycountpl*' + mv "$pkgdir"/var "$subpkgdir" +} + +md5sums="95e33f22f53d58ac95c54d2c8b8d9d76 asterisk-addons-1.6.2.1.tar.gz" diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 51180cc5e1..1ed4b41083 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=1.6.2.6 +pkgver=1.6.2.7 pkgrel=1 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.gz 100-uclibc-daemon.patch 101-caps-uclibc.patch - 102-gsm-pic.patch 400-bug-227.patch asterisk.initd asterisk.confd @@ -111,10 +110,9 @@ sample() { make samples DESTDIR="$subpkgdir" } -md5sums="f068ef2433eebdc7f6dd635986f36d77 asterisk-1.6.2.6.tar.gz +md5sums="861f57ba43bfe05dc645e0679a260e41 asterisk-1.6.2.7.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch -97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch 79e9634b5054bceb3b8dc246654bb243 400-bug-227.patch 0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd diff --git a/main/aterm/APKBUILD b/main/aterm/APKBUILD index e414f4a457..e8f2b3e8e5 100644 --- a/main/aterm/APKBUILD +++ b/main/aterm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aterm pkgver=1.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="An xterm replacement with transparency support" url="http://aterm.sourceforge.net/" license="GPL" diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD index 8033388330..4dd5afd3ab 100644 --- a/main/atk/APKBUILD +++ b/main/atk/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=atk pkgver=1.30.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library providing a set of interfaces for accessibility" url="http://www.gtk.org/" license="LGPL" diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD index ecbfb102ba..2a9eafdb43 100644 --- a/main/atop/APKBUILD +++ b/main/atop/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=atop -pkgver=1.24 -pkgrel=1 +pkgver=1.25 +pkgrel=0 pkgdesc="Resource-specific view of processes" url="http://www.atcomputing.nl/Tools/atop" license="GPL-2" depends= makedepends="zlib-dev ncurses-dev" subpackages="$pkgname-doc" -source="http://www.atoptool.nl/packages/atop-$pkgver.tar.gz +source="http://www.atoptool.nl/download/atop-$pkgver.tar.gz atop-bb-compat.patch atop.initd" @@ -40,6 +40,6 @@ package() { } -md5sums="46522f7da28460e810e193ab46907af9 atop-1.24.tar.gz +md5sums="8b67756a71ca49728b402da369c4f26e atop-1.25.tar.gz a4119e314cdc6d50bf027add32e1902b atop-bb-compat.patch 06aba14ddeadbb1d0c3594536785213b atop.initd" diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD index 7046bd56fa..e244a5aac9 100644 --- a/main/attr/APKBUILD +++ b/main/attr/APKBUILD @@ -2,7 +2,7 @@ pkgname=attr pkgver=2.4.44 _ver=2.4.44 -pkgrel=1 +pkgrel=2 pkgdesc="Extended attribute support library for ACL support" url="http://oss.sgi.com/projects/xfs/" license="LGPL" diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD index 1e455850d0..694561695d 100644 --- a/main/aumix/APKBUILD +++ b/main/aumix/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aumix pkgver=2.8 -pkgrel=2 +pkgrel=3 pkgdesc="A color text mode sound mixer" url="http://www.jpj.net/~trevor/aumix.html" license="GPL" diff --git a/main/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD index 0a7f4cc6a4..6b92c22f9b 100644 --- a/main/b43-fwcutter/APKBUILD +++ b/main/b43-fwcutter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=b43-fwcutter -pkgver=012 +pkgver=013 pkgrel=0 pkgdesc="Tool to extract firmware from Broadcom drivers" url="http://linuxwireless.org/en/users/Drivers/b43" @@ -10,15 +10,18 @@ depends="" makedepends="" install= subpackages="$pkgname-doc" -source="http://bu3sch.de/b43/fwcutter/b43-fwcutter-012.tar.bz2" +source="http://bu3sch.de/b43/fwcutter/b43-fwcutter-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" - make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make PREFIX="$pkgdir"/usr install mkdir -p "$pkgdir"/usr/share/ mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ } -md5sums="69eadf67b459f313a8d6b37aaabef96c b43-fwcutter-012.tar.bz2" +md5sums="3547ec6c474ac1bc2c4a5bb765b791a4 b43-fwcutter-013.tar.bz2" diff --git a/main/babl/APKBUILD b/main/babl/APKBUILD new file mode 100644 index 0000000000..46648b6db8 --- /dev/null +++ b/main/babl/APKBUILD @@ -0,0 +1,23 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=babl +pkgver=0.1.2 +pkgrel=0 +pkgdesc="Dynamic, any to any, pixel format conversion library" +url="http://gegl.org/babl/" +license="LGPL3" +depends= +makedepends= +subpackages="$pkgname-dev" +source="ftp://ftp.gtk.org/pub/$pkgname/0.1/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="8eebd8d78d3173db7af5e3e60b1e03ea babl-0.1.2.tar.bz2" diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD index 421c936cc1..27f2cf97d5 100644 --- a/main/bash/APKBUILD +++ b/main/bash/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bash -pkgver=4.1.005 +pkgver=4.1.007 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} _patchbase=${_myver%.*}${_myver#*.} @@ -70,4 +70,6 @@ md5sums="9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz 118d465095d4a4706eb1d34696a2666a bash41-002 120f7cf039a40d35fe375e59d6f17adc bash41-003 336ee037fc2cc1e2350b05097fbdc87c bash41-004 -9471e666797f0b03eb2175ed752a9550 bash41-005" +9471e666797f0b03eb2175ed752a9550 bash41-005 +fb80ccd58cb1e34940f3adf4ce6e4a1e bash41-006 +192a8b161d419a1d0d211169f1d1046e bash41-007" diff --git a/main/bbsuid/APKBUILD b/main/bbsuid/APKBUILD index 45db1e43dc..4389e9a185 100644 --- a/main/bbsuid/APKBUILD +++ b/main/bbsuid/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bbsuid pkgver=0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Busybox SUID root application wrapper" url="http://git.alpinelinux.org/cgit/bbsuid" license="GPL-2" -depends="uclibc busybox" +depends="busybox" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" build() { diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD index d5f1851f2d..5b990def74 100644 --- a/main/bc/APKBUILD +++ b/main/bc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bc pkgver=1.06 -pkgrel=1 +pkgrel=2 pkgdesc="arbitrary precision numeric processing language (calculator)" url="http://www.gnu.org/software/bc/bc.html" license="GPL" diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD index 49abcee746..3a003cb294 100644 --- a/main/bdftopcf/APKBUILD +++ b/main/bdftopcf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bdftopcf pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org font utility" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/beecrypt/APKBUILD b/main/beecrypt/APKBUILD index d56b0e8221..3b12e35901 100644 --- a/main/beecrypt/APKBUILD +++ b/main/beecrypt/APKBUILD @@ -2,36 +2,41 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=beecrypt pkgver=4.1.2 -pkgrel=3 +pkgrel=5 pkgdesc="general-purpose cryptography library" url="http://sourceforge.net/projects/beecrypt" license="LGPL" depends= -makedepends="uclibc++-dev libtool m4" +makedepends="libtool m4" subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-4.1.2-base64.patch " -build() { - cd "$srcdir/$pkgname-$pkgver" - export CXX=${CXX_UC:-g++-uc} - +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" for i in ../*.patch; do msg "Applying $i..." patch -p1 < $i || return 1 done +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ - --disable-threads \ + --enable-threads \ --enable-shared \ --without-java \ --without-python \ --with-cplusplus=no - make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install } md5sums="820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz diff --git a/main/beep/APKBUILD b/main/beep/APKBUILD index 742998204e..a41389bf2a 100644 --- a/main/beep/APKBUILD +++ b/main/beep/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=beep pkgver=1.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="A terminal bell" url="http://johnath.com/beep" license="GPL-2" -depends="uclibc" +depends="" makedepends="" #install= subpackages="$pkgname-doc" diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index 946af90e8a..93a3047206 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -4,7 +4,7 @@ pkgname=bind pkgver=9.7.0_p1 _ver=${pkgver%_p*} _p=${pkgver#*_p} -pkgrel=0 +pkgrel=2 pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools" url="http://www.isc.org" license="as-is" diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD index 1a2fbf5dfd..a2c952630a 100644 --- a/main/binutils/APKBUILD +++ b/main/binutils/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=binutils pkgver=2.20.51.0.4 +pkgrel=1 pkgdesc="Tools necessary to build programs" url=http://sources.redhat.com/binutils source="http://ftp.kernel.org/pub/linux/devel/binutils/$pkgname-$pkgver.tar.bz2" diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD index f24dd7441a..c355b0cf1a 100644 --- a/main/bison/APKBUILD +++ b/main/bison/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bison pkgver=2.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU general-purpose parser generator" license="GPL" url="http://www.gnu.org/software/bison/bison.html" diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD new file mode 100644 index 0000000000..1c40e470ad --- /dev/null +++ b/main/boost/APKBUILD @@ -0,0 +1,147 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=boost +pkgver=1.43.0 + +_x=${pkgver%%.*} # strip .y.z +_y=${pkgver%.*} # strip .z +_y=${_y#*.} # strip x. +_z=${pkgver##*.} # strip x.y. +_ver=${_x}_${_y}_${_z} + +pkgrel=0 +pkgdesc="Free peer-reviewed portable C++ source libraries" +url="http://www.boost.org/" +license="custom" +depends= +makedepends="python-dev>=2.6 flex bison bzip2-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc +$pkgname-date_time +$pkgname-filesystem +$pkgname-graph +$pkgname-iostreams +$pkgname-math +$pkgname-prg_exec_monitor +$pkgname-program_options +$pkgname-python:py +$pkgname-random +$pkgname-regex +$pkgname-serialization +$pkgname-signals +$pkgname-system +$pkgname-thread +$pkgname-unit_test_framework +$pkgname-wave +$pkgname-wserialization +" +source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$_ver.tar.gz + boost-1.41.0-parameter-needs-python.patch + boost-uclibc-thread.patch + random-Jamfile" + +_builddir="$srcdir"/${pkgname}_${_ver} +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + [ -r "$i" ] || continue + msg "Applying $i" + patch -p1 -i "$i" || return 1 + done + + # add support for /dev/urandom + mkdir -p libs/random/build + cp "$srcdir"/random-Jamfile libs/random/build/Jamfile.2 + sed -i -e 's/#ifdef __linux__/#if 1/' \ + libs/random/src/random_device.cpp \ + || return 1 + + # create user-config.jam + cat > user-config.jam <<__EOF__ + +using gcc : : $CC : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; + +__EOF__ +} + +_options="--user-config=\"$_builddir/user-config.jam\" + --prefix=\"$pkgdir/usr\" + release + debug-symbols=off + threading=single,multi + runtime-link=shared + link=shared,static + cflags=-fno-strict-aliasing + -sPYTHON_ROOT=/usr + -sPYTHON_VERSION=2.6 + -sTOOLS=gcc + --layout=tagged + -q + -j${JOBS:-2} +" + +build() { + msg "Building bjam" + export BOOST_ROOT="$_builddir" + cd "$_builddir"/tools/jam/src + CC= ./build.sh cc || return 1 + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + install -m755 -d "$pkgdir"/usr/bin + install -m755 ${_bindir}/bjam "$pkgdir"/usr/bin/bjam || return 1 + _bjam="$pkgdir"/usr/bin/bjam + + msg "Building bcp" + cd "${_builddir}"/tools/bcp + "${_bjam}" -j${JOBS:-2} || return 1 + install -m755 "$srcdir"/${pkgname}_${_ver}/dist/bin/bcp \ + "$pkgdir"/usr/bin/bcp || return 1 + + msg "Building boost" + cd "$_builddir" + "${_bjam}" $_options +} + +package() { + cd "$_builddir" + export BOOST_ROOT="$_builddir" + _bjam="$pkgdir"/usr/bin/bjam + "${_bjam}" $_options \ + --includedir="$pkgdir"/usr/include \ + --libdir="$pkgdir"/usr/lib \ + install || return 1 + + cd "$srcdir"/${pkgname}_${_ver}/libs/python/pyste/install + python setup.py install --root="$pkgdir" || return 1 + install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname + install -m644 "$srcdir"/${pkgname}_${_ver}/LICENSE_1_0.txt \ + "$pkgdir"/usr/share/licenses/$pkgname/ || return 1 +} + +_mvlib() { + pkgdesc="Boost $1 library" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libboost_$1* "$subpkgdir"/usr/lib/ +} + +date_time() { _mvlib date_time; } +filesystem() { _mvlib filesystem; } +graph() { _mvlib graph; } +iostreams() { _mvlib iostreams; } +math() { _mvlib math; } +prg_exec_monitor() { _mvlib prg_exec_monitor; } +program_options() { _mvlib program_options; } +py() { _mvlib python; } +random() { _mvlib random; } +regex() { _mvlib regex; } +serialization() { _mvlib serialization; } +signals() { _mvlib signals; } +system() { _mvlib system; } +thread() { _mvlib thread; } +unit_test_framework() { _mvlib unit_test_framework; } +wave() { _mvlib wave; } +wserialization() { _mvlib wserialization; } + + +md5sums="734565ca4819bf04bd8e903e116c3fb1 boost_1_43_0.tar.gz +83dbee9d7291a0f322fd2b8936aeace7 boost-1.41.0-parameter-needs-python.patch +7ea3caa231764eca4522ae303939214d boost-uclibc-thread.patch +1d43f6ee1fc426f1ddcb4aafc6b77b9b random-Jamfile" diff --git a/main/boost/boost-1.41.0-parameter-needs-python.patch b/main/boost/boost-1.41.0-parameter-needs-python.patch new file mode 100644 index 0000000000..016995fccc --- /dev/null +++ b/main/boost/boost-1.41.0-parameter-needs-python.patch @@ -0,0 +1,106 @@ +--- a/boost/parameter/aux_/maybe.hpp 2008-03-22 21:45:55.000000000 +0000 ++++ b/boost/parameter/aux_/maybe.hpp.new 2009-10-22 03:55:24.000000000 +0000 +@@ -2,20 +2,41 @@ + // subject to the Boost Software License, Version 1.0. (See accompanying + // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +-#ifndef BOOST_PARAMETER_MAYBE_060211_HPP +-# define BOOST_PARAMETER_MAYBE_060211_HPP ++// ++// 2009.10.21 TDS remove depenency on boost::python::detail::referent_storage ++// ++#ifndef BOOST_PARAMETER_MAYBE_091021_HPP ++# define BOOST_PARAMETER_MAYBE_091021_HPP + + # include <boost/mpl/if.hpp> + # include <boost/mpl/identity.hpp> + # include <boost/type_traits/is_reference.hpp> + # include <boost/type_traits/add_reference.hpp> + # include <boost/optional.hpp> +-# include <boost/python/detail/referent_storage.hpp> ++# include <boost/aligned_storage.hpp> + # include <boost/type_traits/remove_cv.hpp> + # include <boost/type_traits/add_const.hpp> + + namespace boost { namespace parameter { namespace aux { + ++template <class T> struct referent_size; ++ ++template <class T> ++struct referent_size<T&> ++{ ++ BOOST_STATIC_CONSTANT(std::size_t, value = sizeof(T)); ++}; ++ ++// A metafunction returning a POD type which can store U, where T == ++// U&. If T is not a reference type, returns a POD which can store T. ++template <class T> ++struct referent_storage ++{ ++ typedef typename boost::aligned_storage< ++ referent_size<T>::value ++ >::type type; ++}; ++ + struct maybe_base {}; + + template <class T> +@@ -33,8 +54,8 @@ + BOOST_DEDUCED_TYPENAME remove_reference<reference>::type + >::type non_cv_value; + +- explicit maybe(T value) +- : value(value) ++ explicit maybe(T value_) ++ : value(value_) + , constructed(false) + {} + +@@ -48,28 +69,28 @@ + this->destroy(); + } + +- reference construct(reference value) const ++ reference construct(reference value_) const + { +- return value; ++ return value_; + } + + template <class U> +- reference construct2(U const& value) const ++ reference construct2(U const& value_) const + { +- new (m_storage.bytes) non_cv_value(value); ++ new (m_storage.address()) non_cv_value(value_); + constructed = true; +- return *(non_cv_value*)m_storage.bytes; ++ return *(non_cv_value*)m_storage.address(); + } + + template <class U> +- reference construct(U const& value) const ++ reference construct(U const& value_) const + { +- return this->construct2(value); ++ return this->construct2(value_); + } + + void destroy() + { +- ((non_cv_value*)m_storage.bytes)->~non_cv_value(); ++ ((non_cv_value*)m_storage.address())->~non_cv_value(); + } + + typedef reference(maybe<T>::*safe_bool)() const; +@@ -87,7 +108,9 @@ + private: + boost::optional<T> value; + mutable bool constructed; +- mutable typename boost::python::detail::referent_storage< ++ ++ ++ mutable typename referent_storage< + reference + >::type m_storage; + }; diff --git a/main/boost/boost-uclibc-thread.patch b/main/boost/boost-uclibc-thread.patch new file mode 100644 index 0000000000..e9e6b79e10 --- /dev/null +++ b/main/boost/boost-uclibc-thread.patch @@ -0,0 +1,11 @@ +--- ./libs/thread/src/pthread/thread.cpp.orig ++++ ./libs/thread/src/pthread/thread.cpp +@@ -380,7 +380,7 @@ + { + #if defined(PTW32_VERSION) || defined(__hpux) + return pthread_num_processors_np(); +-#elif defined(_GNU_SOURCE) ++#elif defined(_GNU_SOURCE) && !defined(__UCLIBC__) + return get_nprocs(); + #elif defined(__APPLE__) || defined(__FreeBSD__) + int count; diff --git a/main/boost/random-Jamfile b/main/boost/random-Jamfile new file mode 100644 index 0000000000..5cb6f6bcd9 --- /dev/null +++ b/main/boost/random-Jamfile @@ -0,0 +1,15 @@ +# Copyright (c) 2006 Tiziano Mueller +# +# Use, modification and distribution of the file is subject to the +# Boost Software License, Version 1.0. +# (See at http://www.boost.org/LICENSE_1_0.txt) + + +project boost/random + : source-location ../ ; + +SOURCES = random_device ; + +lib boost_random + : $(SOURCES).cpp + : <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ; diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD index d76110b10b..1f2b79dffe 100644 --- a/main/bridge-utils/APKBUILD +++ b/main/bridge-utils/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bridge-utils pkgver=1.4 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" url="http://linux-net.osdl.org/index.php/Bridge" license="GPL-2" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" +depends="" makedepends="autoconf" source="http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$pkgver/bridge-utils-$pkgver.tar.gz" #"http://download.sourceforge.net/bridge/$pkgname-$pkgver.tar.gz" @@ -15,7 +15,7 @@ build() { cd "$srcdir"/$pkgname-$pkgver autoconf # src_compile - configure --prefix=/ \ + ./configure --prefix=/ \ --mandir=/usr/share/man \ --libdir=/usr/lib \ --includedir=/usr/include \ diff --git a/main/build-base/APKBUILD b/main/build-base/APKBUILD index 32c4e93b62..59e1f2ee5b 100644 --- a/main/build-base/APKBUILD +++ b/main/build-base/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=build-base pkgver=0.2 +pkgrel=0 url=http://dev.alpinelinux.org/cgit pkgdesc="Meta package for build base" depends="binutils gcc make patch uclibc-dev g++" diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD index c0d01f1ed5..4b9402af9b 100644 --- a/main/busybox-initscripts/APKBUILD +++ b/main/busybox-initscripts/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox-initscripts pkgver=2.0 -pkgrel=11 +pkgrel=12 pkgdesc="Init scripts for busybox daemons" url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts" license="GPL-2" @@ -55,9 +55,9 @@ b5b23dd06cea120bd8d850b54bca0b59 syslog.initd 22adbf155ffc4595206ded6daad07812 rdate.confd 77fb31a75511247bf4e3430565a276bc syslog.confd 0bb55dde32f5e119111fa4938daaef3d watchdog.confd -c3eb08c577384154fdf748f1db06f8db mdev.conf +c514213ed7e56c64c44be3285d34a297 mdev.conf ad1556961294e4aa2abca6be52138b7c dvbdev 5c8725b4cbdeda23b00f08124a0d20bf ide_links -1acfd58dfd1cf324c90ca3a3be519510 usbdev +c422992ca5bfdfabdbba1f1532bc1358 usbdev 30b0c85956b6701caf55309a17e537f6 usbdisk_link 826d85313ca7a4a0205d63bd58b7d01f xvd_links" diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf index 5a86a9cd6d..ce6aa4e9fe 100644 --- a/main/busybox-initscripts/mdev.conf +++ b/main/busybox-initscripts/mdev.conf @@ -17,7 +17,10 @@ urandom root:root 0444 hwrandom root:root 0660 # console does already exist; therefore ownership has to be changed with command -console root:tty 0600 @chmod 600 $MDEV && mkdir -p vc && ln -sf ../$MDEV vc/0 +#console root:tty 0600 @chmod 600 $MDEV && mkdir -p vc && ln -sf ../$MDEV vc/0 +console root:tty 0600 @mkdir -pm 755 fd && cd fd && for x in 0 1 2 3 ; do ln -sf /proc/self/fd/$x $x; done + + fd0 root:floppy 0660 kmem root:root 0640 mem root:root 0640 diff --git a/main/busybox-initscripts/usbdev b/main/busybox-initscripts/usbdev index b1aff296cd..ea5b915573 100644 --- a/main/busybox-initscripts/usbdev +++ b/main/busybox-initscripts/usbdev @@ -15,13 +15,13 @@ add_zeros () { # bus and device dirs in /sys -local USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/') +USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/') USB_PATH=$(find /sys/devices -type d -name "$USB_PATH") -local USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/') +USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/') # dir names in /dev -local BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/')) -local USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/')) +BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/')) +USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/')) # try to load the proper driver for usb devices diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index bd0f178f64..d379e5a87c 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,19 +1,28 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.16.1 -pkgrel=0 +pkgrel=4 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net license="GPL-2" depends= install="$pkgname.post-install $pkgname.post-upgrade" +subpackages="$pkgname-static" triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 $pkgname-1.11.1-bb.patch flock-bb.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-ash.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-cpio.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dhcpd.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-dnsd.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-hwclock.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-indexcgi.patch + http://busybox.net/downloads/fixes-1.16.1/busybox-1.16.1-sed.patch busyboxconfig" _builddir="$srcdir"/$pkgname-$pkgver +_config="$srcdir"/busyboxconfig prepare() { cd "$_builddir" #patches @@ -28,30 +37,51 @@ prepare() { sed -i -e 's/(ip, _BB_DIR_BIN/(ip, _BB_DIR_SBIN/' \ -e 's/(vi, _BB_DIR_BIN/(vi, _BB_DIR_USR_BIN/' \ include/applets.h || return 1 - - # we set the install prefix with sed since it might differ depending - # on abuild version - sed -e "s:^CONFIG_PREFIX=.*:CONFIG_PREFIX=\"$pkgdir\":" \ - ../busyboxconfig > .config } build() { cd "$_builddir" + msg "Building static busybox" + sed -e "s/.*CONFIG_PIE.*/\# CONFIG_PIE is not set/" \ + -e "s/.*CONFIG_STATIC.*/CONFIG_STATIC=y/" \ + "$_config" > .config + make silentoldconfig || return 1 + make || return 1 + mv busybox busybox.static + + # build dynamic + msg "Building dynamic busybox" + cp "$_config" .config make silentoldconfig || return 1 make || return 1 } package() { cd "$_builddir" - make install DESTDIR="$pkgdir" mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \ - "$pkgdir"/var/cache/misc + "$pkgdir"/var/cache/misc "$pkgdir"/bin "$pkgdir"/sbin chmod 1777 "$pkgdir"/tmp + install -m755 busybox "$pkgdir"/bin/busybox # we need /bin/sh to be able to execute post-install ln -s /bin/busybox "$pkgdir"/bin/sh } +static() { + triggers= + mkdir -p "$subpkgdir"/bin + install -m755 "$_builddir"/busybox.static \ + "$subpkgdir"/bin/busybox.static + +} + md5sums="319486ec65078d07fde26eb620fecde7 busybox-1.16.1.tar.bz2 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch 20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch +b328c15e90c58c44f283838f224c3c97 busybox-1.16.1-ash.patch +301feec832c938c235d370ae09f90713 busybox-1.16.1-cpio.patch +54607ef7a80b6c3aa397788ce9166cc3 busybox-1.16.1-dhcpd.patch +9fd18c9833253119996039429bee1992 busybox-1.16.1-dnsd.patch +b16ad6491dcb4f053f84ae2c4064918d busybox-1.16.1-hwclock.patch +c3bc34309334c456b6f905f0708c914f busybox-1.16.1-indexcgi.patch +8e1ef2dc70aaaa6f1af1d5e0541de103 busybox-1.16.1-sed.patch 4bc85af9dd659cbb83c9a819b3481a47 busyboxconfig" diff --git a/main/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD index 342852313c..f75a073039 100644 --- a/main/bwm-ng/APKBUILD +++ b/main/bwm-ng/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bwm-ng pkgver=0.6 -pkgrel=0 +pkgrel=1 pkgdesc="A small and simple console-based live bandwidth monitor" url="http://www.gropp.org/" license="GPL" diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD index 09721bb760..1081978b5c 100644 --- a/main/bzip2/APKBUILD +++ b/main/bzip2/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bzip2 pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A high-quality data compression program" url="http://sources.redhat.com/bzip2" license="BZIP2" -depends="uclibc" +depends="" install="$pkgname.post-deinstall" source="http://www.bzip.org/$pkgver/$pkgname-$pkgver.tar.gz $install diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD index 817bc3df21..d0af1f04b2 100644 --- a/main/c-ares/APKBUILD +++ b/main/c-ares/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=c-ares pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="An asynchronously DNS/names resolver library" url="http://c-ares.haxx.se/" license="GPL" diff --git a/main/cabextract/APKBUILD b/main/cabextract/APKBUILD index b4788780ee..addf021eb6 100644 --- a/main/cabextract/APKBUILD +++ b/main/cabextract/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=cabextract pkgver=1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Tool for extracting Microsoft cabinet files" url="http://www.cabextract.org.uk/" license="GPL" diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD index efa1a4efca..1157120312 100644 --- a/main/cairo/APKBUILD +++ b/main/cairo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cairo pkgver=1.8.10 -pkgrel=0 +pkgrel=1 pkgdesc="Cairo vector graphics library" url="http://cairographics.org/" license="LGPL MPL" diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD index 2143bdb728..2848bb64d5 100644 --- a/main/ccache/APKBUILD +++ b/main/ccache/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ccache pkgver=2.4 -pkgrel=0 +pkgrel=1 pkgdesc="ccache is a compiler cache" url="http://ccache.samba.org/" license="GPL" subpackages="$pkgname-doc" -depends="uclibc" +depends="" makedepends="" source="http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD index 5891845025..8f346b709c 100644 --- a/main/cciss_vol_status/APKBUILD +++ b/main/cciss_vol_status/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=cciss_vol_status pkgver=1.06 -pkgrel=0 +pkgrel=1 pkgdesc="Drivers for the HP (previously Compaq) Smart Array controllers which provide hardware RAID capability." url="http://cciss.sourceforge.net/" license="GPL" diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD index ce5f9830e1..1d17896b34 100644 --- a/main/cdrkit/APKBUILD +++ b/main/cdrkit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cdrkit pkgver=1.1.10 -pkgrel=0 +pkgrel=1 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" url="http://cdrkit.org/" license="GPL2" diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD index c33aae4a09..6b30ed7846 100644 --- a/main/cgit/APKBUILD +++ b/main/cgit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cgit pkgver=0.8.3.1 -pkgrel=0 +pkgrel=2 _gitver=1.6.4.3 pkgdesc="a fast webinterface for git" url="http://hjemli.net/git/cgit" @@ -14,14 +14,17 @@ source=" " _makeopts="NO_ICONV=YesPlease - NO_NSEC=YesPlease NO_TCLTK=YesPlease NO_SVN_TESTS=YesPlease" -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" rm -rf git ln -s ../git-$_gitver git +} + +build() { + cd "$srcdir/$pkgname-$pkgver" make $_makeopts } diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD index 54d94e51d4..b83a0e853d 100644 --- a/main/chrony/APKBUILD +++ b/main/chrony/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=chrony pkgver=1.23 -pkgrel=5 +pkgrel=6 pkgdesc="NTP client and server programs" url="http://chrony.sunsite.dk/" license="GPL-2" diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD index 4cd06d3fcb..942c9cb8ea 100644 --- a/main/cksfv/APKBUILD +++ b/main/cksfv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=cksfv pkgver=1.3.14 -pkgrel=0 +pkgrel=1 pkgdesc="Simple File Verification" url="http://zakalwe.fi/~shd/foss/cksfv" license="GPL" diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD index 0b12df40dc..b59af1b953 100644 --- a/main/clamav/APKBUILD +++ b/main/clamav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=clamav -pkgver=0.95.3 +pkgver=0.96 pkgrel=0 pkgusers=clamav pkggroups=clamav @@ -21,48 +21,61 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz clamav.logrotate " -build() { - cd "$srcdir/$pkgname-$pkgver" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" patch -p0 -i "$srcdir/clamav-0.95.1-nls.patch" || return 1 +} + +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc/clamav \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --without-iconv + --without-iconv \ + --disable-llvm + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install - # Change /etc/clamd.conf to be usable out of the box - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \ - -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ - -e "s:^\#\(LogTime\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "$pkgdir"/etc/clamav/clamd.conf + # Change /etc/clamd.conf to be usable out of the box + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \ + -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \ + -e "s:.*\(User\) .*:\1 clamav:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ + -e "s:^\#\(LogTime\).*:\1 yes:" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + "$pkgdir"/etc/clamav/clamd.conf - # Do the same for /etc/freshclam.conf - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \ - -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ - -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "$pkgdir"/etc/clamav/freshclam.conf + # Do the same for /etc/freshclam.conf + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \ + -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ + -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ + -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \ + -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + "$pkgdir"/etc/clamav/freshclam.conf - install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd - install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd + install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd + install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd install -m755 -D "$srcdir"/freshclam.initd "$pkgdir"/etc/init.d/freshclam - install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam - install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav - mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav + install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam + install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav + mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav } -md5sums="eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz +md5sums="28ac7bec4cc03627a8e2d6e8647ee661 clamav-0.96.tar.gz d64432c463850663c5041c3097f3e903 clamd.initd 567bc32b657dd7031b9b7beaa946203a clamd.confd f4d1f415322905128dc27135566ad136 freshclam.initd diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD index 1bad20a087..3b9906e7fc 100644 --- a/main/clamsmtp/APKBUILD +++ b/main/clamsmtp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=clamsmtp pkgver=1.10 -pkgrel=6 +pkgrel=7 pkgdesc="An SMTP Virus Filter" url="http://memberwebs.com/stef/software/clamsmtp/" license="as-is" diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD index 74644f3c8d..a98dac5665 100644 --- a/main/claws-mail/APKBUILD +++ b/main/claws-mail/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=claws-mail -pkgver=3.7.5 -pkgrel=0 +pkgver=3.7.6 +pkgrel=1 pkgdesc="A GTK+ based e-mail client." url="http://www.claws-mail.org" license="GPL3" @@ -46,5 +46,5 @@ package() { install -D -m755 ${i} "$pkgdir"/usr/lib/claws-mail/tools/${i} done } -md5sums="05a97ef3bf41ae5e6e2a3ddeb600ab44 claws-mail-3.7.5.tar.bz2 +md5sums="09c150cf13c04201c92089fc285cecd9 claws-mail-3.7.6.tar.bz2 f3416743b5d8ff97b5a3cc2f7efc2dc1 libc-version.patch" diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index bc6331b58e..bbd1b5885d 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake pkgver=2.8.1 -pkgrel=0 +pkgrel=1 pkgdesc="CMake is a cross-platform open-source make system" url="http://www.cmake.org" license="CMake" diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD index ef5d5b07b9..b58927c732 100644 --- a/main/confuse/APKBUILD +++ b/main/confuse/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=confuse -pkgver=2.6 +pkgver=2.7 pkgrel=0 pkgdesc="C-library for parsing configuration files" url="http://www.nongnu.org/confuse" @@ -8,7 +8,7 @@ license="LGPL" depends= makedepends="flex bison pkgconfig" subpackages="$pkgname-dev" -source="http://bzero.se/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://savannah.nongnu.org/download/confuse/confuse-$pkgver.tar.gz" build() { cd "$srcdir"/$pkgname-$pkgver @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc } -md5sums="0e883d66f0f58fc33585b430c652aa30 confuse-2.6.tar.gz" +md5sums="45932fdeeccbb9ef4228f1c1a25e9c8f confuse-2.7.tar.gz" diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD index 5ed2b0709e..343eb8f1aa 100644 --- a/main/conntrack-tools/APKBUILD +++ b/main/conntrack-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conntrack-tools pkgver=0.9.13 -pkgrel=1 +pkgrel=2 pkgdesc="Connection tracking userspace tools" url="http://conntrack-tools.netfilter.org" license="GPL-2" diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD index 46c9cc4a1c..7ffc066670 100644 --- a/main/coreutils/APKBUILD +++ b/main/coreutils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=coreutils -pkgver=8.4 -pkgrel=1 +pkgver=8.5 +pkgrel=0 pkgdesc="The basic file, shell and text manipulation utilities" url="http://www.gnu.org/software/coreutils/" license="GPL" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz" +md5sums="c1ffe586d001e87d66cd80c4536ee823 coreutils-8.5.tar.gz" diff --git a/main/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD index 98d7f94cf3..e70d415e47 100644 --- a/main/cpufreqd/APKBUILD +++ b/main/cpufreqd/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cpufreqd -pkgver=2.3.4 -pkgrel=1 +pkgver=2.4.2 +pkgrel=0 pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)" url="http://sourceforge.net/projects/cpufreqd" license="GPL2" subpackages="$pkgname-dev $pkgname-doc" -depends="cpufrequtils sysfsutils uclibc" +depends= makedepends="cpufrequtils-dev sysfsutils-dev g++" install= source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 @@ -18,9 +18,13 @@ build () ./configure --prefix=/usr \ --sysconfdir=/etc make LIBS=-lpthread || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm 755 ../cpufreqd.initd "$pkgdir"/etc/init.d/cpufreqd \ || return 1 } -md5sums="f4193f688305566a8422dd3989667668 cpufreqd-2.3.4.tar.bz2 +md5sums="2ca80a77849c9a69b81e27c1843c97f5 cpufreqd-2.4.2.tar.bz2 4c3298abc888ac4f688249ee542ce784 cpufreqd.initd" diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD index 377fe0217e..af8cff9dc0 100644 --- a/main/cpufrequtils/APKBUILD +++ b/main/cpufrequtils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cpufrequtils pkgver=007 -pkgrel=0 +pkgrel=1 pkgdesc="Userspace tools for the kernel cpufreq subsystem" url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" license="GPL" diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD index e03c6a7700..f7fda7960c 100644 --- a/main/cracklib/APKBUILD +++ b/main/cracklib/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=cracklib pkgver=2.8.13 -pkgrel=0 +pkgrel=1 pkgdesc="A library used to enforce strong passwords" url="http://sourceforge.net/projects/cracklib" license="GPL" -depends="uclibc" +depends="" makedepends="" install= subpackages="$pkgname-dev" diff --git a/main/cramfs/APKBUILD b/main/cramfs/APKBUILD index e40e57c2cc..79c53cc368 100644 --- a/main/cramfs/APKBUILD +++ b/main/cramfs/APKBUILD @@ -1,19 +1,22 @@ # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=cramfs pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Linux filesystem designed to be simple, small, and to compress things well" arch="" url="http://sourceforge.net/projects/cramfs/" license='GPL' -depends="uclibc zlib" +depends= makedepends="zlib-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { cd "$srcdir/$pkgname-$pkgver" - make CFLAGS="$CFLAGS" || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" install -d "$pkgdir"/sbin install mkcramfs cramfsck "$pkgdir"/sbin } diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD index b986f9c9ca..7be38174ad 100644 --- a/main/ctags/APKBUILD +++ b/main/ctags/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=ctags pkgver=5.8 -pkgrel=0 +pkgrel=1 pkgdesc="Generator of tags for all types of C/C++ languages" url="http://ctags.sourceforge.net/" license="GPL" -depends="uclibc" +depends="" makedepends="" install= subpackages="" diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD index b87c456f0f..d63b0c147c 100644 --- a/main/cups/APKBUILD +++ b/main/cups/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cups pkgver=1.4.3 -pkgrel=0 +pkgrel=3 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" license="GPL" subpackages="$pkgname-dev $pkgname-doc libcups $pkgname-client" -makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8" +makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8 zlib-dev" depends="cups-client poppler-utils" install= pkggroups="lp lpadmin" @@ -16,6 +16,8 @@ source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz cupsd.initd " +depends_dev="openssl-dev zlib-dev" + build () { cd "$srcdir"/$pkgname-$pkgver diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD index a7bcbd03ba..f7d6c504f1 100644 --- a/main/curl/APKBUILD +++ b/main/curl/APKBUILD @@ -1,18 +1,19 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=curl -pkgver=7.19.7 -pkgrel=0 +pkgver=7.20.1 +pkgrel=1 pkgdesc="An URL retrival utility and library" url="http://curl.haxx.se" license="MIT" depends= makedepends="zlib-dev openssl-dev" -source="http://curl.osmirror.nl/download/curl-$pkgver.tar.bz2" - +source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2" subpackages="$pkgname-doc $pkgname-dev" +_builddir="$srcdir/$pkgname-$pkgver" + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr \ --mandir=/usr/share/man \ --without-libidn \ @@ -21,8 +22,8 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install } -md5sums="79a8fbb2eed5464b97bdf94bee109380 curl-7.19.7.tar.bz2" +md5sums="244b16b2a38c70e47130c8494b7371b9 curl-7.20.1.tar.bz2" diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD index be27d880c7..0337b29a59 100644 --- a/main/cutter/APKBUILD +++ b/main/cutter/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=cutter pkgver=1.03 -pkgrel=1 +pkgrel=2 pkgdesc="A program that allows firewall administrators to abort TCP/IP connections." url="http://www.lowth.com/cutter" license="GPL" -depends="uclibc" +depends="" makedepends="" install= subpackages="" diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD index bcfcea6f24..21c4d58134 100644 --- a/main/cvs/APKBUILD +++ b/main/cvs/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: pkgname=cvs pkgver=1.11.23 -pkgrel=0 +pkgrel=1 pkgdesc="Concurrent Versions System" url="http://www.nongnu.org/cvs/" license="GPL" -depends="uclibc" +depends="" makedepends="" install= subpackages="$pkgname-doc" diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD index 6346d9fae2..98c7543990 100644 --- a/main/cyrus-sasl/APKBUILD +++ b/main/cyrus-sasl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cyrus-sasl pkgver=2.1.23 -pkgrel=2 +pkgrel=4 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)" url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" license="custom" diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD index 9a1538fab6..dbb82aab67 100644 --- a/main/dahdi-tools/APKBUILD +++ b/main/dahdi-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-tools pkgver=2.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="Digium Asterisk Hardware Device Interface management utilities" url="http://www.asterisk.org" license="GPL" diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD index 607cd53383..82aa4aa99f 100644 --- a/main/dansguardian/APKBUILD +++ b/main/dansguardian/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dansguardian pkgver=2.10.1.1 -pkgrel=5 +pkgrel=6 pkgdesc="Web content filter" url="http://dansguardian.org" license="GPL" diff --git a/main/db/APKBUILD b/main/db/APKBUILD index 926b9713d7..d299132bbe 100644 --- a/main/db/APKBUILD +++ b/main/db/APKBUILD @@ -2,7 +2,7 @@ pkgname=db pkgver=4.8.26 _ver=${pkgver} -pkgrel=0 +pkgrel=1 pkgdesc="The Berkeley DB embedded database system 4.8" url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" license="custom" diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD index 46c85f2019..799560fbab 100644 --- a/main/dbus-glib/APKBUILD +++ b/main/dbus-glib/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dbus-glib -pkgver=0.82 +pkgver=0.86 pkgrel=0 pkgdesc="GLib bindings for DBUS" url="http://www.freedesktop.org/wiki/Software/DBusBindings" license="GPL" subpackages="$pkgname-dev $pkgname-doc" -depends="dbus glib libiconv expat gettext" -makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev g++ expat-dev" +depends= +makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev expat-dev" source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" depends_dev="glib-dev dbus-dev" @@ -25,4 +25,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="aa2a4517de0e9144be3bce2cf8cdd924 dbus-glib-0.82.tar.gz" +md5sums="cd0ab148fb0c786fc88be49d19971f50 dbus-glib-0.86.tar.gz" diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD index d8471073b9..a1f7985072 100644 --- a/main/dbus/APKBUILD +++ b/main/dbus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dbus pkgver=1.2.24 -pkgrel=1 +pkgrel=3 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" pkggroups="messagebus" @@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="expat-dev libx11-dev pkgconfig util-linux-ng-dev" depends_dev="util-linux-ng-dev" -install="$pkgname.pre-install" +install="$pkgname.pre-install $pkgname.post-install" source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd " diff --git a/main/dbus/dbus.post-install b/main/dbus/dbus.post-install new file mode 100644 index 0000000000..305297a482 --- /dev/null +++ b/main/dbus/dbus.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +exec dbus-uuidgen --ensure diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD index 9bd4502ce2..db61256bad 100644 --- a/main/debootstrap/APKBUILD +++ b/main/debootstrap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=debootstrap pkgver=1.0.22 -pkgrel=0 +pkgrel=1 pkgdesc="Debian/Ubuntu bootstrap scripts" url="http://packages.qa.debian.org/d/debootstrap.html" license="GPL-2" diff --git a/main/desktop-file-utils/APKBUILD b/main/desktop-file-utils/APKBUILD index dc952e8692..bdfd391773 100644 --- a/main/desktop-file-utils/APKBUILD +++ b/main/desktop-file-utils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=desktop-file-utils pkgver=0.16 -pkgrel=0 +pkgrel=1 pkgdesc="Command line utilities for working with desktop entries" url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" license="GPL" diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD index 4ecd8dff2a..1c334c80ef 100644 --- a/main/dhcp/APKBUILD +++ b/main/dhcp/APKBUILD @@ -2,7 +2,7 @@ pkgname=dhcp pkgver=4.1.0_p1 _realver=4.1.0p1 -pkgrel=9 +pkgrel=10 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)" url="https://www.isc.org/" license="GPL" diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD index ed4415aff8..b7f2ffa2c2 100644 --- a/main/dhcpcd-dbus/APKBUILD +++ b/main/dhcpcd-dbus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd-dbus pkgver=0.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="DBUS binding to dhcpcd" url="http://roy.marples.name/projects/dhcpcd-dbus" license="BSD" diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD index 2732f1c73a..eb6d6ebd0d 100644 --- a/main/dhcpcd-ui/APKBUILD +++ b/main/dhcpcd-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd-ui pkgver=0.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd" url="http://roy.marples.name/projects/dhcpcd-dbus" license="BSD-2" diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index cfc7a77c8e..17f3bd0d45 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd pkgver=5.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client" url="http://roy.marples.name/projects/dhcpcd/" license="BSD-2" diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD index 99619e31cf..5c6703dc92 100644 --- a/main/dialog/APKBUILD +++ b/main/dialog/APKBUILD @@ -3,11 +3,11 @@ pkgname=dialog pkgver=1.1.20080819 _ver=${pkgver%.*}-${pkgver##*.} -pkgrel=0 +pkgrel=1 pkgdesc="A script-interpreter which provides a set of curses" url="http://invisible-island.net/dialog/dialog.html" license="GPL" -depends="uclibc ncurses" +depends= makedepends="ncurses-dev" install= subpackages="$pkgname-doc" @@ -15,12 +15,15 @@ source="ftp://invisible-island.net/dialog/$pkgname.tar.gz" build() { cd "$srcdir/$pkgname-$_ver" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$_ver" make DESTDIR="$pkgdir" install } diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD index 004d0e91fb..66f74eff96 100644 --- a/main/diffutils/APKBUILD +++ b/main/diffutils/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=diffutils pkgver=2.9 -pkgrel=0 +pkgrel=1 pkgdesc="Show differences among files" subpackages="$pkgname-doc" url="http://www.gnu.org/software/diffutils/" license="GPL2" -depends="uclibc" +depends="" makedepends="" install="$pkgname.post-deinstall" source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz diff --git a/main/dircproxy/APKBUILD b/main/dircproxy/APKBUILD index becb8133ae..88ae453fa1 100644 --- a/main/dircproxy/APKBUILD +++ b/main/dircproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dircproxy pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="IRC proxy server designed for people who use IRC from lots of different workstations or clients" url="http://code.google.com/p/dircproxy/" license="GPL" diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD index 27803991d9..c24efc91f1 100644 --- a/main/distcc/APKBUILD +++ b/main/distcc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=distcc pkgver=3.1 -pkgrel=2 +pkgrel=4 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.org" license="GPL-2" @@ -11,7 +11,7 @@ source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2 distcc-3.1-clone.patch distcc-hardened.patch distccd.initd distccd.confd" -subpackages="$pkgname-doc $pkgname-python" +subpackages="$pkgname-doc $pkgname-pump" build () { @@ -39,9 +39,10 @@ build () ln -sf /usr/bin/$pkgname "$d"/cpp } -python() { - pkgdesc="Python bindings to distcc" - mkdir -p "$subpkgdir"/usr/lib +pump() { + pkgdesc="pump mode for distcc a distributed compiler client and server" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/pump "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD index a9895c23a1..c52201a906 100644 --- a/main/djbdns/APKBUILD +++ b/main/djbdns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=djbdns pkgver=1.05 -pkgrel=33 +pkgrel=36 pkgdesc="Excellent high-performance DNS services" url="http://cr.yp.to/djbdns.html" license="public-domain" @@ -50,7 +50,7 @@ common() { replaces="djbdns" mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/dnsq "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/dnsqr "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin } @@ -101,4 +101,4 @@ fe48165a920cf843ceb9a4ee50bf74c0 tinydns.initd e09c3a6ba6917e16f4736ab5c070dbe9 dnscache.pre-install e5cada3b032da84c4a0e41ef8b3108cb dnscache.initd 2b3d02e88f70603c760bf368ab3ed636 dnscache.confd -6253f44f042fc5aa31fd182780d9853c dnscache.monthly" +805b6989f945d727788f1908fe3fce81 dnscache.monthly" diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly index 0bd5a85397..4e53fd6fde 100755 --- a/main/djbdns/dnscache.monthly +++ b/main/djbdns/dnscache.monthly @@ -1,6 +1,6 @@ #!/bin/sh -if [ -f ./etc/conf.d/dnscache ]; then +if [ -f /etc/conf.d/dnscache ]; then . /etc/conf.d/dnscache fi @@ -42,7 +42,7 @@ for ZONEFILE in $ZONES; do done if [ "$NEEDRESTART" ] && /etc/init.d/dnscache --quiet status; then - /etc/init.d/dnscache restart + /etc/init.d/dnscache --quiet restart fi exit 0 diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index feddb67f52..a570033801 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dnsmasq pkgver=2.52 -pkgrel=0 +pkgrel=1 pkgdesc="Small forwarding DNS server" url="http://www.thekelleys.org.uk/dnsmasq/" license="GPL-2" diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD index 07648fe9a7..fc11de09f5 100644 --- a/main/dosfstools/APKBUILD +++ b/main/dosfstools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dosfstools pkgver=3.0.9 -pkgrel=0 +pkgrel=1 pkgdesc="DOS filesystem utilities" url="http://www.daniel-baumann.ch/software/dosfstools/" license="GPL-2" diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 449012806b..6dd77003a0 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=1.2.11 -pkgrel=1 +pkgrel=3 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" license="LGPL-2.1" diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD index 5710f9c5ad..5672b96e4b 100644 --- a/main/dpkg/APKBUILD +++ b/main/dpkg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dpkg pkgver=1.15.5.6 -pkgrel=0 +pkgrel=1 pkgdesc="The Debian Package Manager" url="http://packages.debian.org/dpkg" license="GPL" diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD index 53bbdc4e29..65c698eff1 100644 --- a/main/dropbear/APKBUILD +++ b/main/dropbear/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dropbear pkgver=0.52 -pkgrel=2 +pkgrel=3 pkgdesc="small SSH 2 client/server designed for small memory environments" url="http://matt.ucc.asn.au/dropbear/dropbear.html" license='MIT' diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD index 120ef4eee7..46aaf7358b 100644 --- a/main/dtach/APKBUILD +++ b/main/dtach/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=dtach pkgver=0.8 -pkgrel=0 +pkgrel=1 pkgdesc="A program that emulates the detach feature of screen" url="http://dtach.sourceforge.net" license='GPL' -depends="uclibc" +depends="" makedepends="" source="http://surfnet.dl.sourceforge.net/sourceforge/dtach/dtach-0.8.tar.gz" subpackages="$pkgname-doc" diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD index e0360aacf3..bfaaa7b408 100644 --- a/main/e2fsprogs/APKBUILD +++ b/main/e2fsprogs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs -pkgver=1.41.11 +pkgver=1.41.12 pkgrel=0 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" @@ -46,4 +46,4 @@ libcom_err() { mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/ } -md5sums="fb507a40c2706bc38306f150d069e345 e2fsprogs-1.41.11.tar.gz" +md5sums="1b24a21fc0c2381ef420961cbfec733f e2fsprogs-1.41.12.tar.gz" diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD index 59c21f2e07..2bf311da91 100644 --- a/main/eggdrop/APKBUILD +++ b/main/eggdrop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> pkgname=eggdrop pkgver=1.6.19 -pkgrel=1 +pkgrel=2 pkgdesc="World's most popular Open Source IRC bot" url="http://www.eggheads.org/" license='GPL-2' diff --git a/main/email/APKBUILD b/main/email/APKBUILD index a1301fe044..8c81437ca7 100644 --- a/main/email/APKBUILD +++ b/main/email/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=email pkgver=3.1.2 -pkgrel=0 +pkgrel=2 pkgdesc="A command line SMTP client that's simple" url="http://www.cleancode.org/projects/email" license="GPL" -depends="uclibc openssl" +depends="openssl" makedepends="openssl-dev" source="http://www.cleancode.org/downloads/email/email-3.1.2.tar.bz2" diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD index 8133127b47..a2698dac4b 100644 --- a/main/enchant/APKBUILD +++ b/main/enchant/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=enchant -pkgver=1.5.0 -pkgrel=1 +pkgver=1.6.0 +pkgrel=0 pkgdesc="A wrapper library for generic spell checking" url="http://www.abisource.com/enchant/" license="LGPL" @@ -11,11 +11,14 @@ depends_dev="glib-dev" makedepends="aspell-dev dbus-glib-dev hunspell-dev libiconv-dev gettext-dev" source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr --disable-static || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="7dfaed14e142b4a0004b770c9568ed02 enchant-1.5.0.tar.gz" +md5sums="de11011aff801dc61042828041fb59c7 enchant-1.6.0.tar.gz" diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD index fdd6e41866..814ba52139 100644 --- a/main/epdfview/APKBUILD +++ b/main/epdfview/APKBUILD @@ -1,27 +1,35 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=epdfview pkgver=0.1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A free lightweight PDF document viewer." url="http://www.emma-soft.com/projects/epdfview/" license="GPL" #depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1 depends="desktop-file-utils hicolor-icon-theme" -makedepends="poppler-gtk-dev" +makedepends="poppler-gtk-dev cups-dev" source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2 $pkgname.desktop.patch fix-scrolling.patch" -build () -{ - cd ""$srcdir"/$pkgname-$pkgver" +_builddir="$srcdir"/$pkgname-$pkgver +package() { + cd "$_builddir" patch -Np0 -i ../epdfview.desktop.patch || return 1 patch -Np0 -i ../fix-scrolling.patch || return 1 +} + +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ || return 1 make || return 1 +} + +package() { + cd "$_builddir" make -j1 DESTDIR="$pkgdir" install || return 1 for i in 24 32 48; do install -d "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps \ diff --git a/main/epris/APKBUILD b/main/epris/APKBUILD index eb1aaf0b88..a313cf61e8 100644 --- a/main/epris/APKBUILD +++ b/main/epris/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=epris pkgver=0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Small audio player using GStreamer and DBus" url="http://code.google.com/p/epris/" license="LGPL" diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD index 2d55080fe1..c8a114d1c0 100644 --- a/main/espeak/APKBUILD +++ b/main/espeak/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=espeak pkgver=1.43.03 -pkgrel=0 +pkgrel=1 pkgdesc="Speech synthesizer for English and other languages" url="http://espeak.sourceforge.net/" license="GPL-3" diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD index 50c92d40ec..4a5cd1bc15 100644 --- a/main/ethtool/APKBUILD +++ b/main/ethtool/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ethtool pkgver=6 -pkgrel=0 +pkgrel=1 pkgdesc="gkernel ethtool" url="http://sourceforge.net/projects/gkernel/" license="GPL" -depends="uclibc" +depends="" makedepends="" source="http://easynews.dl.sf.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD index 62277d23c9..427aafd5f7 100644 --- a/main/exo/APKBUILD +++ b/main/exo/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> # TODO: hal pkgname=exo -pkgver=0.3.106 -pkgrel=1 +pkgver=0.3.107 +pkgrel=0 pkgdesc="Extensions to Xfce by os-cillation" url="http://www.os-cillation.com/article.php?sid=40" license="GPL-2 LGPL-2" @@ -31,4 +31,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="927905f89252fa397e50d7a4fbf3c9a7 exo-0.3.106.tar.bz2" +md5sums="3a92cca0c99ee940db4410891c9e8498 exo-0.3.107.tar.bz2" diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD index e49d990744..3fb6c6212c 100644 --- a/main/expat/APKBUILD +++ b/main/expat/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=expat pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An XML Parser library written in C" url="http://www.libexpat.org/" license='AS IS' diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD index 9da9730560..2d3d4f266c 100644 --- a/main/ez-ipupdate/APKBUILD +++ b/main/ez-ipupdate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=ez-ipupdate pkgver=3.0.10 -pkgrel=0 +pkgrel=1 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)" url="http://ez-ipupdate.com/" license="GPL" diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD index 3e523a4d51..85a7307942 100644 --- a/main/faac/APKBUILD +++ b/main/faac/APKBUILD @@ -1,22 +1,24 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=faac pkgver=1.28 -pkgrel=0 +pkgrel=2 pkgdesc="FAAC is an AAC audio encoder." url="http://www.audiocoding.com/" license="GPL custom" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="autoconf automake libtool uclibc++-dev" +makedepends="autoconf automake libtool" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver - export CXX="${UC_CXX:-g++-uc}" ./bootstrap ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install install -D -m644 "$srcdir"/$pkgname-$pkgver/libfaac/kiss_fft/COPYING \ "$pkgdir"/usr/share/licenses/faac/COPYING.kiss_fft diff --git a/main/faad2/APKBUILD b/main/faad2/APKBUILD index e1453df902..111461655f 100644 --- a/main/faad2/APKBUILD +++ b/main/faad2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=faad2 pkgver=2.7 -pkgrel=0 +pkgrel=1 pkgdesc="ISO AAC audio decoder" url="http://www.audiocoding.com/" license="custom:GPL" diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD index 4836aed6a9..6c84461691 100644 --- a/main/fakeroot/APKBUILD +++ b/main/fakeroot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fakeroot pkgver=1.14.4 -pkgrel=0 +pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" license='GPL' url="http://packages.debian.org/fakeroot" diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD index fc208006cb..d2a8bb0344 100644 --- a/main/fcgi/APKBUILD +++ b/main/fcgi/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=fcgi pkgver=2.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="FAST CGI(fcgi) is a language independent, high performant extension to CGI" url="http://www.fastcgi.com" license="GPL" -depends="uclibc" +depends="" makedepends="" subpackages="$pkgname-dev" source="http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD index aeefeb3d69..af55607849 100644 --- a/main/feh/APKBUILD +++ b/main/feh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=feh -pkgver=1.4.2 +pkgver=1.5 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://www.linuxbrit.co.uk/feh/" @@ -23,4 +23,4 @@ package() { make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="19906a6e319e99e0d98856f64324fed8 feh-1.4.2.tar.bz2" +md5sums="aee156f0a82582108c5a56fbe85319ae feh-1.5.tar.bz2" diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD index 779ab8b916..b86bd2a032 100644 --- a/main/fetchmail/APKBUILD +++ b/main/fetchmail/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fetchmail -pkgver=6.3.16 -pkgrel=0 +pkgver=6.3.17 +pkgrel=1 pkgdesc="A remote-mail retrieval and forwarding utility" url="http://fetchmail.berlios.de/" license="GPL" @@ -41,5 +41,5 @@ fetchmailconf() { mv usr/lib "$subpkgdir"/usr/ } -md5sums="1a40acb371376c7d54fe468c99dfc216 fetchmail-6.3.16.tar.bz2 +md5sums="7b1d449ecddb6164e22c32854adc4a75 fetchmail-6.3.17.tar.bz2 b27fe01a7c25534d62d175c8ba22fc48 fetchmail.initd" diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index eb1e167db9..840d01f6f2 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -2,7 +2,7 @@ pkgname=ffmpeg _svnrev=30526 pkgver=0.5_svn$_svnrev -pkgrel=1 +pkgrel=3 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.mplayerhq.hu/" license="GPL" diff --git a/main/file/APKBUILD b/main/file/APKBUILD index 06bde75b1a..0602565b6c 100644 --- a/main/file/APKBUILD +++ b/main/file/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=file pkgver=5.04 -pkgrel=0 +pkgrel=1 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" license="custom" diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD index 3fbb0bac28..31146e8ed2 100644 --- a/main/findutils/APKBUILD +++ b/main/findutils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=findutils pkgver=4.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="GNU utilities for finding files" url="http://www.gnu.org/software/findutils/" license="GPL" diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD index a5626e1c44..03806b59df 100644 --- a/main/flac/APKBUILD +++ b/main/flac/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=flac pkgver=1.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Free Lossless Audio Codec" url="http://flac.sourceforge.net/" license="custom:Xiph LGPL GPL FDL" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc libogg" -makedepends="libogg-dev" +depends= +makedepends="libogg-dev !libiconv" source="http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz " @@ -23,6 +23,10 @@ build () { --disable-cpplibs \ --with-pic || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver || return 1 make DESTDIR="$pkgdir" install || return 1 install -Dm0644 COPYING.Xiph \ "$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD index d44643d776..830191adec 100644 --- a/main/flex/APKBUILD +++ b/main/flex/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncop@alpinelinux.org> pkgname=flex pkgver=2.5.35 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for generating text-scanning programs" url="http://flex.sourceforge.net" license=custom diff --git a/main/fluxbox/APKBUILD b/main/fluxbox/APKBUILD index 4229d1bba8..dce038f728 100644 --- a/main/fluxbox/APKBUILD +++ b/main/fluxbox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fluxbox pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly-configurable window manager" url="http://www.fluxbox.org" license="MIT" diff --git a/main/font-util/APKBUILD b/main/font-util/APKBUILD index d7bbb361d4..fef19d7907 100644 --- a/main/font-util/APKBUILD +++ b/main/font-util/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=font-util pkgver=1.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="X.org font utilities" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD index 3ae0ffd41f..f45956b926 100644 --- a/main/fontconfig/APKBUILD +++ b/main/fontconfig/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fontconfig pkgver=2.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="The Fontconfig package is a library for configuring and customizing font access." url="http://fontconfig.org" license="GPL" diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD index 11b4f1819a..9dea936990 100644 --- a/main/fping/APKBUILD +++ b/main/fping/APKBUILD @@ -1,11 +1,11 @@ pkgname=fping pkgver=2.4_beta2 _myver=2.4b2_to -pkgrel=1 +pkgrel=2 pkgdesc="A utility to ping multiple hosts at once" url="http://www.fping.com/" license="fping" -depends="uclibc" +depends="" subpackages="$pkgname-doc" # what happened to upstream download? use gentoo distfiles meanwhile diff --git a/main/fprobe/APKBUILD b/main/fprobe/APKBUILD index 824129afe5..f7311e98e3 100644 --- a/main/fprobe/APKBUILD +++ b/main/fprobe/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=fprobe pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="libpcap-based tool that collect network traffic" url="http://fprobe.sourceforge.net/" license="GPL" diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD new file mode 100644 index 0000000000..860ec0ffe7 --- /dev/null +++ b/main/freeswitch/APKBUILD @@ -0,0 +1,61 @@ +# Contributor: Michael Mason <ms13sp@gmail.com> +pkgname=freeswitch +pkgver=1.0.6 +pkgrel=6 +pkgdesc="A communications platform written in C from the ground up" +url="http://www.freeswitch.org" +license="GPL" +depends="" +makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev + autoconf automake libtool" +install="$pkgname.pre-install $pkgname.post-install" +subpackages="$pkgname-dev" +source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz + modules.conf + freeswitch.confd + freeswitch.initd + freeswitch.post-install + freeswitch.pre-install + " + +build() { + cd "$srcdir/$pkgname-$pkgver" + cp -f "$srcdir/modules.conf" modules.conf || return 1 + + # i think our max cmd len is 32768 + # by specifying it here we save our selves from some CPU cycles + export lt_cv_sys_max_cmd_len=8192 + + ./configure --prefix=/usr \ + --sysconfdir=/etc/freeswitch \ + --with-modinstdir=/usr/lib/freeswitch \ + --with-rundir=/var/run/freeswitch \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + + make all || return 1 +} +package(){ + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir" install + # we need to do some moving/cleanup to allow some... kind of FHS + mkdir -p "$pkgdir"/var/run/freeswitch + mkdir -p "$pkgdir"/var/lib/freeswitch + mkdir -p "$pkgdir"/var/log + mkdir -p "$pkgdir"/usr/share/freeswitch + mv "$pkgdir"/usr/db "$pkgdir"/var/lib/freeswitch/ + mv "$pkgdir"/usr/grammar "$pkgdir"/var/lib/freeswitch/ + mv "$pkgdir"/usr/htdocs "$pkgdir"/usr/share/freeswitch/ + mv "$pkgdir"/usr/recordings "$pkgdir"/var/lib/freeswitch/ + mv "$pkgdir"/usr/scripts "$pkgdir"/usr/share/freeswitch/ + mv "$pkgdir"/usr/log "$pkgdir"/var/log/freeswitch + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="388effee587887a81fe7f411b7350590 freeswitch-1.0.6.tar.gz +c05f2356be159e99b3845f5260a33599 modules.conf +c608cca8ad773acebf201f581438c7e7 freeswitch.confd +a15f739b6f4f2c1685ab9f8831d30ca6 freeswitch.initd +107c52398ff88275006b8223ee0b4907 freeswitch.post-install +25945ad43b7dd988f37bf6f2603e22be freeswitch.pre-install" diff --git a/main/freeswitch/freeswitch.confd b/main/freeswitch/freeswitch.confd new file mode 100644 index 0000000000..378e4b41f4 --- /dev/null +++ b/main/freeswitch/freeswitch.confd @@ -0,0 +1,25 @@ +# +# FreeSWITCH startup configuration +# + +# freeswitch will be running with this userid +FREESWITCH_USER="freeswitch" + + +# optional: group the freeswitch process should be running with +# +# (note: without this option freeswitch will be using all groups +# the user in FREESWITCH_USER is a member of) +# +#FREESWITCH_GROUP="freeswitch" + + + +# optional: other options, e.g. +# +# -hp Use realtime priority and protect freeswitch +# process from being swapped to disk +# (warning: dangerous on machines with little ram!) +# +#FREESWITCH_OPTS="" + diff --git a/main/freeswitch/freeswitch.initd b/main/freeswitch/freeswitch.initd new file mode 100755 index 0000000000..0538fff56b --- /dev/null +++ b/main/freeswitch/freeswitch.initd @@ -0,0 +1,58 @@ +#!/sbin/runscript +# Copyright 2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: $ + +depend() { + need net +} + +opts="reload" + +start() { + local OPTS + + [ -n "${FREESWITCH_USER}" ] && \ + OPTS="${OPTS} -u ${FREESWITCH_USER}" + + [ -n "${FREESWITCH_GROUP}" ] && \ + OPTS="${OPTS} -g ${FREESWITCH_GROUP}" + + [ -n "${FREESWITCH_OPTS}" ] && \ + OPTS="${OPTS} ${FREESWITCH_OPTS}" + + ebegin "Starting Freeswitch" + limits + start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \ + -- -nc -conf /etc/freeswitch -log /var/log/freeswitch \ + -run /var/run/freeswitch -db /var/lib/freeswitch/db \ + -htdocs /usr/share/freeswitch/htdocs \ + -scripts /usr/share/freeswitch/scripts ${OPTS} + eend $? +} + +# Recomended ULIMIT settings +# http://tinyurl.com/2dr467l (i,q,u,x not suppoted) + +limits() { + ulimit -c unlimited + ulimit -d unlimited + ulimit -f unlimited + ulimit -n 999999 + ulimit -v unlimited + ulimit -s 244 + ulimit -l unlimited +} + +stop() { + ebegin "Stopping Freeswitch" + /usr/bin/freeswitch -stop + eend $? +} + +reload() { + start-stop-daemon --stop --signal 1 --quiet --pidfile \ + /var/run/freeswitch.pid --name freeswitch + return 0 +} + diff --git a/main/freeswitch/freeswitch.post-install b/main/freeswitch/freeswitch.post-install new file mode 100755 index 0000000000..fef23caef1 --- /dev/null +++ b/main/freeswitch/freeswitch.post-install @@ -0,0 +1,5 @@ +#!/bin/sh + +chown -R freeswitch:freeswitch /var/*/freeswitch + +exit 0 diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install new file mode 100755 index 0000000000..043b963bbd --- /dev/null +++ b/main/freeswitch/freeswitch.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +adduser -H -h /var/run/freeswitch -s /bin/false -D freeswitch 2>/dev/null + +exit 0 diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf new file mode 100644 index 0000000000..c6f5a05de8 --- /dev/null +++ b/main/freeswitch/modules.conf @@ -0,0 +1,75 @@ +loggers/mod_console +loggers/mod_logfile +loggers/mod_syslog +applications/mod_commands +applications/mod_conference +applications/mod_dptools +applications/mod_enum +applications/mod_fifo +#applications/mod_fax +applications/mod_voicemail +#applications/mod_lcr +applications/mod_limit +applications/mod_expr +applications/mod_esf +#applications/mod_easyroute +applications/mod_fsv +#applications/mod_soundtouch +#applications/mod_rss +#applications/mod_snom +#applications/mod_vmd +#asr_tts/mod_flite +#asr_tts/mod_pocketsphinx +#asr_tts/mod_cepstral +codecs/mod_g723_1 +codecs/mod_amr +#codecs/mod_amrwb +codecs/mod_g729 +codecs/mod_h26x +codecs/mod_voipcodecs +codecs/mod_ilbc +codecs/mod_speex +#codecs/mod_siren +#codecs/mod_celt +#codecs/mod_dahdi_codec +#dialplans/mod_dialplan_directory +dialplans/mod_dialplan_xml +dialplans/mod_dialplan_asterisk +#directories/mod_ldap +#endpoints/mod_dingaling +endpoints/mod_iax +#endpoints/mod_portaudio +endpoints/mod_sofia +endpoints/mod_loopback +#endpoints/mod_alsa +#endpoints/mod_opal +#../../libs/openzap/mod_openzap +#event_handlers/mod_event_multicast +event_handlers/mod_event_socket +event_handlers/mod_cdr_csv +#event_handlers/mod_radius_cdr +formats/mod_native_file +formats/mod_sndfile +#formats/mod_shout +formats/mod_local_stream +formats/mod_tone_stream +#languages/mod_python +#languages/mod_spidermonkey +#languages/mod_spidermonkey_teletone +#languages/mod_spidermonkey_core_db +#languages/mod_spidermonkey_socket +#languages/mod_spidermonkey_odbc +languages/mod_lua +#languages/mod_perl +#languages/mod_yaml +#xml_int/mod_xml_rpc +#xml_int/mod_xml_curl +#xml_int/mod_xml_cdr +#xml_int/mod_xml_ldap +say/mod_say_en +#say/mod_say_de +#say/mod_say_es +#say/mod_say_fr +#say/mod_say_it +#say/mod_say_nl +#say/mod_say_zh diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD index 5e58429d9c..bae42d6689 100644 --- a/main/freetds/APKBUILD +++ b/main/freetds/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=freetds pkgver=0.82 -pkgrel=1 +pkgrel=2 pkgdesc="Tabular Datastream Library" url="http://www.freetds.org/" license="GPL" diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD index e7f2a87ffc..f88da34b87 100644 --- a/main/freetype/APKBUILD +++ b/main/freetype/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=freetype pkgver=2.3.8 -pkgrel=0 +pkgrel=1 pkgdesc="TrueType font rendering library" url="http://freetype.sourceforge.net" license="GPL" diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD index 3c146ec0a1..fdf62ff69e 100644 --- a/main/fribidi/APKBUILD +++ b/main/fribidi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fribidi pkgver=0.19.2 -pkgrel=0 +pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" url="http://fribidi.org" license="LGPL" diff --git a/main/galculator/APKBUILD b/main/galculator/APKBUILD index 4ef92f888c..f8f2d43652 100644 --- a/main/galculator/APKBUILD +++ b/main/galculator/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=galculator pkgver=1.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="GTK+ based scientific calculator" url="http://galculator.sourceforge.net/" license="GPL" diff --git a/main/gamin/APKBUILD b/main/gamin/APKBUILD index 730271afb4..f7c8936aa9 100644 --- a/main/gamin/APKBUILD +++ b/main/gamin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gamin pkgver=0.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system." url="http://www.gnome.org/~veillard/gamin" license="GPL" diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD index fbc2daaa6f..b1389cd385 100644 --- a/main/gawk/APKBUILD +++ b/main/gawk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gawk -pkgver=3.1.7 +pkgver=3.1.8 pkgrel=0 pkgdesc="GNU awk pattern-matching language" url="http://www.gnu.org/software/gawk/gawk.html" @@ -22,9 +22,13 @@ build() { --infodir=/usr/share/info \ --disable-nls make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="a38d5dec19320ace01f1d16c8beb1363 gawk-3.1.7.tar.gz +md5sums="35937a0f83f0efe7a8c2dee635624784 gawk-3.1.8.tar.gz b84506d253e04db3c5af9016fead45a3 gawk.post-deinstall" diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 7ab9918c1b..4668a06856 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -4,12 +4,14 @@ pkgver=4.4.3 _pv=4.4.2 _specsver=0.1.7 _espfver=0.3.6 -pkgrel=0 +_uclibc_abiver=0.9.32 + +pkgrel=3 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" license="GPL LGPL" -depends="binutils libgcc" -makedepends="bison flex gmp-dev mpfr-dev texinfo" +depends="binutils libgcc libgomp" +makedepends="bison flex gmp5-dev mpfr-dev texinfo" subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp" source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2 @@ -18,6 +20,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2 gcc-spec-env.patch pt_gnu_eh_frame.patch uclibc-getipinfo.patch + gcc-dynamic-linker.patch " # ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 build () @@ -52,7 +55,6 @@ build () --disable-libstdcxx-pch \ --disable-multilib \ --disable-nls \ - --disable-threads \ --disable-werror \ --enable-__cxa_atexit \ --enable-cld \ @@ -61,7 +63,10 @@ build () --enable-shared \ --enable-target-optspace \ --enable-tls \ + --enable-threads \ --with-arch=i486 \ + --with-dynamic-linker=ld-uClibc.so.$_uclibc_abiver \ + --with-dynamic-linker-prefix=/lib \ --with-system-zlib \ --without-system-libunwind @@ -127,4 +132,5 @@ cd179ec4f05ee17ce76464da25a2674c gcc-g++-4.4.3.tar.bz2 528926b586b2591474b6c2a7ef8ee6d7 gcc-4.4.2-specs-0.1.7.tar.bz2 c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch 2db1e3482c5dd59dab70f701afa2ca80 pt_gnu_eh_frame.patch -6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch" +6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch +6db5c87887beee75cde3cce86625b9ed gcc-dynamic-linker.patch" diff --git a/main/gcc/gcc-dynamic-linker.patch b/main/gcc/gcc-dynamic-linker.patch new file mode 100644 index 0000000000..9b34664515 --- /dev/null +++ b/main/gcc/gcc-dynamic-linker.patch @@ -0,0 +1,425 @@ +Submitted By: Kevin Day <thekevinday AT gmail DOT com> +Date: 2008-12-19 +Initial Package Version: 4.3.2 +Upstream Status: Not submitted +Description: Why not just be able to define the prefix of the dynamic linker instead of hardcoding it.. +This includes the --nostdinc patch as well, so think of this as a specs-3 patch +This also allows for specifying the dynamic-linker as well + +diff -r -u gcc-4.4.0.orig/gcc/Makefile.in gcc-4.4.0/gcc/Makefile.in +--- gcc-4.4.0.orig/gcc/Makefile.in 2009-06-06 09:15:56 -0500 ++++ gcc-4.4.0/gcc/Makefile.in 2009-06-06 09:40:07 -0500 +@@ -893,7 +893,7 @@ + # This is the variable actually used when we compile. If you change this, + # you probably want to update BUILD_CFLAGS in configure.ac + ALL_CFLAGS = $(T_CFLAGS) \ +- $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ ++ $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ @NOSTDINC@ + + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro + # puts -I options in CPPFLAGS, our include files in the srcdir will always +@@ -1947,6 +1947,8 @@ + -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ + -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ ++ -DDYNAMIC_LINKER_PREFIX=\"@DYNAMICLINKERPREFIX@\" \ ++ -DDYNAMIC_LINKER=\"@DYNAMICLINKER@\" \ + -DDEFAULT_TARGET_VERSION=\"$(version)\" \ + -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ + -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \ +diff -r -u gcc-4.4.0.orig/gcc/config/alpha/gnu.h gcc-4.4.0/gcc/config/alpha/gnu.h +--- gcc-4.4.0.orig/gcc/config/alpha/gnu.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/alpha/gnu.h 2009-06-06 09:40:29 -0500 +@@ -11,7 +11,7 @@ + } while (0) + + #undef ELF_DYNAMIC_LINKER +-#define ELF_DYNAMIC_LINKER "/lib/ld.so" ++#define ELF_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef STARTFILE_SPEC + #define STARTFILE_SPEC \ +diff -r -u gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h +--- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/alpha/linux-elf.h 2009-06-06 09:40:07 -0500 +@@ -27,8 +27,8 @@ + #define EXTRA_SPECS \ + { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define UCLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #if UCLIBC_DEFAULT + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" + #else +diff -r -u gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h +--- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h 2009-06-06 09:16:10 -0500 ++++ gcc-4.4.0/gcc/config/arm/linux-eabi.h 2009-06-06 09:40:07 -0500 +@@ -61,7 +61,7 @@ + /* Use ld-linux.so.3 so that it will be possible to run "classic" + GNU/Linux binaries on an EABI system. */ + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ +diff -r -u gcc-4.4.0.orig/gcc/config/arm/linux-elf.h gcc-4.4.0/gcc/config/arm/linux-elf.h +--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h 2009-06-06 09:16:10 -0500 ++++ gcc-4.4.0/gcc/config/arm/linux-elf.h 2009-06-06 09:40:07 -0500 +@@ -62,7 +62,7 @@ + + #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \ + %{b} \ +diff -r -u gcc-4.4.0.orig/gcc/config/bfin/linux.h gcc-4.4.0/gcc/config/bfin/linux.h +--- gcc-4.4.0.orig/gcc/config/bfin/linux.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/bfin/linux.h 2009-06-06 09:40:07 -0500 +@@ -22,7 +22,7 @@ + %{shared:-G -Bdynamic} \ + %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +- %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \ ++ %{!dynamic-linker:-dynamic-linker DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER}} \ + %{static}} -init __init -fini __fini" + + #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" +diff -r -u gcc-4.4.0.orig/gcc/config/cris/linux.h gcc-4.4.0/gcc/config/cris/linux.h +--- gcc-4.4.0.orig/gcc/config/cris/linux.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/cris/linux.h 2009-06-06 09:40:07 -0500 +@@ -103,7 +103,7 @@ + #undef CRIS_DEFAULT_CPU_VERSION + #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + /* We need an -rpath-link to ld.so.1, and presumably to each directory + specified with -B. */ +diff -r -u gcc-4.4.0.orig/gcc/config/freebsd-spec.h gcc-4.4.0/gcc/config/freebsd-spec.h +--- gcc-4.4.0.orig/gcc/config/freebsd-spec.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/freebsd-spec.h 2009-06-06 09:41:42 -0500 +@@ -144,7 +144,7 @@ + #endif + + #if FBSD_MAJOR < 6 +-#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1" ++#define FBSD_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #else +-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1" ++#define FBSD_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #endif +diff -r -u gcc-4.4.0.orig/gcc/config/frv/linux.h gcc-4.4.0/gcc/config/frv/linux.h +--- gcc-4.4.0.orig/gcc/config/frv/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/frv/linux.h 2009-06-06 09:40:07 -0500 +@@ -35,7 +35,7 @@ + #define ENDFILE_SPEC \ + "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -r -u gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h +--- gcc-4.4.0.orig/gcc/config/i386/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/i386/linux.h 2009-06-06 09:40:07 -0500 +@@ -100,7 +100,7 @@ + + /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */ + #define LINK_EMULATION "elf_i386" +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef ASM_SPEC + #define ASM_SPEC \ +diff -r -u gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h +--- gcc-4.4.0.orig/gcc/config/i386/linux64.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-06-06 09:40:07 -0500 +@@ -58,8 +58,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/" DYNAMIC_LINKER ++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef ASM_SPEC + #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ +diff -r -u gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h +--- gcc-4.4.0.orig/gcc/config/ia64/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/ia64/linux.h 2009-06-06 09:40:07 -0500 +@@ -37,7 +37,7 @@ + /* Define this for shared library support because it isn't in the main + linux.h file. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -r -u gcc-4.4.0.orig/gcc/config/knetbsd-gnu.h gcc-4.4.0/gcc/config/knetbsd-gnu.h +--- gcc-4.4.0.orig/gcc/config/knetbsd-gnu.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/knetbsd-gnu.h 2009-06-06 09:40:59 -0500 +@@ -34,5 +34,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #endif +diff -r -u gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h +--- gcc-4.4.0.orig/gcc/config/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/linux.h 2009-06-06 09:40:07 -0500 +@@ -117,9 +117,9 @@ + GLIBC_DYNAMIC_LINKER must be defined for each target using them, or + GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets + supporting both 32-bit and 64-bit compilation. */ +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define UCLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define UCLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + #define LINUX_DYNAMIC_LINKER32 \ +@@ -135,3 +135,8 @@ + #define TARGET_HAS_SINCOS (OPTION_GLIBC) + + #define TARGET_POSIX_IO ++ ++#ifdef NOSTDINC ++#undef STANDARD_INCLUDE_DIR ++#define STANDARD_INCLUDE_DIR 0 ++#endif +diff -r -u gcc-4.4.0.orig/gcc/config/m32r/linux.h gcc-4.4.0/gcc/config/m32r/linux.h +--- gcc-4.4.0.orig/gcc/config/m32r/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/m32r/linux.h 2009-06-06 09:40:07 -0500 +@@ -58,7 +58,7 @@ + + /* If ELF is the default format, we should not use /lib/elf. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #if TARGET_LITTLE_ENDIAN +diff -r -u gcc-4.4.0.orig/gcc/config/m68k/linux.h gcc-4.4.0/gcc/config/m68k/linux.h +--- gcc-4.4.0.orig/gcc/config/m68k/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/m68k/linux.h 2009-06-06 09:40:07 -0500 +@@ -84,7 +84,7 @@ + + /* If ELF is the default format, we should not use /lib/elf. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC "-m m68kelf %{shared} \ +diff -r -u gcc-4.4.0.orig/gcc/config/mips/linux.h gcc-4.4.0/gcc/config/mips/linux.h +--- gcc-4.4.0.orig/gcc/config/mips/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/mips/linux.h 2009-06-06 09:40:07 -0500 +@@ -64,7 +64,7 @@ + #undef MIPS_DEFAULT_GVALUE + #define MIPS_DEFAULT_GVALUE 0 + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + /* Borrowed from sparc/linux.h */ + #undef LINK_SPEC +diff -r -u gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h +--- gcc-4.4.0.orig/gcc/config/mips/linux64.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-06-06 09:40:07 -0500 +@@ -35,10 +35,10 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define GLIBC_DYNAMIC_LINKERN32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define UCLIBC_DYNAMIC_LINKERN32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) + +diff -r -u gcc-4.4.0.orig/gcc/config/mn10300/linux.h gcc-4.4.0/gcc/config/mn10300/linux.h +--- gcc-4.4.0.orig/gcc/config/mn10300/linux.h 2009-06-06 09:16:11 -0500 ++++ gcc-4.4.0/gcc/config/mn10300/linux.h 2009-06-06 09:40:07 -0500 +@@ -32,7 +32,7 @@ + #undef ASM_SPEC + #define ASM_SPEC "%{Wa,*:%*}" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ +diff -r -u gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h +--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/rs6000/linux64.h 2009-06-06 09:40:07 -0500 +@@ -342,10 +342,10 @@ + #undef LINK_OS_DEFAULT_SPEC + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define UCLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define UCLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + #if UCLIBC_DEFAULT + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" + #else +diff -r -u gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h +--- gcc-4.4.0.orig/gcc/config/s390/linux.h 2009-06-06 09:16:10 -0500 ++++ gcc-4.4.0/gcc/config/s390/linux.h 2009-06-06 09:40:07 -0500 +@@ -72,8 +72,8 @@ + #define MULTILIB_DEFAULTS { "m31" } + #endif + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC \ +diff -r -u gcc-4.4.0.orig/gcc/config/sh/linux.h gcc-4.4.0/gcc/config/sh/linux.h +--- gcc-4.4.0.orig/gcc/config/sh/linux.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/sh/linux.h 2009-06-06 09:40:07 -0500 +@@ -47,7 +47,7 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" +diff -r -u gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h +--- gcc-4.4.0.orig/gcc/config/sparc/linux.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/sparc/linux.h 2009-06-06 09:40:07 -0500 +@@ -83,7 +83,7 @@ + + /* If ELF is the default format, we should not use /lib/elf. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ +diff -r -u gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h +--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h 2009-06-06 09:16:15 -0500 ++++ gcc-4.4.0/gcc/config/sparc/linux64.h 2009-06-06 09:40:07 -0500 +@@ -109,8 +109,8 @@ + + /* If ELF is the default format, we should not use /lib/elf. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER32 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER ++#define GLIBC_DYNAMIC_LINKER64 DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #ifdef SPARC_BI_ARCH + +diff -r -u gcc-4.4.0.orig/gcc/config/xtensa/linux.h gcc-4.4.0/gcc/config/xtensa/linux.h +--- gcc-4.4.0.orig/gcc/config/xtensa/linux.h 2009-06-06 09:16:10 -0500 ++++ gcc-4.4.0/gcc/config/xtensa/linux.h 2009-06-06 09:40:07 -0500 +@@ -43,7 +43,7 @@ + %{mlongcalls:--longcalls} \ + %{mno-longcalls:--no-longcalls}" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + + #undef LINK_SPEC + #define LINK_SPEC \ +diff -r -u gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure +--- gcc-4.4.0.orig/gcc/configure 2009-06-06 09:16:16 -0500 ++++ gcc-4.4.0/gcc/configure 2009-06-06 09:40:07 -0500 +@@ -1118,6 +1118,14 @@ + --with-gc={page,zone} choose the garbage collection mechanism to use + with the compiler + --with-system-zlib use installed libz ++ --with-dynamic-linker=PATH ++ specifies path to dynamic linker. ++ example: "/lib/ld-linux.so.2", where this defines "ld-linux.so.2" ++ --with-dynamic-linker-prefix=PATH ++ specifies path to dynamic linker. ++ example: "/lib/ld-linux.so.2", where this defines "/lib" ++ --with-nostdinc build gcc to ignore standard include directories. ++ You will have to use --with-local-prefix with this option. + --with-slibdir=DIR shared libraries in DIR [LIBDIR] + --with-datarootdir=DIR Use DIR as the data root [PREFIX/share] + --with-docdir=DIR Install documentation in DIR [DATAROOTDIR] +@@ -5631,6 +5639,47 @@ + #define SIZEOF_INT $ac_cv_sizeof_int + _ACEOF + ++# Check whether --with-dynamic-linker was given. ++ ++DYNAMICLINKER="ld-linux.so.2" ; ++if test "${with_dynamic_linker+set}" = set; then ++ withval="$with_dynamic_linker" ++ case "${withval}" in ++yes) { { echo "$as_me:$LINENO: error: bad value "${withval}". Use something like --with-dynamic-linker=$DYNAMICLINKER" >&5 ++echo "$as_me: error: bad value "${withval}". Use something like --with-dynamic-linker=$DYNAMICLINKER" >&2;} ++ { (exit 1); exit 1; }; } ;; ++no) ;; ++*) DYNAMICLINKER=$withval ;; ++esac ++fi; ++ ++# Check whether --with-dynamic-linker-prefix= was given. ++ ++DYNAMICLINKERPREFIX="/lib" ; ++if test "${with_dynamic_linker_prefix+set}" = set; then ++ withval="$with_dynamic_linker_prefix" ++ case "${withval}" in ++yes) { { echo "$as_me:$LINENO: error: bad value "${withval}". Use --with-dynamic-linker-prefix=/path/to/lib/" >&5 ++echo "$as_me: error: bad value "${withval}". Use --with-dynamic-linker-prefix=/path/to/lib/" >&2;} ++ { (exit 1); exit 1; }; } ;; ++no) ;; ++*) DYNAMICLINKERPREFIX=$withval ;; ++esac ++ ++fi; ++ ++# Check whether --with-nostdinc was given. ++ ++if test "${with_nostdinc+set}" = set; then ++ withval="$with_nostdinc" ++ case "${withval}" in ++yes) NOSTDINC="-DNOSTDINC" ;; ++no) ;; ++*) NOSTDINC="-DNOSTDINC" ;; ++esac ++fi; ++ ++ + + echo "$as_me:$LINENO: checking for long" >&5 + echo $ECHO_N "checking for long... $ECHO_C" >&6 +@@ -25488,6 +25537,9 @@ + s,@TARGET_SYSTEM_ROOT_DEFINE@,$TARGET_SYSTEM_ROOT_DEFINE,;t t + s,@CROSS_SYSTEM_HEADER_DIR@,$CROSS_SYSTEM_HEADER_DIR,;t t + s,@onestep@,$onestep,;t t ++s,@DYNAMICLINKER@,$DYNAMICLINKER,;t t ++s,@DYNAMICLINKERPREFIX@,$DYNAMICLINKERPREFIX,;t t ++s,@NOSTDINC@,$NOSTDINC,;t t + s,@PKGVERSION@,$PKGVERSION,;t t + s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t + s,@REPORT_BUGS_TEXI@,$REPORT_BUGS_TEXI,;t t
\ No newline at end of file diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index bee6064547..5ec2876685 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -3,7 +3,7 @@ pkgname=gd pkgver=2.0.36_rc1 _myver=2.0.36RC1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for the dynamic creation of images by programmers" url="http://www.libgd.org/" license="custom" diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD index a851da3141..67bb5d19de 100644 --- a/main/gdb/APKBUILD +++ b/main/gdb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdb pkgver=6.8 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Debugger" url="http://sources.redhat.com/gdb/" license="GPL3" diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD index e20966b323..a24bfb1f47 100644 --- a/main/gdbm/APKBUILD +++ b/main/gdbm/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=gdbm pkgver=1.8.3 -pkgrel=0 +pkgrel=1 pkgdesc="GNU dbm is a set of database routines that use extensible hashing" url="http://www.gnu.org/software/gdbm/" license="GPL" -depends="uclibc" +depends="" makedepends="" install= subpackages="$pkgname-dev $pkgname-dev" diff --git a/main/geany/APKBUILD b/main/geany/APKBUILD index da959e6b5d..36e77f4226 100644 --- a/main/geany/APKBUILD +++ b/main/geany/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=geany pkgver=0.18.1 -pkgrel=0 +pkgrel=1 pkgdesc="A fast and lightweight IDE" url="http://www.geany.org" license="GPL" diff --git a/main/gegl/APKBUILD b/main/gegl/APKBUILD new file mode 100644 index 0000000000..1db5bd38f1 --- /dev/null +++ b/main/gegl/APKBUILD @@ -0,0 +1,36 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gegl +pkgver=0.1.2 +pkgrel=0 +pkgdesc="Graph based image processing framework" +url="http://www.gegl.org/" +license="GPL3 LGPL3" +makedepends="babl-dev libpng-dev jpeg-dev gtk+-dev librsvg-dev lua-dev" +subpackages="$pkgname-dev" +source="ftp://ftp.gimp.org/pub/$pkgname/0.1/$pkgname-$pkgver.tar.bz2 + gegl-uclibc.patch" + +depends_dev="babl-dev glib-dev" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*patch; do + patch -p1 -i "$i" || return 1 + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --with-librsvg \ + --disable-docs \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="d35ffe17dc042652eca3205488ece262 gegl-0.1.2.tar.bz2 +e8efbd53553220b97650a3b693461fa5 gegl-uclibc.patch" diff --git a/main/gegl/gegl-uclibc.patch b/main/gegl/gegl-uclibc.patch new file mode 100644 index 0000000000..cb93f0fec7 --- /dev/null +++ b/main/gegl/gegl-uclibc.patch @@ -0,0 +1,22 @@ +--- ./gegl/buffer/gegl-buffer.c.orig ++++ ./gegl/buffer/gegl-buffer.c +@@ -80,7 +80,7 @@ + /* #define GEGL_BUFFER_DEBUG_ALLOCATIONS to print allocation stack + * traces for leaked GeglBuffers using GNU C libs backtrace_symbols() + */ +-#ifndef G_OS_WIN32 ++#if !defined(G_OS_WIN32) && !defined(__UCLIBC__) + #include <execinfo.h> + #endif + +@@ -876,8 +876,8 @@ + gegl_buffer_get_alloc_stack (void) + { + char *result = NULL; +-#ifdef G_OS_WIN32 +- result = g_strdup ("backtrack not available on win32\n"); ++#if defined(G_OS_WIN32) || defined(__UCLIBC__) ++ result = g_strdup ("backtrack not available\n"); + #else + void *functions[MAX_N_FUNCTIONS]; + int n_functions = 0; diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD index 5bb26daaba..bd9eec61e8 100644 --- a/main/gettext/APKBUILD +++ b/main/gettext/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=gettext pkgver=0.17 -pkgrel=3 +pkgrel=4 pkgdesc="GNU locale utilities" url="http://www.gnu.org/software/gettext/gettext.html" license='GPL' depends= -makedepends="libiconv-dev expat-dev ncurses-dev bash uclibc++-dev libxml2-dev" +makedepends="libiconv-dev expat-dev ncurses-dev bash libxml2-dev libgomp" source="ftp://ftp.mirror.nl/pub/mirror/gnu/gettext/gettext-0.17.tar.gz gettext-0.15-expat-no-dlopen.patch gettext-0.17-gnuinfo.patch diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD index adc8756ad6..6373c076dd 100644 --- a/main/ghostscript/APKBUILD +++ b/main/ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=ghostscript pkgver=8.71 -pkgrel=1 +pkgrel=2 pkgdesc="An interpreter for the PostScript language and for PDF" url="http://ghostscript.com/" license="GPL" diff --git a/main/giblib/APKBUILD b/main/giblib/APKBUILD index e7242d8695..90a61b4d81 100644 --- a/main/giblib/APKBUILD +++ b/main/giblib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=giblib pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Giblib is a library that feh uses as a wrapper to imlib2" url="http://linuxbrit.co.uk/giblib/" license="MIT" diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD index 4ea64b882b..01fd9047bb 100644 --- a/main/giflib/APKBUILD +++ b/main/giflib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=giflib pkgver=4.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" license="MIT" diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD new file mode 100644 index 0000000000..171766f5a5 --- /dev/null +++ b/main/gimp/APKBUILD @@ -0,0 +1,46 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gimp +pkgver=2.6.8 +pkgrel=0 +pkgdesc="GNU Image Manipulation Program" +url="http://www.gimp.org/" +license="GPL" +makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev + libexif-dev desktop-file-utils intltool gegl-dev tiff-dev + jpeg-dev libpng-dev curl-dev" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2 + libpng-1.4.patch + gtk-2.19-statusbar.patch" + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -Np1 -i "../libpng-1.4.patch" || return 1 + patch -Np1 -i "$srcdir"/gtk-2.19-statusbar.patch || return 1 +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-mp \ + --enable-gimp-console \ + --enable-gimp-remote \ + --disable-devel-docs \ + --disable-python \ + --without-gvfs \ + --without-gnomevfs \ + --with-gif-compression=lzw \ + --without-aa || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 + ln -s gimptool-2.0 "$pkgdir/usr/bin/gimptool" || return 1 +} +md5sums="a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2 +211eccab51593526e852816e647f7da4 libpng-1.4.patch +8be7d21231e3032e4723cf86588375c0 gtk-2.19-statusbar.patch" diff --git a/main/gimp/gtk-2.19-statusbar.patch b/main/gimp/gtk-2.19-statusbar.patch new file mode 100644 index 0000000000..8bc278b4c2 --- /dev/null +++ b/main/gimp/gtk-2.19-statusbar.patch @@ -0,0 +1,67 @@ +From 501c4f65f08c111df0654cb887d95c2c06e82710 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Wed, 24 Mar 2010 17:08:01 +0000 +Subject: backport statusbar code needed for GTK+ >= 2.19.1 + +Use the hbox that is provided via gtk_statusbar_get_message_area() +since GTK+ 2.19.1. +--- +diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c +index 5e89427..36651cd 100644 +--- a/app/display/gimpstatusbar.c ++++ b/app/display/gimpstatusbar.c +@@ -49,6 +49,9 @@ + /* maximal width of the string holding the cursor-coordinates */ + #define CURSOR_LEN 256 + ++/* the spacing of the hbox */ ++#define HBOX_SPACING 1 ++ + /* spacing between the icon and the statusbar label */ + #define ICON_SPACING 2 + +@@ -152,6 +155,7 @@ static void + gimp_statusbar_init (GimpStatusbar *statusbar) + { + GtkWidget *hbox; ++ GtkWidget *label; + GtkWidget *image; + GimpUnitStore *store; + +@@ -171,13 +175,27 @@ gimp_statusbar_init (GimpStatusbar *statusbar) + statusbar->progress_active = FALSE; + statusbar->progress_shown = FALSE; + +- /* remove the label and insert a hbox */ +- gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), +- g_object_ref (GTK_STATUSBAR (statusbar)->label)); +- +- hbox = gtk_hbox_new (FALSE, 1); +- gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox); +- gtk_widget_show (hbox); ++ label = g_object_ref (GTK_STATUSBAR (statusbar)->label); ++ ++ /* remove the message area or label and insert a hbox */ ++#if GTK_CHECK_VERSION (2, 19, 1) ++ { ++ hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar)); ++ gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING); ++ gtk_container_remove (GTK_CONTAINER (hbox), label); ++ } ++#else ++ { ++ GtkWidget *label_parent; ++ ++ label_parent = gtk_widget_get_parent (label); ++ gtk_container_remove (GTK_CONTAINER (label_parent), label); ++ ++ hbox = gtk_hbox_new (FALSE, HBOX_SPACING); ++ gtk_container_add (GTK_CONTAINER (label_parent), hbox); ++ gtk_widget_show (hbox); ++ } ++#endif + + statusbar->cursor_label = gtk_label_new ("8888, 8888"); + gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5); +-- +cgit v0.8.3.1 diff --git a/main/gimp/libpng-1.4.patch b/main/gimp/libpng-1.4.patch new file mode 100644 index 0000000000..8f7963d232 --- /dev/null +++ b/main/gimp/libpng-1.4.patch @@ -0,0 +1,26 @@ +diff -Naur gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c gimp-2.7.0/plug-ins/file-ico/ico-load.c +--- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 ++++ gimp-2.7.0/plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 -0500 +@@ -286,14 +286,22 @@ + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); + png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); diff --git a/main/git/APKBUILD b/main/git/APKBUILD index ca396675d7..f8d9e8bb0d 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.0.5 -pkgrel=0 +pkgver=1.7.1 +pkgrel=2 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" license="GPL2" @@ -10,6 +10,7 @@ subpackages="$pkgname-doc $pkgname-perl" makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev" source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2 bb-tar.patch + git-do-not-dump-core-when-iconv-fails.patch " _makeopts="NO_ICONV=YesPlease @@ -17,14 +18,16 @@ _makeopts="NO_ICONV=YesPlease NO_TCLTK=YesPlease NO_SVN_TESTS=YesPlease" -build () { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../bb-tar.patch || return 1 +build() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/bb-tar.patch || return 1 + patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \ + || return 1 make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1 } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver make prefix=/usr DESTDIR="$pkgdir" $_makeopts install } @@ -42,5 +45,6 @@ perl() { } -md5sums="77d50f41ef282752dc69d9a47765f5c7 git-1.7.0.5.tar.bz2 -e63a201556c4f089de790805c09a2e5b bb-tar.patch" +md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 +e63a201556c4f089de790805c09a2e5b bb-tar.patch +7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch" diff --git a/main/git/git-do-not-dump-core-when-iconv-fails.patch b/main/git/git-do-not-dump-core-when-iconv-fails.patch new file mode 100644 index 0000000000..b338ee4809 --- /dev/null +++ b/main/git/git-do-not-dump-core-when-iconv-fails.patch @@ -0,0 +1,43 @@ +commit 43acff34b902c38808ac0f326090f2516250e1f0 +Author: Jonathan Nieder <jrnieder@gmail.com> +Date: Sat May 8 18:17:29 2010 -0500 + + cherry-pick: do not dump core when iconv fails + + When cherry-picking, usually the new and old commit encodings are both + UTF-8. Most old iconv implementations do not support this trivial + conversion, so on old platforms, out->message remains NULL, and later + attempts to read it segfault. + + Fix this by noticing the input and output encodings match and skipping + the iconv step, like the other reencode_string() call sites already do. + Also stop segfaulting on other iconv failures: if iconv fails for some + other reason, the best we can do is to pass the old message through. + + This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert: + clarify label on conflict hunks, 2010-03-20). + + Reported-by: Andreas Krey <a.krey@gmx.de> + Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> + Signed-off-by: Junio C Hamano <gitster@pobox.com> + +diff --git a/builtin/revert.c b/builtin/revert.c +index 778a56e..7d68ef7 100644 +--- a/builtin/revert.c ++++ b/builtin/revert.c +@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out) + encoding = "UTF-8"; + if (!git_commit_encoding) + git_commit_encoding = "UTF-8"; +- if ((out->reencoded_message = reencode_string(raw_message, +- git_commit_encoding, encoding))) ++ ++ out->reencoded_message = NULL; ++ out->message = raw_message; ++ if (strcmp(encoding, git_commit_encoding)) ++ out->reencoded_message = reencode_string(raw_message, ++ git_commit_encoding, encoding); ++ if (out->reencoded_message) + out->message = out->reencoded_message; + + abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD index 4c2405eb9f..1e88f6c7c1 100644 --- a/main/glib/APKBUILD +++ b/main/glib/APKBUILD @@ -1,16 +1,16 @@ -# Maintainer: Carlo Landmeter <clandmeter at gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glib pkgver=2.24.0 -pkgrel=0 +pkgrel=2 pkgdesc="Common C routines used by Gtk+ and other libs" url="http://www.gtk.org" license='GPL' depends= -makedepends="gettext-dev libiconv-dev zlib-dev pkgconfig" +makedepends="gettext-dev libiconv-dev zlib-dev bzip2-dev pkgconfig" source="http://ftp.gnome.org/pub/gnome/sources/glib/${pkgver%.*}/glib-$pkgver.tar.bz2" subpackages="$pkgname-doc $pkgname-dev" -depends_dev="perl gettext-dev libiconv-dev zlib-dev pkgconfig" +depends_dev="perl gettext-dev libiconv-dev zlib-dev bzip2-dev pkgconfig" _builddir="$srcdir/$pkgname-$pkgver" diff --git a/main/gmp/APKBUILD b/main/gmp/APKBUILD index 5407514d70..36ad708d4b 100644 --- a/main/gmp/APKBUILD +++ b/main/gmp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gmp pkgver=4.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" url="http://gmplib.org/" license="LGPL3" diff --git a/main/gmp5/APKBUILD b/main/gmp5/APKBUILD new file mode 100644 index 0000000000..c2a4ad6f45 --- /dev/null +++ b/main/gmp5/APKBUILD @@ -0,0 +1,47 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +_name=gmp +pkgname=${_name}5 + +pkgver=5.0.1 +pkgrel=0 +pkgdesc="A free library for arbitrary precision arithmetic" +url="http://gmplib.org/" +license="LGPL3" +makedepends="m4 texinfo" +depends= +subpackages="$pkgname-doc $pkgname-dev" +source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2 + gmp-4.1.4-noexecstack.patch + " + +_builddir="$srcdir"/$_name-$pkgver +build() { + cd "$_builddir" + patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1 + + ABI="32" ./configure --prefix=/usr \ + --build=${CHOST} \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --localstatedir=/var/state/gmp \ + --disable-mpfr \ + --disable-mpbsd \ + --disable-cxx \ + --with-pic \ + || return 1 + + make || return 1 +} + +package() { + cd "$_builddir" + make -j1 DESTDIR="${pkgdir}" install || return 1 +} + +dev() { + replaces="gmp" + default_dev +} + +md5sums="6bac6df75c192a13419dfd71d19240a7 gmp-5.0.1.tar.bz2 +13c34f00e77ded6673270cfea06c35c3 gmp-4.1.4-noexecstack.patch" diff --git a/main/gmp5/gmp-4.1.4-noexecstack.patch b/main/gmp5/gmp-4.1.4-noexecstack.patch new file mode 100644 index 0000000000..093bec1a5d --- /dev/null +++ b/main/gmp5/gmp-4.1.4-noexecstack.patch @@ -0,0 +1,20 @@ +fixed executable stack + +http://bugs.gentoo.org/115038 + +--- gmp-4.1.4/configure ++++ gmp-4.1.4/configure +@@ -21689,6 +21689,13 @@ + fi + echo "')" >> $gmp_configm4 + echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4 ++# Gentoo hack ++case $host_os in ++ *linux*) ++ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4 ++ echo '.previous' >> $gmp_configm4 ++ ;; ++esac + + # Create Makefiles + # FIXME: Upcoming version of autoconf/automake may not like broken lines. diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD index 535f46ee42..bcf94e1b5f 100644 --- a/main/gnats/APKBUILD +++ b/main/gnats/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnats pkgver=4.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Bug Tracking System" url="http://www.gnu.org/software/gnats/" license="GPL-2" -depends="uclibc postfix" +depends="postfix" makedepends="texinfo" install="gnats.pre-install" source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD index fa1387b7db..b35f8566aa 100644 --- a/main/gnupg/APKBUILD +++ b/main/gnupg/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnupg -pkgver=2.0.10 +pkgver=2.0.15 pkgrel=0 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" url="http://www.gnupg.org/" license="GPL" -depends="curl zlib libksba libgcrypt libgpg-error pth pinentry libiconv" +depends= makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev - pth-dev zlib-dev libiconv-dev" + pth-dev zlib-dev libiconv-dev libassuan-dev" subpackages="$pkgname-doc" source="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2" @@ -16,6 +16,10 @@ build () { ./configure --prefix=/usr \ --disable-nls make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="1cb778dd555f87685a8fde2f7113725e gnupg-2.0.10.tar.bz2" +md5sums="c1286e85b66349879dc4b760dd83e2f1 gnupg-2.0.15.tar.bz2" diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD index 160f0155b0..ebd171cb98 100644 --- a/main/gnutls/APKBUILD +++ b/main/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnutls pkgver=2.8.6 -pkgrel=0 +pkgrel=1 pkgdesc="A library which provides a secure connection" url="http://www.gnu.org/software/gnutls/" license="GPL" diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD index 6e936cb0ef..67404c54f0 100644 --- a/main/gobject-introspection/APKBUILD +++ b/main/gobject-introspection/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gobject-introspection -pkgver=0.6.9 +pkgver=0.6.12 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" license="LGPL GPL" makedepends="flex bison glib-dev libffi-dev python-dev" -depends="python glib-dev libffi-dev" +depends="python glib-dev libffi-dev cairo-dev" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.bz2" # since this is a dev package by definition we dont bother separate -dev @@ -17,7 +17,8 @@ build() { cd "$_builddir" export CPPFLAGS= ./configure --prefix=/usr --disable-static || return 1 - make || return 1 + # FIXME: parallel builds is broken + make -j1 || return 1 } package() { @@ -32,4 +33,4 @@ libgirepository() { mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/ } -md5sums="37cb473c6bafd03c4a48e1f37e19cc04 gobject-introspection-0.6.9.tar.bz2" +md5sums="265e24520996820d39d6149ea10dc0df gobject-introspection-0.6.12.tar.bz2" diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD new file mode 100644 index 0000000000..51c0be8d7f --- /dev/null +++ b/main/goffice/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=goffice +pkgver=0.8.3 +pkgrel=0 +pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" +url="http://www.gnome.org" +license="GPL" +makedepends="libgsf-dev intltool cairo-dev gtk+-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2" + +depends_dev="glib-dev libgsf-dev cairo-dev libxml2-dev" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --without-gconf \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="f8c4fd47e1ef9d2512126d1074952201 goffice-0.8.3.tar.bz2" diff --git a/main/gperf/APKBUILD b/main/gperf/APKBUILD index cc97c06d5c..84d5ab2c06 100644 --- a/main/gperf/APKBUILD +++ b/main/gperf/APKBUILD @@ -1,21 +1,24 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gperf pkgver=3.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Perfect hash function generator." url="http://www.gnu.org/software/gperf/" license="GPL" subpackages="$pkgname-doc" -depends="uclibc libgcc uclibc++" -makedepends="uclibc++-dev" +depends= +makedepends= source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" build () { cd "$srcdir"/$pkgname-$pkgver - export CXX=g++-uc ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } md5sums="c1f1db32fb6598d6a93e6e88796a8632 gperf-3.0.4.tar.gz" diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD index 9db0713c8b..6c2062c309 100644 --- a/main/gpicview/APKBUILD +++ b/main/gpicview/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gpicview pkgver=0.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Picture viewer of the LXDE Desktop" url="http://wiki.lxde.org/en/GPicView" license="GPL-2" diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD index 7d1106be69..df9cd26355 100644 --- a/main/grep/APKBUILD +++ b/main/grep/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=grep pkgver=2.6.3 -pkgrel=0 +pkgrel=1 pkgdesc="Searches input files for lines containing a match to a specified pattern" url="http://www.gnu.org/software/grep/grep.html" license="GPL" diff --git a/main/groff/APKBUILD b/main/groff/APKBUILD index 6866c2db08..ffd6960131 100644 --- a/main/groff/APKBUILD +++ b/main/groff/APKBUILD @@ -1,22 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=groff pkgver=1.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU troff text-formatting system" url="http://www.gnu.org/software/groff/groff.html" license="GPL" -depends="uclibc uclibc++ libgcc" -makedepends="perl texinfo uclibc++-dev" +depends= +makedepends="perl texinfo" subpackages="$pkgname-doc" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" build () { cd "$srcdir/$pkgname-$pkgver" - - export CXX=g++-uc ./configure --prefix=/usr --without-x - make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } md5sums="48fa768dd6fdeb7968041dd5ae8e2b02 groff-1.20.1.tar.gz" diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD index 7e6953d951..efb7ba6153 100644 --- a/main/gross/APKBUILD +++ b/main/gross/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gross pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Greylisting of suspicious sources" url="http://code.google.com/p/gross/" license="BSD" diff --git a/main/gst-plugins-ffmpeg/APKBUILD b/main/gst-ffmpeg/APKBUILD index 1949f16cbc..e27d02a696 100644 --- a/main/gst-plugins-ffmpeg/APKBUILD +++ b/main/gst-ffmpeg/APKBUILD @@ -1,32 +1,27 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-ffmpeg -pkgver=0.10.7 -pkgrel=0 +pkgver=0.10.10 +pkgrel=3 pkgdesc="Gstreamer FFMpeg Plugin" url="http://www.gstreamer.net" license="GPL" -makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev ffmpeg-dev" +makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev coreutils" source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2" -build () -{ +build() { cd "$srcdir"/gst-ffmpeg-$pkgver - sed -i \ - -e 's,ffmpeg/avformat.h,libavformat/avformat.h,' \ - -e 's,ffmpeg/avcodec.h,libavcodec/avcodec.h,' \ - -e 's,ffmpeg/swscale.h,libswscale/swscale.h,' \ - ext/ffmpeg/gst* \ - ext/libpostproc/gstpostproc.c \ - || return 1 - export CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure --prefix=/usr \ --sysconfdir=/etc \ - --with-system-ffmpeg \ - --localstatedir=/var || return 1 + --localstatedir=/var \ + --with-ffmpeg-extra-configure="--enable-pic --disable-mmx --disable-mmx2" || return 1 make || return 1 +} + +package() { + cd "$srcdir"/gst-ffmpeg-$pkgver make DESTDIR="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/lib/gstreamer-0.10/*.{l,}a } -md5sums="6be89b26592f36ef631b22a68b8e06c4 gst-ffmpeg-0.10.7.tar.bz2" +md5sums="447292deff5f3748444e6a5fba41da29 gst-ffmpeg-0.10.10.tar.bz2" diff --git a/main/gst-plugins-bad/APKBUILD b/main/gst-plugins-bad/APKBUILD index 97eb64f268..4821c459ca 100644 --- a/main/gst-plugins-bad/APKBUILD +++ b/main/gst-plugins-bad/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-bad -pkgver=0.10.14 +pkgver=0.10.18 pkgrel=0 pkgdesc="GStreamer bad plugins" url="http://gstreamer.freedesktop.org/" @@ -13,9 +13,8 @@ makedepends="pkgconfig gst-plugins-base-dev gstreamer-dev xvidcore-dev #'libdca>=0.0.5' 'bzip2' 'libdc1394>=2.1.0' 'exempi>=2.1.0' 'jack-audio-connection-kit>=0.116.2' 'neon>=0.28.4' 'faac>=1.28' 'libexif>=0.6.17' 'musicbrainz>=2.1.5' 'faad2>=2.7' 'libmms>=0.4' 'libcdaudio>=0.99.12' 'libmpcdec>=1.2.6' 'mjpegtools>=1.9.0' 'libdvdnav>=4.1.3' 'libmodplug>=0.8.7' 'jasper>=1.900.1' 'liblrdf>=0.4.0' 'libofa>=0.9.3') source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$pkgver.tar.bz2" -build () -{ - cd ""$srcdir"/gst-plugins-bad-$pkgver" +build() { + cd "$srcdir"/gst-plugins-bad-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -25,7 +24,11 @@ build () --with-package-origin="http://www.alpinelinux.org/" \ || return 1 make || return 1 +} + +package() { + cd "$srcdir"/gst-plugins-bad-$pkgver make DESTDIR="$pkgdir" install } -md5sums="6be38b04fc76cdfef3a3b02b8434efa2 gst-plugins-bad-0.10.14.tar.bz2" +md5sums="84838893b447e774d401a698ff812b32 gst-plugins-bad-0.10.18.tar.bz2" diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD index 253cc5fe4b..423f5873fa 100644 --- a/main/gst-plugins-base/APKBUILD +++ b/main/gst-plugins-base/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-base -pkgver=0.10.25 -pkgrel=2 +pkgver=0.10.29 +pkgrel=0 pkgdesc="GStreamer Multimedia Framework Base Plugins" url="http://gstreamer.freedesktop.org/" license="GPL LGPL" @@ -34,4 +34,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="d29669dd79276c5cd94e1613c03cd9ab gst-plugins-base-0.10.25.tar.bz2" +md5sums="d07e251152cccbaa81807c14cf0fd8c0 gst-plugins-base-0.10.29.tar.bz2" diff --git a/main/gst-plugins-good/APKBUILD b/main/gst-plugins-good/APKBUILD index ed2088ea8d..d493cc2ad6 100644 --- a/main/gst-plugins-good/APKBUILD +++ b/main/gst-plugins-good/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-good -pkgver=0.10.17 -pkgrel=2 +pkgver=0.10.22 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" url="http://gstreamer.freedesktop.org/" license="LGPL" @@ -9,6 +9,7 @@ subpackages="$pkgname-dev" depends= makedepends="gstreamer-dev glib-dev liboil-dev gst-plugins-base-dev libsoup-dev flac-dev libogg-dev taglib-dev jpeg-dev zlib-dev" +replaces="gst-plugins-bad" # might consider those: #libavc1394 @@ -41,4 +42,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="833546cd2b8bbf86b8ed083b00897918 gst-plugins-good-0.10.17.tar.bz2" +md5sums="4804aaa32044af9846914304991cc9d6 gst-plugins-good-0.10.22.tar.bz2" diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD index cb49433c05..818b3ec94b 100644 --- a/main/gst-plugins-ugly/APKBUILD +++ b/main/gst-plugins-ugly/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-ugly -pkgver=0.10.13 -pkgrel=0 +pkgver=0.10.14 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" url="http://gstreamer.freedesktop.org/" license="LGPL" depends= #"gstreamer0.10-ugly>=0.10.11 libdvdread>=4.1.3 lame>=3.98.2 libmpeg2>=0.5.1 a52dec>=0.7.4 libid3tag>=0.15.1b libmad>=0.15.1b libsidplay>=1.36.59 libcdio>=0.81" makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev - libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev" + libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev + x264-dev" source="http://gstreamer.freedesktop.org//src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2" build() { @@ -26,4 +27,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="1619365247ef9cd7da1cd890285bf87a gst-plugins-ugly-0.10.13.tar.bz2" +md5sums="0bc0d27bcce88c73ef6c81e88624e686 gst-plugins-ugly-0.10.14.tar.bz2" diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD index df825c01d8..ffcd46b78a 100644 --- a/main/gstreamer/APKBUILD +++ b/main/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gstreamer -pkgver=0.10.25 +pkgver=0.10.29 pkgrel=0 pkgdesc="GStreamer Multimedia Framework" url="http://gstreamer.freedesktop.org/" @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 cd "$pkgdir"/usr/bin } -md5sums="88544e034a051baf472983791d233076 gstreamer-0.10.25.tar.bz2" +md5sums="c92d6bce4fc65fa9d5a3ad35cdd1a466 gstreamer-0.10.29.tar.bz2" diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD index 9ce2d3cce4..07fba13ccf 100644 --- a/main/gtk+/APKBUILD +++ b/main/gtk+/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk+ -pkgver=2.20.0 -pkgrel=0 +pkgver=2.20.1 +pkgrel=1 pkgdesc="The GTK+ Toolkit (v2)" url="http://www.gtk.org/" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" @@ -34,7 +34,7 @@ makedepends="pkgconfig zlib-dev" source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2" -depends_dev="atk-dev pango-dev cairo-dev glib-dev" +depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool" build() { cd "$srcdir"/gtk+-$pkgver ./configure --prefix=/usr \ @@ -57,4 +57,4 @@ dev() { mv "$pkgdir"/usr/share/gir* "$subpkgdir"/usr/share/ } -md5sums="5517f78b1eb9b1eb60bd48a0152d09e6 gtk+-2.20.0.tar.bz2" +md5sums="53e6f3a93bd22934878fc4a4a34c68aa gtk+-2.20.1.tar.bz2" diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD index 9c86f49ccf..7b80401752 100644 --- a/main/gtk-doc/APKBUILD +++ b/main/gtk-doc/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk-doc -pkgver=1.13 +pkgver=1.14 pkgrel=0 pkgdesc="Documentation tool for public library API" url="http://www.gtk.org/gtk-doc/" license="GPL FDL" depends="docbook-xsl gnome-doc-utils perl pkgconfig" -makedepends="rarian-dev" +makedepends="rarian-dev py-libxml2 gettext" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2" build() { @@ -20,4 +20,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="27940d6cd5c9dcda8fc003043d8c299a gtk-doc-1.13.tar.bz2" +md5sums="7aa8a1262c70692ebbdf33395fddd5c4 gtk-doc-1.14.tar.bz2" diff --git a/main/gtk-vnc/APKBUILD b/main/gtk-vnc/APKBUILD index 5e03a8c9f0..a321b86788 100644 --- a/main/gtk-vnc/APKBUILD +++ b/main/gtk-vnc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk-vnc pkgver=0.3.10 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC viewer widget for GTK" url="http://live.gnome.org/gtk-vnc" license="LGPL" diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD index d83f314ecb..888c79f383 100644 --- a/main/gtk-xfce-engine/APKBUILD +++ b/main/gtk-xfce-engine/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk-xfce-engine pkgver=2.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A port of Xfce engine to GTK+-2.0" url="http://www.xfce.org/" license="GPL-2" diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD index 2a7609e0d6..8850b0f1fa 100644 --- a/main/guile/APKBUILD +++ b/main/guile/APKBUILD @@ -1,22 +1,25 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=guile pkgver=1.8.7 -pkgrel=0 +pkgrel=2 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" license="GPL" subpackages="$pkgname-dev $pkgname-doc" -makedepends="gmp-dev libtool ncurses-dev texinfo" +makedepends="gmp5-dev libtool ncurses-dev texinfo" depends= install= source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --disable-error-on-warning || return 1 make LDFLAGS+="-lpthread" || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD index e6c6c31613..1d3510ac93 100644 --- a/main/gzip/APKBUILD +++ b/main/gzip/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gzip pkgver=1.4 -pkgrel=0 +pkgrel=1 pkgdesc="A popular data compression program" subpackages="$pkgname-doc" url="http://www.gnu.org/software/gzip/" diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD index 2c4e08e493..9e86e354f4 100644 --- a/main/haserl/APKBUILD +++ b/main/haserl/APKBUILD @@ -1,20 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=haserl pkgver=0.9.25 -pkgrel=1 +pkgrel=2 pkgdesc="Html And Shell Embedded Report Language" url="http://haserl.sourceforge.net/" license="GPL-2" -depends="lua uclibc" +depends= makedepends="lua-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-lua || return 1 make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install chmod 4111 "$pkgdir"/usr/bin/haserl } diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index e98d9cf016..cb867c72a1 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> pkgname=heimdal pkgver=1.3.1 -pkgrel=4 +pkgrel=5 pkgdesc="An implementation of Kerberos 5" url="http://www.h5l.org/" license="BSD" diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD index c08847fdcb..915792b2d4 100644 --- a/main/hostapd/APKBUILD +++ b/main/hostapd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=hostapd pkgver=0.6.10 -pkgrel=0 +pkgrel=2 pkgdesc="daemon for wireless software access points" url="http://hostap.epitest.fi/hostapd/" license="custom" diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD index cb62c3a55c..7d27031cc9 100644 --- a/main/htop/APKBUILD +++ b/main/htop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer:Carlo Landmeter pkgname=htop pkgver=0.8.3 -pkgrel=0 +pkgrel=1 pkgdesc="An interactive process viewer for Linux" url="http://htop.sourceforge.net" license='GPL' diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD index 6883855aee..efd3476c39 100644 --- a/main/hunspell/APKBUILD +++ b/main/hunspell/APKBUILD @@ -1,23 +1,25 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=hunspell -pkgver=1.2.8 +pkgver=1.2.11 pkgrel=0 pkgdesc="Spell checker and morphological analyzer library and program" url="http://hunspell.sourceforge.net/" license="GPL LGPL MPL" subpackages="$pkgname-dev $pkgname-doc" -depends="libgcc uclibc++" -makedepends="uclibc++-dev" +depends= +makedepends= source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build () { cd "$srcdir/hunspell-$pkgver" - export CXX="${CXX_UC:-g++-uc}" - ./configure --prefix=/usr --disable-static || return 1 make || return 1 - make DESTDIR="$pkgdir" install || return 1 +} + +package() { + cd "$srcdir/hunspell-$pkgver" + make -j1 DESTDIR="$pkgdir" install || return 1 rm -rf "$pkgdir"/usr/share/locale/locale.alias } -md5sums="1177af54a09e320d2c24015f29c3a93e hunspell-1.2.8.tar.gz" +md5sums="8f57cdc4db091d69e1f682ed4d8ab282 hunspell-1.2.11.tar.gz" diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD index 42450d4678..06a868b933 100644 --- a/main/hylafax/APKBUILD +++ b/main/hylafax/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=hylafax pkgver=4.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="Sends and receives faxes" url="http://www.hylafax.org/" license="custom" diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD index baf9fa1025..d41cb8dbcd 100644 --- a/main/hypermail/APKBUILD +++ b/main/hypermail/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=hypermail pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mail Archiver" url="http://www.hypermail-project.org" license="GPL" diff --git a/main/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD index 7393e75454..786c07991e 100644 --- a/main/iaxmodem/APKBUILD +++ b/main/iaxmodem/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=iaxmodem pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX" url="http://iaxmodem.sourceforge.net/" license="GPL" diff --git a/main/iceauth/APKBUILD b/main/iceauth/APKBUILD index 30da7ad068..eed4225075 100644 --- a/main/iceauth/APKBUILD +++ b/main/iceauth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iceauth pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org ICE authority file utility" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD index f37e766468..df9de54b1d 100644 --- a/main/icu/APKBUILD +++ b/main/icu/APKBUILD @@ -1,21 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=icu -pkgver=4.4 +pkgver=4.4.1 _ver=4_2_1 pkgrel=0 pkgdesc="International Components for Unicode library" url="http://www.icu-project.org/" license="custom:icu" subpackages="$pkgname-dev $pkgname-doc" -depends="" -makedepends="uclibc++-dev" +depends= +makedepends= source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz" _builddir="$srcdir"/icu/source build() { cd "$_builddir" - export CXX=g++-uc ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man diff --git a/main/iftop/APKBUILD b/main/iftop/APKBUILD index db210d4933..ea750d2cdc 100644 --- a/main/iftop/APKBUILD +++ b/main/iftop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iftop pkgver=0.17 -pkgrel=0 +pkgrel=1 pkgdesc="iftop does for network usage what top(1) does for CPU usage" url="http://www.ex-parrot.com/~pdw/iftop/" license="GPL" diff --git a/main/igmpproxy/APKBUILD b/main/igmpproxy/APKBUILD index 2ec2c0189b..3bb9be97a5 100644 --- a/main/igmpproxy/APKBUILD +++ b/main/igmpproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=igmpproxy pkgver=0.1 -pkgrel=0 +pkgrel=1 pkgdesc="a simple dynamic Multicast Routing Daemon using only IGMP signalling" url="http://sourceforge.net/projects/igmpproxy/" license="GPL" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 982416a9d8..60ecebbec5 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.6.0.10 +pkgver=6.6.2.0 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -47,4 +47,4 @@ dev() { "$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/ } -md5sums="6aa19d1b08a0dfee5c78de864a8176e8 ImageMagick-6.6.0-10.tar.gz" +md5sums="d84ec4e436b0b4f79812ac89703777a6 ImageMagick-6.6.2-0.tar.gz" diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD index f7c788c2c0..547cf39667 100644 --- a/main/imap/APKBUILD +++ b/main/imap/APKBUILD @@ -5,7 +5,7 @@ # build it shared pkgname=imap pkgver=2007e -pkgrel=3 +pkgrel=5 pkgdesc="An IMAP/POP server" url="http://www.washington.edu/imap" license="APACHE" diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD index ff9944a9f8..fcd4e38a0e 100644 --- a/main/imlib2/APKBUILD +++ b/main/imlib2/APKBUILD @@ -1,23 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imlib2 -pkgver=1.4.2 -pkgrel=4 +pkgver=1.4.4 +pkgrel=0 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" license="BSD" subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev - libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev" + libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev util-linux-ng-dev" source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 - bufferoverflow.patch - libpng14.patch" + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -Np0 -i "$srcdir"/bufferoverflow.patch || return 1 - patch -Np1 -i "$srcdir"/libpng14.patch || return 1 } build() { @@ -36,6 +33,4 @@ package() { make DESTDIR=$pkgdir install || return 1 install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } -md5sums="9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2 -76def1fe0ac2ac1686ff24d29979606f bufferoverflow.patch -68f671641e298ef7eead0aded4087c53 libpng14.patch" +md5sums="b6de51879502e857d5b1f7622267a030 imlib2-1.4.4.tar.bz2" diff --git a/main/imlib2/bufferoverflow.patch b/main/imlib2/bufferoverflow.patch deleted file mode 100644 index 397b43fb8c..0000000000 --- a/main/imlib2/bufferoverflow.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/modules/loaders/loader_xpm.c -+++ src/modules/loaders/loader_xpm.c.new -@@ -246,8 +246,8 @@ - return 0; - } - ptr = im->data; -- end = ptr + (sizeof(DATA32) * w * h); - pixels = w * h; -+ end = ptr + pixels; - } - else - { - diff --git a/main/imlib2/libpng14.patch b/main/imlib2/libpng14.patch deleted file mode 100644 index 0409228401..0000000000 --- a/main/imlib2/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur imlib2-1.4.2-orig/src/modules/loaders/loader_png.c imlib2-1.4.2/src/modules/loaders/loader_png.c ---- imlib2-1.4.2-orig/src/modules/loaders/loader_png.c 2010-01-19 03:37:21.000000000 -0500 -+++ imlib2-1.4.2/src/modules/loaders/loader_png.c 2010-01-19 03:38:51.000000000 -0500 -@@ -38,7 +38,7 @@ - - /* if we haven't read the header before, set the header data */ - fread(buf, 1, PNG_BYTES_TO_CHECK, f); -- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) - { - fclose(f); - return 0; diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD index c9951eb81f..d133c9053f 100644 --- a/main/iperf/APKBUILD +++ b/main/iperf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iperf pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="tool to measure IP bandwidth using UDP or TCP" url="http://iperf.sourceforge.net/" license="GPL" diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index c031ed9cab..6ca2999109 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=2.6.31 -_realver=2.6.31 -pkgrel=0 +pkgver=2.6.33 +_realver=2.6.33 +pkgrel=1 pkgdesc="IP Routing Utilities" url="http://www.linux-foundation.org/en/Net:Iproute2" license="GPL2" @@ -31,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="230f35282a95451622f3e8394f9cd80a iproute2-2.6.31.tar.bz2" +md5sums="b371fca3fcb5e436e69a7c2111d84a3c iproute2-2.6.33.tar.bz2" diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD index a3da4fc175..4d8ef0d0c4 100644 --- a/main/ipsec-tools/APKBUILD +++ b/main/ipsec-tools/APKBUILD @@ -2,7 +2,7 @@ pkgname=ipsec-tools pkgver=0.8_alpha20090903 _myver=0.8-alpha20090903 -pkgrel=6 +pkgrel=8 pkgdesc="User-space IPsec tools for various IPsec implementations" url="http://ipsec-tools.sourceforge.net/" license="BSD" diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index 09c5ffb324..836131ddb3 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD @@ -3,7 +3,7 @@ pkgname=iptables pkgver=1.4.7 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.iptables.org/" license=GPL-2 diff --git a/main/iptraf/APKBUILD b/main/iptraf/APKBUILD index e8f0c496e0..152bbe4537 100644 --- a/main/iptraf/APKBUILD +++ b/main/iptraf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=iptraf pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="IP Network Monitoring Software" url="http://iptraf.seoul.org" license="GPL" diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD index 75cf4c5b91..b5d7e25db6 100644 --- a/main/iputils/APKBUILD +++ b/main/iputils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iputils pkgver=20100214 -pkgrel=0 +pkgrel=1 pkgdesc="IP Configuration Utilities (and Ping)" url="http://www.linuxfoundation.org/en/Net:Iputils" license="GPL" diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD index 2ff651e852..bcb44899ba 100644 --- a/main/ircii/APKBUILD +++ b/main/ircii/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ircii pkgver=20060725 -pkgrel=0 +pkgrel=1 pkgdesc="ircII is an IRC and ICB client that runs under most UNIX platforms." url="http://www.eterna.com.au/ircii/" license="GPL-2" diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD index e5e324c89a..59cbdb333a 100644 --- a/main/irssi/APKBUILD +++ b/main/irssi/APKBUILD @@ -1,7 +1,6 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=irssi -pkgver=0.8.14 -#_pkgver=0.8.14 +pkgver=0.8.15 pkgrel=1 pkgdesc="A modular textUI IRC client with IPv6 support" url="http://irssi.org/" @@ -11,8 +10,10 @@ makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig" source="http://irssi.org/files/irssi-${pkgver}.tar.bz2" subpackages="$pkgname-doc $pkgname-dev $pkgname-perl" +_builddir="$srcdir/$pkgname-$pkgver" + build() { - cd "$srcdir/$pkgname-${pkgver}" + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,13 +23,24 @@ build() { make DESTDIR="$pkgdir" install } +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + perl() { depends="$pkgname perl" + pkgdesc="Irssi perl support and scripts" mkdir -p "$subpkgdir"/usr/share/irssi mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/ mkdir -p "$subpkgdir"/usr/lib/irssi mv "$pkgdir"/usr/lib/irssi/modules "$subpkgdir"/usr/lib/irssi/ mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/ + #need write permission when stripping + chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/TextUI/TextUI.so + chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/Irssi.so + chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/Irc/Irc.so + chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/UI/UI.so } -md5sums="00efe7638dd596d5930dfa2aeae87b3a irssi-0.8.14.tar.bz2" +md5sums="1dcb3f511b88df94b0c996f36668c7da irssi-0.8.15.tar.bz2" diff --git a/main/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD index 673944079d..a53e628634 100644 --- a/main/iscsitarget/APKBUILD +++ b/main/iscsitarget/APKBUILD @@ -2,7 +2,7 @@ pkgname=iscsitarget pkgver=1.4.19 -pkgrel=0 +pkgrel=2 pkgdesc="Open Source iSCSI target with professional features - userspace utils" url="http://iscsitarget.sourceforge.net/" license="GPL-2" diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD index 9317a18485..d74cbd4342 100644 --- a/main/jasper/APKBUILD +++ b/main/jasper/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=jasper pkgver=1.900.1 -pkgrel=0 +pkgrel=1 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" url="http://www.ece.uvic.ca/~mdadams/jasper/" license="custom:JasPer2.0" diff --git a/main/jpeg/APKBUILD b/main/jpeg/APKBUILD index 9292022a99..e3bd30d10e 100644 --- a/main/jpeg/APKBUILD +++ b/main/jpeg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=jpeg pkgver=8 -pkgrel=0 +pkgrel=1 pkgdesc="JPEG image tools" url="http://www.ijg.org/" license="AS-IS" diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 2b64a76e81..84355bb18a 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kamailio -pkgver=1.5.3 -pkgrel=8 +pkgver=1.5.4 +pkgrel=1 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -126,7 +126,7 @@ unixodbc() { _mv_mod db_unixodbc } -md5sums="17eeea5cdc2fdd28b2f9a1bad6598de2 kamailio-1.5.3-notls_src.tar.gz +md5sums="127233aff2f20566b54f84555602132d kamailio-1.5.4-notls_src.tar.gz eb665248ee39cf755a247286affc5cbb kamailio.cfg 8ac6c260f090aea0ca344f18f9a2a904 kamailio.initd 3259980a45d9ad3fc6fca83414021d07 kamailio-backslash.patch" diff --git a/main/ksymoops/APKBUILD b/main/ksymoops/APKBUILD index d8cc04fdf7..9653627d63 100644 --- a/main/ksymoops/APKBUILD +++ b/main/ksymoops/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ksymoops pkgver=2.4.11 -pkgrel=0 +pkgrel=1 pkgdesc="A Linux kernel Oops file troubleshooting tool" url="ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4" license="GPL-2" -depends="uclibc" +depends="" makedepends="!gettext !libiconv" source="ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/v2.4/$pkgname-$pkgver.tar.bz2 $pkgname-2.4.11-build.patch diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD index 83fe97d158..9ebd4ed692 100644 --- a/main/lame/APKBUILD +++ b/main/lame/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lame -pkgver=3.98.3 +pkgver=3.98.4 _ver=398-2 pkgrel=0 pkgdesc="An MP3 encoder and graphical frame analyzer" diff --git a/main/less/APKBUILD b/main/less/APKBUILD index 188a7b91ca..7508a25fa7 100644 --- a/main/less/APKBUILD +++ b/main/less/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=less pkgver=436 -pkgrel=0 +pkgrel=1 pkgdesc="File pager" url="http://www.greenwoodsoftware.com/less/" license="GPL" -depends="uclibc ncurses" +depends= makedepends="ncurses-dev" install="$pkgname.post-deinstall" subpackages="$pkgname-doc" @@ -15,12 +15,15 @@ source="http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD index ffd61ae0f8..714b7cf2dd 100644 --- a/main/lftp/APKBUILD +++ b/main/lftp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=lftp -pkgver=4.0.5 -pkgrel=0 +pkgver=4.0.7 +pkgrel=1 pkgdesc="LFTP is sophisticated ftp/http client" url="http://lftp.yar.ru/" license="GPL" @@ -11,8 +11,10 @@ makedepends="openssl-dev readline-dev ncurses-dev gettext-dev" subpackages="$pkgname-doc" source="http://ftp.yars.free.net/pub/source/lftp/lftp-${pkgver}.tar.bz2" +_builddir="$srcdir/$pkgname-$pkgver" + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc/lftp \ @@ -25,8 +27,8 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make -j1 DESTDIR="$pkgdir" install } -md5sums="5400cad5f91e131ac2ded7c24aea594c lftp-4.0.5.tar.bz2" +md5sums="a40e4518fc477c82ffcc5b04d9ff64ff lftp-4.0.7.tar.bz2" diff --git a/main/lha/APKBUILD b/main/lha/APKBUILD index 705e51e077..5fc94b35bf 100644 --- a/main/lha/APKBUILD +++ b/main/lha/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=lha pkgver=1.14i -pkgrel=0 +pkgrel=1 pkgdesc="Compression and archive utility for LH-7 format archives" url="http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/" license="custom" subpackages="$pkgname-doc" -depends="uclibc" +depends="" makedepends="" install= source="http://osdn.dl.sourceforge.jp/lha/22231/$pkgname-$pkgver-ac20050924p1.tar.gz" diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD index a82ba46587..9c179172ff 100644 --- a/main/libao/APKBUILD +++ b/main/libao/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libao -pkgver=0.8.8 -pkgrel=1 +pkgver=1.0.0 +pkgrel=0 pkgdesc="Cross-platform audio output library and plugins" url="http://www.xiph.org/ao" license="GPL" subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc alsa-lib" +depends= makedepends="alsa-lib-dev" source="http://downloads.xiph.org/releases/ao/$pkgname-$pkgver.tar.gz" @@ -17,6 +17,10 @@ build () { --disable-esd \ --disable-arts make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="b92cba3cbcf1ee9bc221118a85d23dcd libao-0.8.8.tar.gz" +md5sums="08283fbe1f587619053a156254afecec libao-1.0.0.tar.gz" diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD index a9cf7776ad..0203cd5148 100644 --- a/main/libart-lgpl/APKBUILD +++ b/main/libart-lgpl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libart-lgpl pkgver=2.3.21 -pkgrel=0 +pkgrel=1 pkgdesc="A library for high-performance 2D graphics" url="http://www.levien.com/libart/" license="LGPL" diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD index 2b2498c49e..ee8a0d9792 100644 --- a/main/libassuan/APKBUILD +++ b/main/libassuan/APKBUILD @@ -1,18 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libassuan -pkgver=1.0.5 +pkgver=2.0.0 pkgrel=0 pkgdesc="Libassuan is the IPC library used by some GnuPG related software" url="ftp://ftp.gnupg.org/gcrypt/libgcrypt" license="GPL" -makedepends="pth-dev" -subpackages="$pkgname-doc" +depends= +makedepends="pth-dev libgpg-error-dev" +subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="c2db0974fcce4401f48f3fa41c4edc5a libassuan-1.0.5.tar.bz2" +md5sums="59bc0ae7194c412d7a522029005684b2 libassuan-2.0.0.tar.bz2" diff --git a/main/uclibc/0001-ldd-segfault-fix.patch b/main/libc0.9.32/0001-ldd-segfault-fix.patch index 4384fa548c..4384fa548c 100644 --- a/main/uclibc/0001-ldd-segfault-fix.patch +++ b/main/libc0.9.32/0001-ldd-segfault-fix.patch diff --git a/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch new file mode 100644 index 0000000000..2898a0d02d --- /dev/null +++ b/main/libc0.9.32/0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch @@ -0,0 +1,125 @@ +From 67403d1d692c3b8022b0adca127a2c14ef8e3237 Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Fri, 7 May 2010 11:28:27 +0300 +Subject: [PATCH 1/2] static build: fix internal locking weaks to get pulled in always + +Linker is smart and does not pull in weaks.os, ever. This happens +because that compilation unit does not get strong references and +ld eliminates dead code. We really need the weaks for static build +in a compilation unit that is always there, otherwise it won't work. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +--- + libc/misc/internals/__uClibc_main.c | 35 ++++++++++++++++++++++++++++++ + libc/misc/pthread/Makefile.in | 1 - + libc/misc/pthread/weaks.c | 40 ----------------------------------- + 3 files changed, 35 insertions(+), 41 deletions(-) + delete mode 100644 libc/misc/pthread/weaks.c + +diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c +index f7e45c6..f9e1244 100644 +--- a/libc/misc/internals/__uClibc_main.c ++++ b/libc/misc/internals/__uClibc_main.c +@@ -68,6 +68,41 @@ uintptr_t __guard attribute_relro; + */ + + void internal_function _dl_aux_init (ElfW(auxv_t) *av); ++ ++/* ++ * uClibc internal locking requires that we have weak aliases ++ * for dummy functions in case libpthread.a is not linked in. ++ * This needs to be in compilation unit that is pulled always ++ * in or linker will disregard these weaks. ++ */ ++ ++static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; } ++weak_alias (__pthread_return_0, __pthread_mutex_lock) ++weak_alias (__pthread_return_0, __pthread_mutex_trylock) ++weak_alias (__pthread_return_0, __pthread_mutex_unlock) ++ ++int weak_function ++__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) ++{ ++ return 0; ++} ++ ++void weak_function ++_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer, ++ void (*__routine) (void *), void *__arg) ++{ ++ __buffer->__routine = __routine; ++ __buffer->__arg = __arg; ++} ++ ++void weak_function ++_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer, ++ int __execute) ++{ ++ if (__execute) ++ __buffer->__routine(__buffer->__arg); ++} ++ + #endif /* !SHARED */ + + /* +diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in +index 69cdf10..2f436ac 100644 +--- a/libc/misc/pthread/Makefile.in ++++ b/libc/misc/pthread/Makefile.in +@@ -11,7 +11,6 @@ MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread + MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread + + libc-shared-$(UCLIBC_HAS_TLS) += $(MISC_PTHREAD_OUT)/tsd.os +-libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o + + objclean-y += CLEAN_libc/misc/pthread + +diff --git a/libc/misc/pthread/weaks.c b/libc/misc/pthread/weaks.c +deleted file mode 100644 +index fb1d85f..0000000 +--- a/libc/misc/pthread/weaks.c ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* The weak pthread functions for Linux. +- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ +- +-#include <libc-internal.h> +- +-/* Weaks for internal library use only. +- * +- * We need to define weaks here to cover all the pthread functions that +- * libc itself will use so that we aren't forced to link libc against +- * libpthread. This file is only used in libc.a and since we have +- * weaks here, they will be automatically overridden by libpthread.a +- * if it gets linked in. +- */ +- +-static int __pthread_return_0 (void) { return 0; } +-static void __pthread_return_void (void) { return; } +- +-weak_alias (__pthread_return_0, __pthread_mutex_init) +-weak_alias (__pthread_return_0, __pthread_mutex_lock) +-weak_alias (__pthread_return_0, __pthread_mutex_trylock) +-weak_alias (__pthread_return_0, __pthread_mutex_unlock) +-weak_alias (__pthread_return_void, _pthread_cleanup_push_defer) +-weak_alias (__pthread_return_void, _pthread_cleanup_pop_restore) +- +-- +1.6.3.3 + diff --git a/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch new file mode 100644 index 0000000000..562d648a6a --- /dev/null +++ b/main/libc0.9.32/0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch @@ -0,0 +1,69 @@ +From bfe9a589a402d4b6265e32b1b5ca0942efdcff3b Mon Sep 17 00:00:00 2001 +From: Timo Teras <timo.teras@iki.fi> +Date: Fri, 7 May 2010 11:30:04 +0300 +Subject: [PATCH 2/2] resolv: various memory corruption and off by one fixes + +Fixes resolution of names with AAAA entries and gethostbyaddr issues. + +Signed-off-by: Timo Teras <timo.teras@iki.fi> +--- + libc/inet/resolv.c | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c +index 84289a6..320aec4 100644 +--- a/libc/inet/resolv.c ++++ b/libc/inet/resolv.c +@@ -689,7 +689,7 @@ int attribute_hidden __decode_dotted(const unsigned char *packet, + + if (used + b + 1 >= dest_len) + return -1; +- if (offset + b + 1 >= packet_len) ++ if (offset + b >= packet_len) + return -1; + memcpy(dest + used, packet + offset, b); + offset += b; +@@ -2417,7 +2417,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + /* Layout in buf: + * char *alias[ALIAS_DIM]; + * struct in[6]_addr* addr_list[2]; +- * struct in[6]_addr* in; ++ * struct in[6]_addr in; + * char scratch_buffer[256+]; + */ + #define in6 ((struct in6_addr *)in) +@@ -2431,9 +2431,13 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + #ifndef __UCLIBC_HAS_IPV6__ + buf += sizeof(*in); + buflen -= sizeof(*in); ++ if (addrlen > sizeof(*in)) ++ return ERANGE; + #else + buf += sizeof(*in6); + buflen -= sizeof(*in6); ++ if (addrlen > sizeof(*in6)) ++ return ERANGE; + #endif + if ((ssize_t)buflen < 256) + return ERANGE; +@@ -2441,7 +2445,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + alias[1] = NULL; + addr_list[0] = in; + addr_list[1] = NULL; +- memcpy(&in, addr, addrlen); ++ memcpy(in, addr, addrlen); + + if (0) /* nothing */; + #ifdef __UCLIBC_HAS_IPV4__ +@@ -2456,7 +2460,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, + char *dst = buf; + unsigned char *tp = (unsigned char *)addr + addrlen - 1; + do { +- dst += sprintf(dst, "%x.%x.", tp[i] & 0xf, tp[i] >> 4); ++ dst += sprintf(dst, "%x.%x.", tp[0] & 0xf, tp[0] >> 4); + tp--; + } while (tp >= (unsigned char *)addr); + strcpy(dst, "ip6.arpa"); +-- +1.6.3.3 + diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD new file mode 100644 index 0000000000..0b7751f3e8 --- /dev/null +++ b/main/libc0.9.32/APKBUILD @@ -0,0 +1,106 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +_abiver=0.9.32 +pkgname=libc$_abiver +_gitver=100507 +pkgver=${_abiver}_alpha0_git$_gitver +pkgrel=3 +pkgdesc="C library for developing embedded Linux systems" +url=http://uclibc.org +license="LGPL-2" + +subpackages="uclibc-dev:dev uclibc-utils:utils" +depends_dev="linux-headers=>2.6.32" +#options="!strip" +replaces=uclibc + +_snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" +_snapfile="$pkgname-$pkgver.tar.bz2" +source="http://build.alpinelinux.org:8010/distfiles/$_snapfile + compat-stack-guard.patch + 0001-ldd-segfault-fix.patch + 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch + 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch + uclibc-libm-pic.patch + uclibc-resolv-tls.patch + uclibcconfig.x86 + uclibcconfig.i486 + " + +_config="$srcdir"/uclibcconfig.${ARCH:-x86} +_builddir="$srcdir"/master + +snapshot() { + local _date=$(date +%y%m%d%H%M) + pkgver=${_abiver}_alpha0_git$_gitver + + rm -f "$SRCDEST"/$_snapfile + wget -O "$SRCDEST"/$_snapfile $_snapurl + pkgrel=0 + sed -i -e "s/^_gitver=.*/_gitver=$(date +%y%m%d)/" \ + -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ + APKBUILD + checksum +} + +prepare() { + local i + cd "$_builddir" + # patches goes here + for i in ../*.patch ../*.diff; do + [ -r "$i" ] || continue + msg "Applying $i..." + patch -p1 < $i || return 1 + done + # set abi version and remove unsupported warnings c flag + sed -i -e "s/^ABI_VERSION.*/ABI_VERSION := $_abiver/" \ + -e "s/-Wold-style-declaration//g" \ + Rules.mak +} + +build() { + local _kh= + cd "$_builddir" + if [ -n "$SYSROOT" ]; then + _kh=KERNEL_HEADERS="$SYSROOT/include" + fi + cp "$_config" .config + make silentoldconfig + make -j1 pregen KERNEL_HEADERS="$SYSROOT"/usr/include \ + CROSS="$CROSS" || return 1 + make all KERNEL_HEADERS="$SYSROOT/usr/include" CROSS="$CROSS" || return 1 + make utils CROSS="$CROSS" || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" KERNEL_HEADERS="$SYSROOT/usr/include" \ + CROSS="$CROSS" install install_utils + install -Dm755 extra/scripts/getent "$pkgdir"/usr/bin/getent + # provided by linux-headers + rm -f "$pkgdir"/usr/include/scsi/scsi.h +} + +dev() { + default_dev + replaces=uclibc + mkdir "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ +} + +utils() { + pkgdesc="uClibc utility programs" + replaces=uclibc + mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin + mv "$pkgdir"/sbin/* "$subpkgdir"/sbin/ + mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ +} + +md5sums="46e98672dc2a4309d9a7c65b4e626845 libc0.9.32-0.9.32_alpha0_git100507.tar.bz2 +4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch +4079b20c763727863bc53408e4988434 0001-ldd-segfault-fix.patch +826666b365f2d63a71d67eb76c94f7bc 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch +0800a489a738c7b1d8c3643cb9806926 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch +2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch +d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch +e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 +e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" diff --git a/main/libc0.9.32/compat-stack-guard.patch b/main/libc0.9.32/compat-stack-guard.patch new file mode 100644 index 0000000000..71d78bac5a --- /dev/null +++ b/main/libc0.9.32/compat-stack-guard.patch @@ -0,0 +1,51 @@ +diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c +index 125cf96..bb47952 100644 +--- a/ldso/ldso/ldso.c ++++ b/ldso/ldso/ldso.c +@@ -101,10 +101,10 @@ extern void _start(void); + #ifdef __UCLIBC_HAS_SSP__ + # include <dl-osinfo.h> + uintptr_t stack_chk_guard; ++uintptr_t __stack_chk_guard attribute_relro; + # ifndef THREAD_SET_STACK_GUARD + /* Only exported for architectures that don't store the stack guard canary + * in local thread area. */ +-uintptr_t __stack_chk_guard attribute_relro; + # ifdef __UCLIBC_HAS_SSP_COMPAT__ + strong_alias(__stack_chk_guard,__guard) + # endif +@@ -935,13 +935,12 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, + #ifdef __UCLIBC_HAS_SSP__ + /* Set up the stack checker's canary. */ + stack_chk_guard = _dl_setup_stack_chk_guard (); ++ __stack_chk_guard = stack_chk_guard; + # ifdef THREAD_SET_STACK_GUARD + THREAD_SET_STACK_GUARD (stack_chk_guard); + # ifdef __UCLIBC_HAS_SSP_COMPAT__ + __guard = stack_chk_guard; + # endif +-# else +- __stack_chk_guard = stack_chk_guard; + # endif + #endif + +diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c +index f7e45c6..b527068 100644 +--- a/libc/misc/internals/__uClibc_main.c ++++ b/libc/misc/internals/__uClibc_main.c +@@ -43,13 +43,13 @@ void *__libc_stack_end = NULL; + + # ifdef __UCLIBC_HAS_SSP__ + # include <dl-osinfo.h> ++/* for gcc-4.1 non-TLS */ ++uintptr_t __stack_chk_guard attribute_relro; + # ifndef THREAD_SET_STACK_GUARD + /* Only exported for architectures that don't store the stack guard canary + * in thread local area. */ + # include <stdint.h> + uintptr_t stack_chk_guard; +-/* for gcc-4.1 non-TLS */ +-uintptr_t __stack_chk_guard attribute_relro; + /* for gcc-3.x + Etoh ssp */ + # ifdef __UCLIBC_HAS_SSP_COMPAT__ + # ifdef __HAVE_SHARED__ diff --git a/main/libc0.9.32/uclibc-libm-pic.patch b/main/libc0.9.32/uclibc-libm-pic.patch new file mode 100644 index 0000000000..ad87b78b24 --- /dev/null +++ b/main/libc0.9.32/uclibc-libm-pic.patch @@ -0,0 +1,67 @@ +GCC can emit prologue/epilogue code for the functions in various +different cases: + - frame pointers + - PIC build (to load ebx for indirect calls/jumps) + - forced stack smashing protection + +If we used jump in such cases, we'd corrupt the call stack and +crash. + +Signed-off-by: Timo Teräs <timo.teras at iki.fi> +--- + libm/ldouble_wrappers.c | 12 +++++++----- + 1 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c +index 7d5af90..5b424dc 100644 +--- a/libm/ldouble_wrappers.c ++++ b/libm/ldouble_wrappers.c +@@ -60,7 +60,9 @@ long long func##l(long double x) \ + * The return value is returned in st(0) per ABI in both cases (returning + * a long double or returning a double). So we can simply jump to func. + * Using __GI_func in jump to make optimized intra-library jump. +- * gcc will still generate a useless "ret" after asm. Oh well... ++ * ++ * We do need to use call (instead of tail jump) as gcc can create ++ * stack frame, and push/modify/pop ebx during PIC build. + */ + # define WRAPPER1(func) \ + long double func##l(long double x) \ +@@ -69,7 +71,7 @@ long double func##l(long double x) \ + __asm ( \ + " fldt %1\n" \ + " fstpl %1\n" \ +- " jmp " __stringify(__GI_##func) "\n" \ ++ " call " __stringify(__GI_##func) "\n" \ + : "=t" (st_top) \ + : "m" (x) \ + ); \ +@@ -82,7 +84,7 @@ int func##l(long double x) \ + __asm ( \ + " fldt %1\n" \ + " fstpl %1\n" \ +- " jmp " __stringify(__GI_##func) "\n" \ ++ " call " __stringify(__GI_##func) "\n" \ + : "=a" (ret) \ + : "m" (x) \ + ); \ +@@ -95,7 +97,7 @@ long func##l(long double x) \ + __asm ( \ + " fldt %1\n" \ + " fstpl %1\n" \ +- " jmp " __stringify(__GI_##func) "\n" \ ++ " call " __stringify(__GI_##func) "\n" \ + : "=a" (ret) \ + : "m" (x) \ + ); \ +@@ -108,7 +110,7 @@ long long func##l(long double x) \ + __asm ( \ + " fldt %1\n" \ + " fstpl %1\n" \ +- " jmp " __stringify(__GI_##func) "\n" \ ++ " call " __stringify(__GI_##func) "\n" \ + : "=A" (ret) \ + : "m" (x) \ + ); \ +-- +1.7.0.4 diff --git a/main/libc0.9.32/uclibc-resolv-tls.patch b/main/libc0.9.32/uclibc-resolv-tls.patch new file mode 100644 index 0000000000..45a228517b --- /dev/null +++ b/main/libc0.9.32/uclibc-resolv-tls.patch @@ -0,0 +1,15 @@ +diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c +index 320aec4..f8066d2 100644 +--- a/libc/inet/resolv.c ++++ b/libc/inet/resolv.c +@@ -2916,8 +2916,8 @@ static void res_sync_func(void) + __nameserver[n].sa4 = rp->nsaddr_list[n]; /* struct copy */ + #endif + } +- __resolv_timeout = rp->retrans; +- __resolv_attempts = rp->retry; ++ __resolv_timeout = rp->retrans ?: RES_TIMEOUT; ++ __resolv_attempts = rp->retry ?: RES_DFLRETRY; + /* Extend and comment what program is known + * to use which _res.XXX member(s). + diff --git a/main/libc0.9.32/uclibcconfig.i486 b/main/libc0.9.32/uclibcconfig.i486 new file mode 120000 index 0000000000..6ab0f7e5d3 --- /dev/null +++ b/main/libc0.9.32/uclibcconfig.i486 @@ -0,0 +1 @@ +uclibcconfig.x86
\ No newline at end of file diff --git a/main/uclibc/uclibcconfig.x86 b/main/libc0.9.32/uclibcconfig.x86 index 78835525f8..1368b58ec0 100644 --- a/main/uclibc/uclibcconfig.x86 +++ b/main/libc0.9.32/uclibcconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.30.1 -# Mon Jun 15 09:42:10 2009 +# Version: 0.9.32-git +# Fri May 7 11:46:52 2010 # # TARGET_alpha is not set # TARGET_arm is not set @@ -66,6 +66,7 @@ ARCH_USE_MMU=y UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y +DO_XSI_MATH=y UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="/usr/include" @@ -82,17 +83,21 @@ HAVE_SHARED=y FORCE_SHAREABLE_TEXT_SEGMENTS=y LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y +LDSO_PRELOAD_ENV_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" UCLIBC_STATIC_LDCONFIG=y LDSO_RUNPATH=y +LDSO_SEARCH_INTERP_PATH=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set +# LINUXTHREADS_OLD is not set +# LINUXTHREADS_NEW is not set +UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y +UCLIBC_HAS_TLS=y # PTHREADS_DEBUG_SUPPORT is not set -# LINUXTHREADS_OLD is not set -LINUXTHREADS_NEW=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set @@ -103,6 +108,7 @@ UCLIBC_DYNAMIC_ATEXIT=y COMPAT_ATEXIT=y UCLIBC_SUSV3_LEGACY=y UCLIBC_SUSV3_LEGACY_MACROS=y +UCLIBC_SUSV4_LEGACY=y # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y @@ -111,11 +117,13 @@ UCLIBC_HAS_PTY=y ASSUME_DEVPTS=y UNIX98PTY_ONLY=y # UCLIBC_HAS_GETPT is not set +UCLIBC_HAS_LIBUTIL=y UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y UCLIBC_HAS_TZ_FILE_READ_MANY=y UCLIBC_TZ_FILE_PATH="/etc/TZ" +UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y # # Advanced Library Settings @@ -152,6 +160,10 @@ UCLIBC_HAS_REENTRANT_RPC=y UCLIBC_USE_NETLINK=y UCLIBC_SUPPORT_AI_ADDRCONFIG=y UCLIBC_HAS_BSD_RES_CLOSE=y +UCLIBC_HAS_COMPAT_RES_STATE=y +# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set +UCLIBC_HAS_LIBRESOLV_STUB=y +# UCLIBC_HAS_LIBNSL_STUB is not set # # String and Stdio Support @@ -192,6 +204,7 @@ UCLIBC_HAS_ERRNO_MESSAGES=y UCLIBC_HAS_SIGNUM_MESSAGES=y # UCLIBC_HAS_SYS_SIGLIST is not set UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_STDIO_FUTEXES=y UCLIBC_HAS_GNU_GETSUBOPT=y # @@ -202,6 +215,7 @@ UCLIBC_HAS_REGEX_OLD=y UCLIBC_HAS_FNMATCH=y # UCLIBC_HAS_FNMATCH_OLD is not set UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y @@ -209,9 +223,10 @@ UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr" +MULTILIB_DIR="lib" +# HARDWIRED_ABSPATH is not set # # Security options @@ -224,7 +239,7 @@ UCLIBC_HAS_SSP_COMPAT=y # SSP_QUICK_CANARY is not set # PROPOLICE_BLOCK_ABRT is not set PROPOLICE_BLOCK_SEGV=y -UCLIBC_BUILD_SSP=y +# UCLIBC_BUILD_SSP is not set UCLIBC_BUILD_RELRO=y UCLIBC_BUILD_NOW=y UCLIBC_BUILD_NOEXECSTACK=y @@ -235,12 +250,12 @@ UCLIBC_BUILD_NOEXECSTACK=y CROSS_COMPILER_PREFIX="" UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set -# DOSTRIP is not set +DOSTRIP=y # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set WARNINGS="-Wall" -# EXTRA_WARNINGS is not set +EXTRA_WARNINGS=y # DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD index 61b526ccc9..e379bee196 100644 --- a/main/libcap/APKBUILD +++ b/main/libcap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libcap pkgver=2.19 -pkgrel=0 +pkgrel=1 pkgdesc="POSIX 1003.1e capabilities" license="GPL" url="http://www.friedhoff.org/posixfilecaps.html" diff --git a/main/libconfig/APKBUILD b/main/libconfig/APKBUILD index cd2d6e0010..b566400aa7 100644 --- a/main/libconfig/APKBUILD +++ b/main/libconfig/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libconfig pkgver=1.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="a simple library for manipulating structured configuration files" url="http://www.hyperrealm.com/libconfig/" license='LGPL' diff --git a/main/libcroco/APKBUILD b/main/libcroco/APKBUILD index 47a289667f..4c0e8ef4f3 100644 --- a/main/libcroco/APKBUILD +++ b/main/libcroco/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libcroco pkgver=0.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME CSS2 parsing and manipulation toolkit" url="http://www.gnome.org" license="LGPL" diff --git a/main/libdnet/APKBUILD b/main/libdnet/APKBUILD index 8544bb90b8..881accbd53 100644 --- a/main/libdnet/APKBUILD +++ b/main/libdnet/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libdnet pkgver=1.12 +pkgrel=1 pkgdesc="A simplified, portable interface to several low-level networking routines" url="http://code.google.com/p/libdnet/" license="BSD" @@ -22,6 +23,10 @@ build () --without-python make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } md5sums="9253ef6de1b5e28e9c9a62b882e44cc9 libdnet-1.12.tgz" diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD index 3e265a0095..9138bbf45c 100644 --- a/main/libdrm/APKBUILD +++ b/main/libdrm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libdrm pkgver=2.4.20 -pkgrel=0 +pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" url="http://dri.freedesktop.org/" license="custom" diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD index bf490ed236..8356039e89 100644 --- a/main/libetpan/APKBUILD +++ b/main/libetpan/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libetpan -pkgver=0.58 -pkgrel=2 +pkgver=1.0 +pkgrel=0 _dbver=4.8 pkgdesc="a portable middleware for email access" url="http://www.etpan.org/" @@ -15,7 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t build () { cd "$srcdir"/$pkgname-$pkgver - sed -e "s/db-4.4/db-${_dbver}/g" -i configure || return 1 +# sed -e "s/db-4.4/db-${_dbver}/g" -i configure || return 1 ./configure --prefix=/usr \ --disable-static @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/license.txt } -md5sums="bf20b5c0548f06b94bc588afdf5b3436 libetpan-0.58.tar.gz" +md5sums="5addc766141a0b1d29ee1ca4ba1b6808 libetpan-1.0.tar.gz" diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD index a90b96781e..f744779856 100644 --- a/main/libevent/APKBUILD +++ b/main/libevent/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libevent pkgver=1.4.13 -pkgrel=0 +pkgrel=1 pkgdesc="An event notification library" url="http://www.monkey.org/~provos/libevent/" license="GPL-2" diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD index ba829f8b89..83546b1c8e 100644 --- a/main/libexif/APKBUILD +++ b/main/libexif/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libexif pkgver=0.6.19 -pkgrel=0 +pkgrel=1 pkgdesc="A library to parse an EXIF file and read the data from those tags" url="http://sourceforge.net/projects/libexif" license="LGPL" diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD index 3ef7415023..39b3ba3a39 100644 --- a/main/libffi/APKBUILD +++ b/main/libffi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libffi pkgver=3.0.9 -pkgrel=0 +pkgrel=1 pkgdesc="A portable, high level programming interface to various calling conventions." url="http://sourceware.org/libffi" license="MIT" diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD index 7dac13ea89..e7b1e30b91 100644 --- a/main/libfontenc/APKBUILD +++ b/main/libfontenc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libfontenc pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="X11 font encoding library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD index 644c2696bb..9f8c2044d9 100644 --- a/main/libgcrypt/APKBUILD +++ b/main/libgcrypt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgcrypt pkgver=1.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="general purpose crypto library based on the code used in GnuPG" url="http://www.gnupg.org" license="LGPL" diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD index 3a4b079e39..3b8f67e699 100644 --- a/main/libglade/APKBUILD +++ b/main/libglade/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libglade pkgver=2.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="Allows you to load glade interface files in a program at runtime" url="http://www.gnome.org" license="LGPL" diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD index 24cac43606..2ae2c026ef 100644 --- a/main/libgpg-error/APKBUILD +++ b/main/libgpg-error/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgpg-error pkgver=1.7 -pkgrel=0 +pkgrel=1 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" license="LGPL" -depends="uclibc" +depends="" subpackages="$pkgname-dev $pkgname-lisp" source="ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 nocxx.patch diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD index ae307f6704..3f34d31504 100644 --- a/main/libgsf/APKBUILD +++ b/main/libgsf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgsf -pkgver=1.14.16 -pkgrel=0 +pkgver=1.14.18 +pkgrel=1 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats." url="http://www.gnome.org/" license="GPL LGPL" @@ -10,7 +10,7 @@ depends= makedepends="libxml2-dev glib-dev bzip2-dev intltool python zlib-dev" source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.bz2" -depends_dev="glib-dev libxml2-dev pkgconfig" +depends_dev="glib-dev bzip2-dev libxml2-dev pkgconfig" build() { cd "$srcdir"/$pkgname-$pkgver @@ -31,4 +31,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -md5sums="8478d83fda0b6e57f36550c11a693ee1 libgsf-1.14.16.tar.bz2" +md5sums="2c15d875b1931c40c7e7a2368f3ed948 libgsf-1.14.18.tar.bz2" diff --git a/main/libice/APKBUILD b/main/libice/APKBUILD index 4cf8058d97..5da1d87727 100644 --- a/main/libice/APKBUILD +++ b/main/libice/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libice pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Inter-Client Exchange library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libiconv/APKBUILD b/main/libiconv/APKBUILD index 6cd441ca6e..0ad6f62721 100644 --- a/main/libiconv/APKBUILD +++ b/main/libiconv/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=libiconv pkgver=1.12 -pkgrel=0 +pkgrel=1 pkgdesc="GNU charset conversion library for libc which doesn't implement it" url="http://www.gnu.org/software/libiconv" license='LGPL' -depends="uclibc" +depends="" source="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz" subpackages="$pkgname-doc $pkgname-dev" diff --git a/main/libid3tag/APKBUILD b/main/libid3tag/APKBUILD index 9410e353c6..1bd9c9562b 100644 --- a/main/libid3tag/APKBUILD +++ b/main/libid3tag/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=libid3tag pkgver=0.15.1b -pkgrel=0 +pkgrel=1 pkgdesc="id3 tagger for mp3" url="http://www.underbit.com/products/mad/" license="GPL" diff --git a/main/libidn/APKBUILD b/main/libidn/APKBUILD index cc4d7af2d6..b684e642bc 100644 --- a/main/libidn/APKBUILD +++ b/main/libidn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libidn pkgver=1.16 -pkgrel=0 +pkgrel=1 pkgdesc="An encode and decode library for internationalized domain names" url="http://www.gnu.org/software/libidn/" license="GPL" diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD index ae100b6210..ed719a0e20 100644 --- a/main/libksba/APKBUILD +++ b/main/libksba/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libksba -pkgver=1.0.3 +pkgver=1.0.7 pkgrel=0 pkgdesc="Libksba is a CMS and X.509 access library" url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" @@ -12,9 +12,12 @@ source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" build () { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums="91682491186d4ed43fff351aab2f5aad libksba-1.0.3.tar.bz2" +md5sums="eebce521a90600369c33c5fa6b9bbbd8 libksba-1.0.7.tar.bz2" diff --git a/main/libmad/APKBUILD b/main/libmad/APKBUILD index 72968faad7..f48894aed1 100644 --- a/main/libmad/APKBUILD +++ b/main/libmad/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmad pkgver=0.15.1b -pkgrel=0 +pkgrel=1 pkgdesc="A high-quality MPEG audio decoder" url="http://www.underbit.com/products/mad/" license="GPL" diff --git a/main/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD index 905d880f6f..76b6948cbc 100644 --- a/main/libmcrypt/APKBUILD +++ b/main/libmcrypt/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=libmcrypt pkgver=2.5.8 -pkgrel=0 +pkgrel=1 pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms" url="http://mcrypt.sourceforge.net/" license="GPL" -depends="uclibc" +depends="" makedepends="libtool uclibc++-dev" install= subpackages="$pkgname-doc $pkgname-dev" diff --git a/main/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD index 4b43958619..81f413e2d4 100644 --- a/main/libmpdclient/APKBUILD +++ b/main/libmpdclient/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmpdclient pkgver=2.1 -pkgrel=0 +pkgrel=1 pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages" url="http://mpd.wikia.com/wiki/Client:libmpdclient" license="GPL2" diff --git a/main/libmpeg2/APKBUILD b/main/libmpeg2/APKBUILD index 15704d0def..e933c8358e 100644 --- a/main/libmpeg2/APKBUILD +++ b/main/libmpeg2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmpeg2 pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams." url="http://libmpeg2.sourceforge.net/" license="GPL2" diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD index 8d341b2ed7..558f827b74 100644 --- a/main/libnet/APKBUILD +++ b/main/libnet/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Your Name <youremail@domain.com> pkgname=libnet pkgver=1.1.4 -pkgrel=0 +pkgrel=1 pkgdesc="A generic networking API that provides access to several protocols." url="http://sourceforge.net/projects/libnet-dev/" license="BSD" diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD index 1262fe4b2d..af9dc280f3 100644 --- a/main/libnetfilter_conntrack/APKBUILD +++ b/main/libnetfilter_conntrack/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnetfilter_conntrack pkgver=0.0.101 -pkgrel=0 +pkgrel=1 pkgdesc="programming interface (API) to the in-kernel connection tracking state table" url="http://www.netfilter.org/projects/libnetfilter_conntrack/" license="GPL-2" diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD index 69f887b384..cebfe70a56 100644 --- a/main/libnfnetlink/APKBUILD +++ b/main/libnfnetlink/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnfnetlink pkgver=1.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="low-level library for netfilter related kernel/userspace communication" url="http://www.netfilter.org/projects/libnfnetlink/" license="GPL-2" -depends="uclibc" +depends="" makedepends="" subpackages="$pkgname-dev" source="http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgver.tar.bz2" diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD index 9db755aef1..b63fb044ac 100644 --- a/main/libnl/APKBUILD +++ b/main/libnl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnl pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" url="http://people.suug.ch/~tgr/libnl" license="GPL" diff --git a/main/libnotify/APKBUILD b/main/libnotify/APKBUILD index 788d3b97f1..4d366af473 100644 --- a/main/libnotify/APKBUILD +++ b/main/libnotify/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnotify pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop notification library" url="http://www.galago-project.org/" license="LGPL" diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD index 13fc7688e1..5d5c37196f 100644 --- a/main/libogg/APKBUILD +++ b/main/libogg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libogg -pkgver=1.1.4 +pkgver=1.2.0 pkgrel=0 pkgdesc="Ogg bitstream and framing library" url="http://xiph.org/ogg/" @@ -17,9 +17,12 @@ build() { ./configure --prefix=/usr make || return 1 - make -j1 DESTDIR="$pkgdir" install +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="10200ec22543841d9d1c23e0aed4e5e9 libogg-1.1.4.tar.gz" +md5sums="c95b73759acfc30712beef6ce4e88efa libogg-1.2.0.tar.gz" diff --git a/main/liboil/APKBUILD b/main/liboil/APKBUILD index 57cdaa0e22..11a577a408 100644 --- a/main/liboil/APKBUILD +++ b/main/liboil/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=liboil pkgver=0.3.17 -pkgrel=0 +pkgrel=1 pkgdesc="Library of simple functions that are optimized for various CPUs." url="http://liboil.freedesktop.org/" license="custom" diff --git a/main/libpaper/APKBUILD b/main/libpaper/APKBUILD index 9650361f41..5cf53829d7 100644 --- a/main/libpaper/APKBUILD +++ b/main/libpaper/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpaper pkgver=1.1.23 -pkgrel=0 +pkgrel=1 pkgdesc="Library for handling paper characteristics" url="http://packages.debian.org/unstable/source/libpaper" license="GPL" diff --git a/main/libpcap/APKBUILD b/main/libpcap/APKBUILD index a4a9f7de79..4fc54bbcbd 100644 --- a/main/libpcap/APKBUILD +++ b/main/libpcap/APKBUILD @@ -1,34 +1,36 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpcap -pkgver=1.0.0 +pkgver=1.1.1 _sover=1.0.0 -pkgrel=2 +pkgrel=0 pkgdesc="A system-independent interface for user-level packet capture" url="http://www.tcpdump.org/" license="BSD" depends= makedepends="bison flex" source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz - $pkgname-1.0.0-LDFLAGS.patch - $pkgname-any.patch" + " subpackages="$pkgname-doc $pkgname-dev" -build () -{ - cd ${startdir}/src/${pkgname}-${pkgver} - for i in ../*.patch; do +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + [ -r "$i" ] || continue msg "Applying $i..." patch -p1 -i $i || return 1 done +} +build() { + cd "$_builddir" ./configure --prefix=/usr --enable-ipv6 - make all shared || return 1 +} + +package() { + cd "$_builddir" mkdir -p "$pkgdir/usr/bin" make -j1 DESTDIR="$pkgdir" install install-shared - ln -s libpcap.so.$_sover "$pkgdir"/usr/lib/libpcap.so.1 - ln -s libpcap.so.$_sover "$pkgdir"/usr/lib/libpcap.so } -md5sums="9ad1358c5dec48456405eac197a46d3d libpcap-1.0.0.tar.gz -2bf7e986980c6e5d99758ba55b48d706 libpcap-1.0.0-LDFLAGS.patch -1e6b01c4f283b497e81e137c3f35e744 libpcap-any.patch" +md5sums="1bca27d206970badae248cfa471bbb47 libpcap-1.1.1.tar.gz" diff --git a/main/libpcap/libpcap-1.0.0-LDFLAGS.patch b/main/libpcap/libpcap-1.0.0-LDFLAGS.patch deleted file mode 100644 index b2fe8d6fc1..0000000000 --- a/main/libpcap/libpcap-1.0.0-LDFLAGS.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'Makefile.in' ---- a/Makefile.in 2008-11-04 18:53:20 +0000 -+++ b/Makefile.in 2008-11-04 18:53:49 +0000 -@@ -328,7 +328,7 @@ - # - libpcap.so: $(OBJ) - @rm -f $@ -- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) - - # - # The following rule succeeds, but the result is untested. - diff --git a/main/libpcap/libpcap-any.patch b/main/libpcap/libpcap-any.patch deleted file mode 100644 index 7754513b88..0000000000 --- a/main/libpcap/libpcap-any.patch +++ /dev/null @@ -1,157 +0,0 @@ -commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808 -Author: guy <guy> -Date: Wed Nov 19 08:20:39 2008 +0000 - - Fix the handling of the "any" device, including making it reject - attempts to open it in monitor mode. - -diff --git a/pcap-linux.c b/pcap-linux.c -index 2a92d30..b18c4d2 100644 ---- a/pcap-linux.c -+++ b/pcap-linux.c -@@ -297,6 +297,12 @@ pcap_create(const char *device, char *ebuf) - { - pcap_t *handle; - -+ /* -+ * A null device name is equivalent to the "any" device. -+ */ -+ if (device == NULL) -+ device = "any"; -+ - #ifdef HAVE_DAG_API - if (strstr(device, "dag")) { - return dag_create(device, ebuf); -@@ -338,10 +344,9 @@ pcap_can_set_rfmon_linux(pcap_t *p) - struct iwreq ireq; - #endif - -- if (p->opt.source == NULL) { -+ if (strcmp(p->opt.source, "any") == 0) { - /* -- * This is equivalent to the "any" device, and we don't -- * support monitor mode on it. -+ * Monitor mode makes no sense on the "any" device. - */ - return 0; - } -@@ -518,12 +523,11 @@ pcap_activate_linux(pcap_t *handle) - handle->stats_op = pcap_stats_linux; - - /* -- * NULL and "any" are special devices which give us the hint to -- * monitor all devices. -+ * The "any" device is a special device which causes us not -+ * to bind to a particular device and thus to look at all -+ * devices. - */ -- if (!device || strcmp(device, "any") == 0) { -- device = NULL; -- handle->md.device = strdup("any"); -+ if (strcmp(device, "any") == 0) { - if (handle->opt.promisc) { - handle->opt.promisc = 0; - /* Just a warning. */ -@@ -531,10 +535,9 @@ pcap_activate_linux(pcap_t *handle) - "Promiscuous mode not supported on the \"any\" device"); - status = PCAP_WARNING_PROMISC_NOTSUP; - } -+ } - -- } else -- handle->md.device = strdup(device); -- -+ handle->md.device = strdup(device); - if (handle->md.device == NULL) { - snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s", - pcap_strerror(errno) ); -@@ -1657,19 +1660,21 @@ static int - activate_new(pcap_t *handle) - { - #ifdef HAVE_PF_PACKET_SOCKETS -+ const char *device = handle->opt.source; -+ int is_any_device = (strcmp(device, "any") == 0); - int sock_fd = -1, arptype, val; - int err = 0; - struct packet_mreq mr; -- const char* device = handle->opt.source; - - /* -- * Open a socket with protocol family packet. If a device is -- * given we try to open it in raw mode otherwise we use -- * the cooked interface. -+ * Open a socket with protocol family packet. If the -+ * "any" device was specified, we open a SOCK_DGRAM -+ * socket for the cooked interface, otherwise we first -+ * try a SOCK_RAW socket for the raw interface. - */ -- sock_fd = device ? -- socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) -- : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)); -+ sock_fd = is_any_device ? -+ socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) : -+ socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); - - if (sock_fd == -1) { - snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", -@@ -1704,7 +1709,7 @@ activate_new(pcap_t *handle) - * to cooked mode if we have an unknown interface type - * or a type we know doesn't work well in raw mode. - */ -- if (device) { -+ if (!is_any_device) { - /* Assume for now we don't need cooked mode. */ - handle->md.cooked = 0; - -@@ -1819,15 +1824,23 @@ activate_new(pcap_t *handle) - } - } else { - /* -- * This is cooked mode. -+ * The "any" device. -+ */ -+ if (handle->opt.rfmon) { -+ /* -+ * It doesn't support monitor mode. -+ */ -+ return PCAP_ERROR_RFMON_NOTSUP; -+ } -+ -+ /* -+ * It uses cooked mode. - */ - handle->md.cooked = 1; - handle->linktype = DLT_LINUX_SLL; - - /* - * We're not bound to a device. -- * XXX - true? Or true only if we're using -- * the "any" device? - * For now, we're using this as an indication - * that we can't transmit; stop doing that only - * if we figure out how to transmit in cooked -@@ -1852,10 +1865,13 @@ activate_new(pcap_t *handle) - - /* - * Hmm, how can we set promiscuous mode on all interfaces? -- * I am not sure if that is possible at all. -+ * I am not sure if that is possible at all. For now, we -+ * silently ignore attempts to turn promiscuous mode on -+ * for the "any" device (so you don't have to explicitly -+ * disable it in programs such as tcpdump). - */ - -- if (device && handle->opt.promisc) { -+ if (!is_any_device && handle->opt.promisc) { - memset(&mr, 0, sizeof(mr)); - mr.mr_ifindex = handle->md.ifindex; - mr.mr_type = PACKET_MR_PROMISC; -@@ -3118,7 +3134,7 @@ activate_old(pcap_t *handle) - - /* Bind to the given device */ - -- if (!device) { -+ if (strcmp(device, "any") == 0) { - strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems", - PCAP_ERRBUF_SIZE); - return PCAP_ERROR; diff --git a/main/libpciaccess/APKBUILD b/main/libpciaccess/APKBUILD index 1f5e636521..3ca31cda66 100644 --- a/main/libpciaccess/APKBUILD +++ b/main/libpciaccess/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpciaccess pkgver=0.11.0 -pkgrel=0 +pkgrel=1 pkgdesc="X11 PCI access library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD index 0f9716798a..70f15d01bc 100644 --- a/main/libpng/APKBUILD +++ b/main/libpng/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=libpng pkgver=1.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" license="GPL" diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD index 05467c5352..4094083a58 100644 --- a/main/libpri/APKBUILD +++ b/main/libpri/APKBUILD @@ -3,7 +3,7 @@ pkgname=libpri pkgver=1.4.11_alpha1 _pkgver=1.4.10.2 -pkgrel=0 +pkgrel=1 pkgdesc="Primary Rate ISDN (PRI) library" url="http://www.asterisk.orig" license="GPL" diff --git a/main/libpthread-stubs/APKBUILD b/main/libpthread-stubs/APKBUILD index 7ca630b435..843e47958e 100644 --- a/main/libpthread-stubs/APKBUILD +++ b/main/libpthread-stubs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpthread-stubs pkgver=0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Pthread functions stubs for platforms missing them" url="http://cgit.freedesktop.org/xcb/pthread-stubs" license="X11" diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD index 49b474f294..db58871110 100644 --- a/main/librsvg/APKBUILD +++ b/main/librsvg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=librsvg -pkgver=2.26.2 +pkgver=2.26.3 pkgrel=0 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="http://librsvg.sourceforge.net/" @@ -31,4 +31,4 @@ package() { rm -rf "$pkgdir"/usr/lib/mozilla } -md5sums="6bb1993f9180176e45d6084089f47aa8 librsvg-2.26.2.tar.bz2" +md5sums="8df68c2c02cdf2a96a92b43bf737bf9c librsvg-2.26.3.tar.bz2" diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD index 786d6c1e9a..71b38fb354 100644 --- a/main/libsamplerate/APKBUILD +++ b/main/libsamplerate/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsamplerate pkgver=0.1.7 -pkgrel=0 +pkgrel=1 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio" url="http://www.mega-nerd.com/SRC/index.html" subpackages="$pkgname-dev" license="GPL" -depends="uclibc" +depends="" source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz" build () { diff --git a/main/libsexy/APKBUILD b/main/libsexy/APKBUILD index 64488a0ad9..ad2f441bd5 100644 --- a/main/libsexy/APKBUILD +++ b/main/libsexy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsexy pkgver=0.1.11 -pkgrel=0 +pkgrel=1 pkgdesc="Doing naughty things to good widgets." url="http://chipx86.com/wiki/Libsexy" license="GPL" diff --git a/main/libsm/APKBUILD b/main/libsm/APKBUILD index 9f17e18a8d..63a7303c57 100644 --- a/main/libsm/APKBUILD +++ b/main/libsm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsm pkgver=1.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Session Management library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD index edfb932853..b315291db5 100644 --- a/main/libsndfile/APKBUILD +++ b/main/libsndfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsndfile pkgver=1.0.21 -pkgrel=0 +pkgrel=1 pkgdesc="A C library for reading and writing files containing sampled sound" url="http://www.mega-nerd.com/libsndfile" license="LGPL" diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD index ee3f8fd817..66a25b5af6 100644 --- a/main/libsoup/APKBUILD +++ b/main/libsoup/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsoup -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=0 pkgdesc="Gnome HTTP Library" url="http://www.gnome.org" @@ -27,4 +27,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="2d18154b869da541c2c0909b443f053a libsoup-2.30.0.tar.bz2" +md5sums="d80fb560a72370fba347785b00a750fb libsoup-2.30.1.tar.bz2" diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD index da5ba38415..b09ea23d6d 100644 --- a/main/libspf2/APKBUILD +++ b/main/libspf2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libspf2 pkgver=1.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair." url="http://www.libspf2.org" license="LGPL-2.1 BSD-2" diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD index 88a2964e1e..84b9653276 100644 --- a/main/libtasn1/APKBUILD +++ b/main/libtasn1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libtasn1 -pkgver=2.5 +pkgver=2.6 pkgrel=0 pkgdesc="The ASN.1 library used in GNUTLS" url="http://www.gnu.org/software/gnutls/" @@ -22,4 +22,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="e60b863697713c3d6a59b1e8c6f9b0d1 libtasn1-2.5.tar.gz" +md5sums="d410671e13038324336917ceed7470a5 libtasn1-2.6.tar.gz" diff --git a/main/libtheora/APKBUILD b/main/libtheora/APKBUILD index f17b0e8ac6..d608d36150 100644 --- a/main/libtheora/APKBUILD +++ b/main/libtheora/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libtheora pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open video codec developed by the Xiph.org" url="http://www.xiph.org" license="custom" diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD index f82cdc7ea2..6741c58dfd 100644 --- a/main/libtool/APKBUILD +++ b/main/libtool/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: judd <jvinet@zeroflux.org> pkgname=libtool pkgver=2.2.6b -pkgrel=0 +pkgrel=1 pkgdesc="A generic library support script" license='GPL' url="http://www.gnu.org/software/libtool" diff --git a/main/libunique/APKBUILD b/main/libunique/APKBUILD new file mode 100644 index 0000000000..59bd45083f --- /dev/null +++ b/main/libunique/APKBUILD @@ -0,0 +1,28 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libunique +pkgver=1.1.6 +pkgrel=1 +pkgdesc="Library for writing single instance applications" +url="http://live.gnome.org/LibUnique" +license="LGPL" +depends= +makedepends="pkgconfig gtk+-dev dbus-glib-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.1/$pkgname-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2" diff --git a/main/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD index 23e16cfa57..d9ac9a0b04 100644 --- a/main/libusb-compat/APKBUILD +++ b/main/libusb-compat/APKBUILD @@ -1,20 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libusb-compat pkgver=0.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Compatility for older libusb" url="http://libusb.sourceforge.net/" license="LGPL" subpackages="$pkgname-dev" -depends="uclibc libusb" +depends= makedepends="libusb-dev" source="http://downloads.sourceforge.net/libusb/$pkgname-$pkgver.tar.bz2" -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr --disable-build-docs make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } md5sums="652e1d9e6c6912fd924a5ad204f6d48b libusb-compat-0.1.0.tar.bz2" diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD index 7234ad31df..a9146298d1 100644 --- a/main/libusb/APKBUILD +++ b/main/libusb/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libusb pkgver=1.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Library to enable user space application programs to communicate with USB devices" url="http://libusb.sourceforge.net/" license="LGPL" subpackages="$pkgname-dev" -depends="uclibc" +depends="" makedepends="" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD index 07c2fc4d00..8296416768 100644 --- a/main/libvorbis/APKBUILD +++ b/main/libvorbis/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libvorbis -pkgver=1.2.3 +pkgver=1.3.1 pkgrel=0 pkgdesc="Vorbis codec library" url="http://www.xiph.org/ogg/vorbis/" @@ -17,7 +17,11 @@ build () ./configure --prefix=/usr \ --disable-static || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="5aa77f55c0e0aab8eb8ed982335daac8 libvorbis-1.2.3.tar.gz" +md5sums="016e523fac70bdd786258a9d15fd36e9 libvorbis-1.3.1.tar.gz" diff --git a/main/libwnck/APKBUILD b/main/libwnck/APKBUILD index 172e1d0e18..b6977f82eb 100644 --- a/main/libwnck/APKBUILD +++ b/main/libwnck/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libwnck pkgver=2.30.0 -pkgrel=0 +pkgrel=1 pkgdesc="Window Navigator Construction Kit" url="http://www.gnome.org/" license="LGPL" diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD index 78db7ccf2e..93dd4442b4 100644 --- a/main/libx11/APKBUILD +++ b/main/libx11/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libx11 pkgver=1.3.3 -pkgrel=0 +pkgrel=1 pkgdesc="X11 client-side library" url="http://xorg.freedesktop.org/" license="custom:XFREE86" diff --git a/main/libxau/APKBUILD b/main/libxau/APKBUILD index c6b7990630..888eb7ddd6 100644 --- a/main/libxau/APKBUILD +++ b/main/libxau/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxau pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="X11 authorisation library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxcb/APKBUILD b/main/libxcb/APKBUILD index a1b30a3519..6086b38d9e 100644 --- a/main/libxcb/APKBUILD +++ b/main/libxcb/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxcb -pkgver=1.5 +pkgver=1.6 pkgrel=0 pkgdesc="X11 client-side library" url="http://xcb.freedesktop.org/" license="custom" -depends="xcb-proto>=1.6" +depends="xcb-proto" subpackages="$pkgname-dev $pkgname-doc" makedepends="libxdmcp-dev libxau-dev libxslt libpthread-stubs pkgconfig python" source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2 @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="d19c0ba6ba42ebccd3d62d8bb147b551 libxcb-1.5.tar.bz2" +md5sums="cba9f6d1137ef00d9b326726d0bab6fd libxcb-1.6.tar.bz2" diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD index f2e48a9116..cad8427388 100644 --- a/main/libxcomposite/APKBUILD +++ b/main/libxcomposite/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxcomposite pkgver=0.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Composite extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxcursor/APKBUILD b/main/libxcursor/APKBUILD index bc9e33d4c3..2a83e866bf 100644 --- a/main/libxcursor/APKBUILD +++ b/main/libxcursor/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxcursor pkgver=1.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="X cursor management library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxdamage/APKBUILD b/main/libxdamage/APKBUILD index bf58651c00..338e425c73 100644 --- a/main/libxdamage/APKBUILD +++ b/main/libxdamage/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxdamage pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 damaged region extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxdmcp/APKBUILD b/main/libxdmcp/APKBUILD index f61c9e486b..2c6e7e823d 100644 --- a/main/libxdmcp/APKBUILD +++ b/main/libxdmcp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxdmcp pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Display Manager Control Protocol library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD index dbfb1b26da..87d7d248e3 100644 --- a/main/libxext/APKBUILD +++ b/main/libxext/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxext pkgver=1.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="X11 miscellaneous extensions library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxfce4menu/APKBUILD b/main/libxfce4menu/APKBUILD index 0023f2d931..7ba2bd6d5d 100644 --- a/main/libxfce4menu/APKBUILD +++ b/main/libxfce4menu/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfce4menu -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=0 pkgdesc="a freedesktop.org compliant menu implementation for Xfce" url="http://www.xfce.org/" @@ -11,8 +11,7 @@ makedepends="libxfce4util-dev intltool pkgconfig gtk+-dev gettext-dev libiconv-dev" source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -20,6 +19,10 @@ build () --localstatedir=/var \ --disable-static make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="5dc9343885c2c6f931318b2a1cdcc9db libxfce4menu-4.6.1.tar.bz2" +md5sums="ff10cacb76803ee37159e3a43345f0d1 libxfce4menu-4.6.2.tar.bz2" diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD index 7cfbd769d2..884378e579 100644 --- a/main/libxfce4util/APKBUILD +++ b/main/libxfce4util/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfce4util -pkgver=4.6.1 -pkgrel=1 +pkgver=4.6.2 +pkgrel=0 pkgdesc="Basic utility non-GUI functions for Xfce" url="http://www.xfce.org/" license="GPL-2" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig glib-dev gettext-dev libiconv-dev" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +makedepends="pkgconfig glib-dev gettext-dev libiconv-dev intltool" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" depends_dev="glib-dev" build() { @@ -25,4 +25,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="eac51d58179cbcadc3f802450a8ec9cd libxfce4util-4.6.1.tar.bz2" +md5sums="9c3129d827d480f0906c575e7a13f1e9 libxfce4util-4.6.2.tar.bz2" diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD index efb4c4d0f2..db84c19533 100644 --- a/main/libxfcegui4/APKBUILD +++ b/main/libxfcegui4/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfcegui4 -pkgver=4.6.3 -pkgrel=0 +pkgver=4.6.4 +pkgrel=1 pkgdesc="Basic GUI functions for Xfce" url="http://www.xfce.org/" license="GPL2" @@ -12,7 +12,7 @@ makedepends="pkgconfig intltool glib-dev gettext-dev libiconv-dev gtk+-dev libxfce4util-dev expat-dev" source="http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2" -depends_dev="gtk+-dev libxfce4util-dev xfconf-dev" +depends_dev="gtk+-dev libxfce4util-dev xfconf-dev libsm-dev" build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="a647411a0b95d45bb701beff83636307 libxfcegui4-4.6.3.tar.bz2" +md5sums="88de59b222cb9977f93a4c61011c1e1f libxfcegui4-4.6.4.tar.bz2" diff --git a/main/libxfixes/APKBUILD b/main/libxfixes/APKBUILD index 87e81e1b07..6e15f2c154 100644 --- a/main/libxfixes/APKBUILD +++ b/main/libxfixes/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfixes pkgver=4.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="X11 miscellaneous 'fixes' extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD index f8a2bb2509..3ce3622ef8 100644 --- a/main/libxfont/APKBUILD +++ b/main/libxfont/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfont pkgver=1.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="X11 font rasterisation library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxft/APKBUILD b/main/libxft/APKBUILD index 43b5a3c077..c9bcb99b86 100644 --- a/main/libxft/APKBUILD +++ b/main/libxft/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxft pkgver=2.1.14 -pkgrel=1 +pkgrel=2 pkgdesc="FreeType-based font drawing library for X" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD index 21fd77cec0..4f02be89c5 100644 --- a/main/libxi/APKBUILD +++ b/main/libxi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxi pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Input extension library" url="http://xorg.freedesktop.org" license="custom" diff --git a/main/libxinerama/APKBUILD b/main/libxinerama/APKBUILD index 589994d1bf..f0ea405cc8 100644 --- a/main/libxinerama/APKBUILD +++ b/main/libxinerama/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxinerama pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Xinerama extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD index 1298aed047..10aed96159 100644 --- a/main/libxkbfile/APKBUILD +++ b/main/libxkbfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxkbfile pkgver=1.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="X11 keyboard file manipulation library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxkbui/APKBUILD b/main/libxkbui/APKBUILD index e585174abb..eb53261bfb 100644 --- a/main/libxkbui/APKBUILD +++ b/main/libxkbui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxkbui pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 keyboard UI presentation library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxklavier/APKBUILD b/main/libxklavier/APKBUILD index adbce6f677..65f66aead1 100644 --- a/main/libxklavier/APKBUILD +++ b/main/libxklavier/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxklavier pkgver=5.0 -pkgrel=0 +pkgrel=1 pkgdesc="High-level API for X Keyboard Extension" url="http://gswitchit.sourceforge.net" license="LGPL" diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD index 58514b1eac..6c314eb567 100644 --- a/main/libxml2/APKBUILD +++ b/main/libxml2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=libxml2 -pkgver=2.7.6 -pkgrel=2 +pkgver=2.7.7 +pkgrel=0 pkgdesc="XML parsing library, version 2" url="http://www.xmlsoft.org/" license="MIT" @@ -10,8 +10,7 @@ depends= makedepends="zlib-dev python-dev" subpackages="$pkgname-doc $pkgname-dev py-$pkgname:py" source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - largefile64.patch - zlib.patch" + largefile64.patch" options="!strip" @@ -46,6 +45,5 @@ py() { } -md5sums="7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz -5ad4915665608ebfa5b89f7908467a72 largefile64.patch -0365d5397164b8739219e56e5ca069d1 zlib.patch" +md5sums="9abc9959823ca9ff904f1fbcf21df066 libxml2-2.7.7.tar.gz +5ad4915665608ebfa5b89f7908467a72 largefile64.patch" diff --git a/main/libxml2/zlib.patch b/main/libxml2/zlib.patch deleted file mode 100644 index 4bf486d127..0000000000 --- a/main/libxml2/zlib.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001 -From: Mark Adler <madler@alumni.caltech.edu> -Date: Tue, 19 Jan 2010 15:28:48 +0000 -Subject: libxml violates the zlib interface and crashes - -* xmlIO.c: remove an abuse of zlib API and use a clean interface - available in zlib >= 1.2.3 ---- -diff --git a/xmlIO.c b/xmlIO.c -index c03ac43..8fc00e3 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - #ifdef HAVE_ZLIB_H - if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) && - (strcmp(URI, "-") != 0)) { -+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230 -+ ret->compressed = !gzdirect(context); -+#else - if (((z_stream *)context)->avail_in > 4) { - char *cptr, buff4[4]; - cptr = (char *) ((z_stream *)context)->next_in; -@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - gzrewind(context); - } - } -+#endif - } - #endif - } --- -cgit v0.8.3.1 diff --git a/main/libxmu/APKBUILD b/main/libxmu/APKBUILD index 13343d781f..fb55cfa9ce 100644 --- a/main/libxmu/APKBUILD +++ b/main/libxmu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxmu pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="X11 miscellaneous micro-utility library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD index d1be1b7372..cb970fef79 100644 --- a/main/libxpm/APKBUILD +++ b/main/libxpm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxpm pkgver=3.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="X11 pixmap library" url="http://xorg.freedesktop.org/" license="custom:BELL" diff --git a/main/libxrandr/APKBUILD b/main/libxrandr/APKBUILD index e261af4f49..e433acc2b1 100644 --- a/main/libxrandr/APKBUILD +++ b/main/libxrandr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxrandr pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 RandR extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD index dc11755330..293610e2a4 100644 --- a/main/libxrender/APKBUILD +++ b/main/libxrender/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxrender pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="X Rendering Extension client library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxres/APKBUILD b/main/libxres/APKBUILD index f446812fd0..cc654c8b42 100644 --- a/main/libxres/APKBUILD +++ b/main/libxres/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxres pkgver=1.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Resource extension library" url="http://xorg.freedesktop.org" license="custom" diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD index 32353ba5ed..c4c9add3dc 100644 --- a/main/libxslt/APKBUILD +++ b/main/libxslt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxslt pkgver=1.1.26 -pkgrel=1 +pkgrel=2 pkgdesc="XML stylesheet transformation library" url="http://xmlsoft.org/XSLT/" license="custom" diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD index db0401e5d5..3bf47fe64f 100644 --- a/main/libxt/APKBUILD +++ b/main/libxt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxt pkgver=1.0.8 -pkgrel=0 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD index c1e9c4b60a..37eac75472 100644 --- a/main/libxtst/APKBUILD +++ b/main/libxtst/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxtst pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD index ca40f7fd16..c007003195 100644 --- a/main/libxv/APKBUILD +++ b/main/libxv/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxv pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Video extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxvmc/APKBUILD b/main/libxvmc/APKBUILD index 3233ba405e..871d1892bd 100644 --- a/main/libxvmc/APKBUILD +++ b/main/libxvmc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxvmc pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Video Motion Compensation extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxxf86dga/APKBUILD b/main/libxxf86dga/APKBUILD index 5ac4686604..238e7612e4 100644 --- a/main/libxxf86dga/APKBUILD +++ b/main/libxxf86dga/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxxf86dga pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Direct Graphics Access extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxxf86misc/APKBUILD b/main/libxxf86misc/APKBUILD index aa644d1805..c6dd2cb024 100644 --- a/main/libxxf86misc/APKBUILD +++ b/main/libxxf86misc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxxf86misc pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 XFree86 miscellaneous extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD index 1a7ebc4fda..87fe594de1 100644 --- a/main/libxxf86vm/APKBUILD +++ b/main/libxxf86vm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxxf86vm pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="X11 XFree86 video mode extension library" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD index 44125b0e94..5c03ed55a0 100644 --- a/main/lighttpd/APKBUILD +++ b/main/lighttpd/APKBUILD @@ -2,7 +2,7 @@ pkgname=lighttpd pkgver=1.4.26 _streamver=2.2.0 -pkgrel=2 +pkgrel=4 pkgdesc="a secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" license="custom" diff --git a/main/links/APKBUILD b/main/links/APKBUILD index 2d11cf9dba..bc2e3f32cf 100644 --- a/main/links/APKBUILD +++ b/main/links/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=links pkgver=2.2 -pkgrel=0 +pkgrel=2 pkgdesc="A text WWW browser, similar to Lynx" url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/" license="GPL" diff --git a/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch b/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch deleted file mode 100644 index 03ea13fa1e..0000000000 --- a/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch +++ /dev/null @@ -1,120 +0,0 @@ -From a60cfaf3df9cd0cddbc24695434ed5bfa917d505 Mon Sep 17 00:00:00 2001 -From: Neil Horman <nhorman@redhat.com> -Date: Mon, 29 Mar 2010 13:16:02 -0700 -Subject: [PATCH 06/18] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) - -Official patch to fix the r8169 frame length check error. - -Based on this initial thread: -http://marc.info/?l=linux-netdev&m=126202972828626&w=1 -This is the official patch to fix the frame length problems in the r8169 -driver. As noted in the previous thread, while this patch incurs a performance -hit on the driver, its possible to improve performance dynamically by updating -the mtu and rx_copybreak values at runtime to return performance to what it was -for those NICS which are unaffected by the ideosyncracy (if there are any). - -Summary: - - A while back Eric submitted a patch for r8169 in which the proper -allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too -much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A -long time prior to that however, Francois posted -126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize -setting due to the fact that the hardware behaved in odd ways when overlong -frames were received on NIC's supported by this driver. This was mentioned in a -security conference recently: -http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html - -It seems that if we can't enable frame size filtering, then, as Eric correctly -noticed, we can find ourselves DMA-ing too much data to a buffer, causing -corruption. As a result is seems that we are forced to allocate a frame which -is ready to handle a maximally sized receive. - -This obviously has performance issues with it, so to mitigate that issue, this -patch does two things: - -1) Raises the copybreak value to the frame allocation size, which should force -appropriately sized packets to get allocated on rx, rather than a full new 16k -buffer. - -2) This patch only disables frame filtering initially (i.e., during the NIC -open), changing the MTU results in ring buffer allocation of a size in relation -to the new mtu (along with a warning indicating that this is dangerous). - -Because of item (2), individuals who can't cope with the performance hit (or can -otherwise filter frames to prevent the bug), or who have hardware they are sure -is unaffected by this issue, can manually lower the copybreak and reset the mtu -such that performance is restored easily. - -Signed-off-by: Neil Horman <nhorman@redhat.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit c0cd884af045338476b8e69a61fceb3f34ff22f1) ---- - drivers/net/r8169.c | 29 ++++++++++++++++++++++++----- - 1 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c -index 24599b5..1484528 100644 ---- a/drivers/net/r8169.c -+++ b/drivers/net/r8169.c -@@ -186,7 +186,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = { - - MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); - --static int rx_copybreak = 200; -+/* -+ * we set our copybreak very high so that we don't have -+ * to allocate 16k frames all the time (see note in -+ * rtl8169_open() -+ */ -+static int rx_copybreak = 16383; - static int use_dac; - static struct { - u32 msg_enable; -@@ -3245,9 +3250,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev) - } - - static void rtl8169_set_rxbufsize(struct rtl8169_private *tp, -- struct net_device *dev) -+ unsigned int mtu) - { -- unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; -+ unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; -+ -+ if (max_frame != 16383) -+ printk(KERN_WARNING "WARNING! Changing of MTU on this NIC" -+ "May lead to frame reception errors!\n"); - - tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE; - } -@@ -3259,7 +3268,17 @@ static int rtl8169_open(struct net_device *dev) - int retval = -ENOMEM; - - -- rtl8169_set_rxbufsize(tp, dev); -+ /* -+ * Note that we use a magic value here, its wierd I know -+ * its done because, some subset of rtl8169 hardware suffers from -+ * a problem in which frames received that are longer than -+ * the size set in RxMaxSize register return garbage sizes -+ * when received. To avoid this we need to turn off filtering, -+ * which is done by setting a value of 16383 in the RxMaxSize register -+ * and allocating 16k frames to handle the largest possible rx value -+ * thats what the magic math below does. -+ */ -+ rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN); - - /* - * Rx and Tx desscriptors needs 256 bytes alignment. -@@ -3912,7 +3931,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu) - - rtl8169_down(dev); - -- rtl8169_set_rxbufsize(tp, dev); -+ rtl8169_set_rxbufsize(tp, dev->mtu); - - ret = rtl8169_init_ring(dev); - if (ret < 0) --- -1.7.0.2 - diff --git a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch b/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch deleted file mode 100644 index dff3fd2112..0000000000 --- a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d1c9ac562923fa0b1738fceb4c7bafac3ab936ba Mon Sep 17 00:00:00 2001 -From: Neil Horman <nhorman@tuxdriver.com> -Date: Thu, 1 Apr 2010 07:30:07 +0000 -Subject: [PATCH 08/18] r8169: clean up my printk uglyness - -Fix formatting on r8169 printk - -Brandon Philips noted that I had a spacing issue in my printk for the -last r8169 patch that made it quite ugly. Fix that up and add the PFX -macro to it as well so it looks like the other r8169 printks - -Signed-off-by: Neil Horman <nhorman@tuxdriver.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e) ---- - drivers/net/r8169.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c -index bed1d47..790555e 100644 ---- a/drivers/net/r8169.c -+++ b/drivers/net/r8169.c -@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct rtl8169_private *tp, - unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; - - if (max_frame != 16383) -- printk(KERN_WARNING "WARNING! Changing of MTU on this NIC" -- "May lead to frame reception errors!\n"); -+ printk(KERN_WARNING PFX "WARNING! Changing of MTU on this " -+ "NIC may lead to frame reception errors!\n"); - - tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE; - } --- -1.7.0.2 - diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 759d6716e3..538324b81d 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.32.11 +pkgver=2.6.32.14 _kernver=2.6.32 -pkgrel=2 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,15 +14,12 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.1.14-2.6.32.11-201004071936.patch + grsecurity-2.1.14-2.6.32.14-201005291720.patch 0001-grsec-revert-conflicting-flow-cache-changes.patch 0002-gre-fix-hard-header-destination-address-checking.patch 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 0004-arp-flush-arp-cache-on-device-change.patch - 0005-r8169-fix-broken-register-writes.patch - 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch 0007-r8169-Fix-rtl8169_rx_interrupt.patch - 0008-r8169-clean-up-my-printk-uglyness.patch 0009-ipsec-Fix-bogus-bundle-flowi.patch 0010-xfrm-Remove-xfrm_state_genid.patch 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch @@ -33,6 +30,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 0016-xfrm-remove-policy-garbage-collection.patch 0017-flow-delayed-deletion-of-flow-cache-entries.patch 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch + xfrm-fix-policy-unreferencing-on-larval-drop.patch kernelconfig.x86 " subpackages="$pkgname-dev linux-firmware:firmware" @@ -47,7 +45,8 @@ prepare() { fi # first apply the grsecurity patch and then the rest - for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch; do + for i in "$srcdir"/grsecurity*.patch "$srcdir"/0[0-9]*.patch \ + "$srcdir"/xfrm*; do [ -f $i ] || continue msg "Applying $i..." patch -s -p1 -N < $i || return 1 @@ -68,7 +67,9 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="${CC:--gcc}" || return 1 + make CC="${CC:--gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + || return 1 } package() { @@ -138,16 +139,13 @@ firmware() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -855c248334a71ef5ca3d8cb89d51334f patch-2.6.32.11.bz2 -6eabb0c08a988a97a823b5462d1c5018 grsecurity-2.1.14-2.6.32.11-201004071936.patch +90f0ec928aff643f05a8b98fad54b10c patch-2.6.32.14.bz2 +a9985ec4cf7a50beaa755b1ebde839c4 grsecurity-2.1.14-2.6.32.14-201005291720.patch 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch -afa06334c81f21c20571286a83d3d928 0005-r8169-fix-broken-register-writes.patch -c538c0f735d79fd71b47dde02bf1f790 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch 5f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch -f878c802700e3babd03be3505119c5c2 0008-r8169-clean-up-my-printk-uglyness.patch cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch 3af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch 9f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch @@ -158,4 +156,5 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch +c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch 7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch index 62c446bc3e..3e14e9ee25 100644 --- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch +++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alpha/include/asm/elf.h ---- linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/alpha/include/asm/elf.h linux-2.6.32.14/arch/alpha/include/asm/elf.h +--- linux-2.6.32.14/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alp /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.32.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/alpha/include/asm/pgtable.h linux-2.6.32.14/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.32.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha/kernel/module.c ---- linux-2.6.32.11/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/alpha/kernel/module.c linux-2.6.32.14/arch/alpha/kernel/module.c +--- linux-2.6.32.14/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/alpha/kernel/osf_sys.c linux-2.6.32.14/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400 @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alph if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/fault.c ---- linux-2.6.32.11/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/alpha/mm/fault.c linux-2.6.32.14/arch/alpha/mm/fault.c +--- linux-2.6.32.14/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/f } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/include/asm/elf.h ---- linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/include/asm/elf.h linux-2.6.32.14/arch/arm/include/asm/elf.h +--- linux-2.6.32.14/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/i /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -diff -urNp linux-2.6.32.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arch/arm/include/asm/kmap_types.h ---- linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/include/asm/kmap_types.h linux-2.6.32.14/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/include/asm/uaccess.h linux-2.6.32.14/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.14/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) @@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/a if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kernel/kgdb.c ---- linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/kernel/kgdb.c linux-2.6.32.14/arch/arm/kernel/kgdb.c +--- linux-2.6.32.14/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kerne #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach-at91/pm.c ---- linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-at91/pm.c linux-2.6.32.14/arch/arm/mach-at91/pm.c +--- linux-2.6.32.14/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach .valid = at91_pm_valid_state, .begin = at91_pm_begin, .enter = at91_pm_enter, -diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mach-omap1/pm.c ---- linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-omap1/pm.c linux-2.6.32.14/arch/arm/mach-omap1/pm.c +--- linux-2.6.32.14/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mac .prepare = omap_pm_prepare, .enter = omap_pm_enter, .finish = omap_pm_finish, -diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm .prepare = omap2_pm_prepare, .enter = omap2_pm_enter, .finish = omap2_pm_finish, -diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm .begin = omap3_pm_begin, .end = omap3_pm_end, .prepare = omap3_pm_prepare, -diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/m .enter = pnx4008_pm_enter, .valid = pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-pxa/pm.c ---- linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/pm.c linux-2.6.32.14/arch/arm/mach-pxa/pm.c +--- linux-2.6.32.14/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach- .valid = pxa_pm_valid, .enter = pxa_pm_enter, .prepare = pxa_pm_prepare, -diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c ---- linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/a .prepare = pxa_pm_prepare, .finish = pxa_pm_finish, .enter = corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/mach-sa1100/pm.c ---- linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mach-sa1100/pm.c linux-2.6.32.14/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/ma .enter = sa11x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault.c ---- linux-2.6.32.11/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mm/fault.c linux-2.6.32.14/arch/arm/mm/fault.c +--- linux-2.6.32.14/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c ---- linux-2.6.32.11/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/mm/mmap.c linux-2.6.32.14/arch/arm/mm/mmap.c +--- linux-2.6.32.14/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-s3c/pm.c ---- linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/arm/plat-s3c/pm.c linux-2.6.32.14/arch/arm/plat-s3c/pm.c +--- linux-2.6.32.14/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat- .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, -diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr32/include/asm/elf.h ---- linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/avr32/include/asm/elf.h linux-2.6.32.14/arch/avr32/include/asm/elf.h +--- linux-2.6.32.14/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/a }; #undef D -diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400 @@ -176,7 +176,7 @@ out: return 0; } @@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr3 .valid = avr32_pm_valid_state, .enter = avr32_pm_enter, }; -diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/fault.c ---- linux-2.6.32.11/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/avr32/mm/fault.c linux-2.6.32.14/arch/avr32/mm/fault.c +--- linux-2.6.32.14/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/f if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blackfin/kernel/kgdb.c ---- linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/blackfin/kernel/kgdb.c linux-2.6.32.14/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler */ } @@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blac .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/blackfin/mach-common/pm.c linux-2.6.32.14/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.14/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/b .enter = bfin_pm_enter, .valid = bfin_pm_valid, }; -diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arch/frv/include/asm/kmap_types.h ---- linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/frv/include/asm/kmap_types.h linux-2.6.32.14/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400 @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/ .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/ia32/ia32priv.h ---- linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/ia32/ia32priv.h linux-2.6.32.14/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/i #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/a return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64/include/asm/elf.h ---- linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/include/asm/elf.h linux-2.6.32.14/arch/ia64/include/asm/elf.h +--- linux-2.6.32.14/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64 #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/include/asm/machvec.h linux-2.6.32.14/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.14/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/ /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/include/asm/pgtable.h linux-2.6.32.14/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/ #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/include/asm/uaccess.h linux-2.6.32.14/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/i { return dma_ops; } -diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/kernel/module.c ---- linux-2.6.32.11/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/module.c linux-2.6.32.14/arch/ia64/kernel/module.c +--- linux-2.6.32.14/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/k mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/kernel/pci-dma.c ---- linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-dma.c linux-2.6.32.14/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/ static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/i .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64 goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64/kernel/topology.c ---- linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/topology.c linux-2.6.32.14/arch/ia64/kernel/topology.c +--- linux-2.6.32.14/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64 .show = cache_show }; -diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/i . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fault.c ---- linux-2.6.32.11/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/mm/fault.c linux-2.6.32.14/arch/ia64/mm/fault.c +--- linux-2.6.32.14/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fau survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init.c ---- linux-2.6.32.11/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/mm/init.c linux-2.6.32.14/arch/ia64/mm/init.c +--- linux-2.6.32.14/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; @@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c ---- linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/arch/ia64/ .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, -diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/lib/usercopy.c ---- linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/m32r/lib/usercopy.c linux-2.6.32.14/arch/m32r/lib/usercopy.c +--- linux-2.6.32.14/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/li prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch .valid = suspend_valid_only_mem, .begin = db1x_pm_begin, .enter = db1x_pm_enter, -diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips/include/asm/elf.h ---- linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/include/asm/elf.h linux-2.6.32.14/arch/mips/include/asm/elf.h +--- linux-2.6.32.14/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mips/include/asm/page.h ---- linux-2.6.32.11/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/include/asm/page.h linux-2.6.32.14/arch/mips/include/asm/page.h +--- linux-2.6.32.14/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mip #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/mips/include/asm/system.h ---- linux-2.6.32.11/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/include/asm/system.h linux-2.6.32.14/arch/mips/include/asm/system.h +--- linux-2.6.32.14/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/m +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch #include <asm/processor.h> /* -diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/kernel/kgdb.c ---- linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/kernel/kgdb.c linux-2.6.32.14/arch/mips/kernel/kgdb.c +--- linux-2.6.32.14/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/ker struct kgdb_arch arch_kgdb_ops; /* -diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/kernel/process.c ---- linux-2.6.32.11/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/kernel/process.c linux-2.6.32.14/arch/mips/kernel/process.c +--- linux-2.6.32.14/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/ - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/kernel/syscall.c ---- linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/kernel/syscall.c linux-2.6.32.14/arch/mips/kernel/syscall.c +--- linux-2.6.32.14/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400 @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/ if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fault.c ---- linux-2.6.32.11/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/mips/mm/fault.c linux-2.6.32.14/arch/mips/mm/fault.c +--- linux-2.6.32.14/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fau /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/parisc/include/asm/elf.h ---- linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/parisc/include/asm/elf.h linux-2.6.32.14/arch/parisc/include/asm/elf.h +--- linux-2.6.32.14/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/pa /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/parisc/include/asm/pgtable.h linux-2.6.32.14/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arc #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/parisc/kernel/module.c ---- linux-2.6.32.11/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/parisc/kernel/module.c linux-2.6.32.14/arch/parisc/kernel/module.c +--- linux-2.6.32.14/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/pari DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/ if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/parisc/kernel/traps.c ---- linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/parisc/kernel/traps.c linux-2.6.32.14/arch/parisc/kernel/traps.c +--- linux-2.6.32.14/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/paris fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm/fault.c ---- linux-2.6.32.11/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 +diff -urNp linux-2.6.32.14/arch/parisc/mm/fault.c linux-2.6.32.14/arch/parisc/mm/fault.c +--- linux-2.6.32.14/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arch/powerpc/include/asm/device.h ---- linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/device.h linux-2.6.32.14/arch/powerpc/include/asm/device.h +--- linux-2.6.32.14/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arc /* * When an iommu is in use, dma_data is used as a ptr to the base of the -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; @@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/elf.h linux-2.6.32.14/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.14/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/p #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/iommu.h linux-2.6.32.14/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11 KM_TYPE_NR }; -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/arch/powerpc/include/asm/page_64.h ---- linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page_64.h linux-2.6.32.14/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400 @@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/ar #include <asm-generic/getorder.h> -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/powerpc/include/asm/page.h ---- linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page.h linux-2.6.32.14/arch/powerpc/include/asm/page.h +--- linux-2.6.32.14/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pci.h linux-2.6.32.14/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.14/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/p #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/reg.h linux-2.6.32.14/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.14/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/p #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400 @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/ar static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400 @@ -327,52 +327,6 @@ do { \ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); @@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/ar extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/ .show = cache_index_show, }; -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerpc/kernel/dma.c ---- linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma.c linux-2.6.32.14/arch/powerpc/kernel/dma.c +--- linux-2.6.32.14/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerp .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/ { struct iommu_table *tbl = get_iommu_table_base(dev); -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arc .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/ addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/ mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/po .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/powerpc/kernel/kgdb.c ---- linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/kgdb.c linux-2.6.32.14/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) return 0; @@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/power .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module_32.c linux-2.6.32.14/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/ /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/powerpc/kernel/module.c ---- linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module.c linux-2.6.32.14/arch/powerpc/kernel/module.c +--- linux-2.6.32.14/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/pow static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/pci-common.c linux-2.6.32.14/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch { return pci_dma_ops; } -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/powerpc/kernel/process.c ---- linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/process.c linux-2.6.32.14/arch/powerpc/kernel/process.c +--- linux-2.6.32.14/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400 @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; @@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/po - - return ret; -} -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_32.c linux-2.6.32.14/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_64.c linux-2.6.32.14/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/ } return error; } -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/powerpc/kernel/vdso.c ---- linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vdso.c linux-2.6.32.14/arch/powerpc/kernel/vdso.c +--- linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/power if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerpc/kernel/vio.c ---- linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vio.c linux-2.6.32.14/arch/powerpc/kernel/vio.c +--- linux-2.6.32.14/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerp viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; } -diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/p -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/mm/fault.c ---- linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/mm/fault.c linux-2.6.32.14/arch/powerpc/mm/fault.c +--- linux-2.6.32.14/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/ _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerpc/mm/mmap_64.c ---- linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/mm/mmap_64.c linux-2.6.32.14/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerp mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/mm/slice.c ---- linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/mm/slice.c linux-2.6.32.14/arch/powerpc/mm/slice.c +--- linux-2.6.32.14/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/ /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c ---- linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 .valid = lite5200_pm_valid, .begin = lite5200_pm_begin, .prepare = lite5200_pm_prepare, -diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c ---- linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 .valid = mpc52xx_pm_valid, .prepare = mpc52xx_pm_prepare, .enter = mpc52xx_pm_enter, -diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11 .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/a .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, -diff -urNp linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, -diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig ---- linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" @@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1 select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING -diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390/include/asm/elf.h ---- linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/s390/include/asm/elf.h linux-2.6.32.14/arch/s390/include/asm/elf.h +--- linux-2.6.32.14/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; that it will "exec", and that there is sufficient room for the brk. */ #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) @@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */ -diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s390/include/asm/setup.h ---- linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/s390/include/asm/setup.h linux-2.6.32.14/arch/s390/include/asm/setup.h +--- linux-2.6.32.14/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); @@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s3 #else #define s390_noexec (0) #endif -diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/s390/include/asm/uaccess.h linux-2.6.32.14/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig ---- linux-2.6.32.11/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400 +diff -urNp linux-2.6.32.14/arch/s390/Kconfig linux-2.6.32.14/arch/s390/Kconfig +--- linux-2.6.32.14/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400 @@ -194,28 +194,26 @@ config AUDIT_ARCH config S390_SWITCH_AMODE @@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig comment "Code generation options" -diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/kernel/module.c ---- linux-2.6.32.11/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/s390/kernel/module.c linux-2.6.32.14/arch/s390/kernel/module.c +--- linux-2.6.32.14/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/k rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/kernel/setup.c ---- linux-2.6.32.11/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/s390/kernel/setup.c linux-2.6.32.14/arch/s390/kernel/setup.c +--- linux-2.6.32.14/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); @@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/ke static void setup_addressing_mode(void) { if (s390_noexec) { -diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap.c ---- linux-2.6.32.11/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/s390/mm/mmap.c linux-2.6.32.14/arch/s390/mm/mmap.c +--- linux-2.6.32.14/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c ---- linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/s .enter = hp6x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/k .show = sq_sysfs_show, .store = sq_sysfs_store, }; -diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c ---- linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch .enter = sh_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/kgdb.c ---- linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sh/kernel/kgdb.c linux-2.6.32.14/arch/sh/kernel/kgdb.c +--- linux-2.6.32.14/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/ /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -14,18 +14,38 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/ar } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) #define dma_is_consistent(d, h) (1) @@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/ debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/arch/sparc/include/asm/elf_32.h ---- linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_32.h linux-2.6.32.14/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/arch/sparc/include/asm/elf_64.h ---- linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_64.h linux-2.6.32.14/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/a extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arc #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/ " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) @@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/a return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/a if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/kernel/iommu.c ---- linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/iommu.c linux-2.6.32.14/arch/sparc/kernel/iommu.c +--- linux-2.6.32.14/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/ EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc/kernel/ioport.c ---- linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/ioport.c linux-2.6.32.14/arch/sparc/kernel/ioport.c +--- linux-2.6.32.14/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/spar /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/spar /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc/kernel/Makefile ---- linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/Makefile linux-2.6.32.14/arch/sparc/kernel/Makefile +--- linux-2.6.32.14/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400 @@ -3,7 +3,7 @@ # @@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sp .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, -diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/sparc/kernel/traps_64.c ---- linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/kernel/traps_64.c linux-2.6.32.14/arch/sparc/kernel/traps_64.c +--- linux-2.6.32.14/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/spa dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc/lib/atomic_64.S ---- linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/lib/atomic_64.S linux-2.6.32.14/arch/sparc/lib/atomic_64.S +--- linux-2.6.32.14/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib/ksyms.c ---- linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/lib/ksyms.c linux-2.6.32.14/arch/sparc/lib/ksyms.c +--- linux-2.6.32.14/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400 @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); EXPORT_SYMBOL(atomic64_add_ret); -diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/lib/rwsem_64.S ---- linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/lib/rwsem_64.S linux-2.6.32.14/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/ cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefile ---- linux-2.6.32.11/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/Makefile linux-2.6.32.14/arch/sparc/Makefile +--- linux-2.6.32.14/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefi VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/mm/fault_32.c ---- linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_32.c linux-2.6.32.14/arch/sparc/mm/fault_32.c +--- linux-2.6.32.14/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/m /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/mm/fault_64.c ---- linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_64.c linux-2.6.32.14/arch/sparc/mm/fault_64.c +--- linux-2.6.32.14/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/m /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm/init_32.c ---- linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/mm/init_32.c linux-2.6.32.14/arch/sparc/mm/init_32.c +--- linux-2.6.32.14/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/Makefile ---- linux-2.6.32.11/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/mm/Makefile linux-2.6.32.14/arch/sparc/mm/Makefile +--- linux-2.6.32.14/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400 @@ -2,7 +2,7 @@ # @@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/srmmu.c ---- linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/sparc/mm/srmmu.c linux-2.6.32.14/arch/sparc/mm/srmmu.c +--- linux-2.6.32.14/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/s BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.32.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch/um/include/asm/kmap_types.h ---- linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/um/include/asm/kmap_types.h linux-2.6.32.14/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.14/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch KM_TYPE_NR }; -diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/include/asm/page.h ---- linux-2.6.32.11/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/um/include/asm/page.h linux-2.6.32.14/arch/um/include/asm/page.h +--- linux-2.6.32.14/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/in #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/sys-i386/syscalls.c ---- linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/um/sys-i386/syscalls.c linux-2.6.32.14/arch/um/sys-i386/syscalls.c +--- linux-2.6.32.14/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/s /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/bitops.h ---- linux-2.6.32.11/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/bitops.h linux-2.6.32.14/arch/x86/boot/bitops.h +--- linux-2.6.32.14/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/ } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/boot.h ---- linux-2.6.32.11/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/boot.h linux-2.6.32.14/arch/x86/boot/boot.h +--- linux-2.6.32.14/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/bo : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/arch/x86/boot/compressed/head_32.S ---- linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_32.S linux-2.6.32.14/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/ar addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/arch/x86/boot/compressed/head_64.S ---- linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_64.S linux-2.6.32.14/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/ar #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/misc.c linux-2.6.32.14/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.14/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/ error("Wrong destination address"); #endif -diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/ar offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/relocs.c linux-2.6.32.14/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arc read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boot/cpucheck.c ---- linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/cpucheck.c linux-2.6.32.14/arch/x86/boot/cpucheck.c +--- linux-2.6.32.14/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boo err = check_flags(); } -diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/header.S ---- linux-2.6.32.11/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/header.S linux-2.6.32.14/arch/x86/boot/header.S +--- linux-2.6.32.14/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5316,9 +5316,33 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/ #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/boot/video-vesa.c ---- linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/boot/memory.c linux-2.6.32.14/arch/x86/boot/memory.c +--- linux-2.6.32.14/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400 +@@ -19,7 +19,7 @@ + + static int detect_memory_e820(void) + { +- int count = 0; ++ unsigned int count = 0; + struct biosregs ireg, oreg; + struct e820entry *desc = boot_params.e820_map; + static struct e820entry buf; /* static so it is zeroed */ +diff -urNp linux-2.6.32.14/arch/x86/boot/video.c linux-2.6.32.14/arch/x86/boot/video.c +--- linux-2.6.32.14/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400 +@@ -90,7 +90,7 @@ static void store_mode_params(void) + static unsigned int get_entry(void) + { + char entry_buf[4]; +- int i, len = 0; ++ unsigned int i, len = 0; + int key; + unsigned int v; + +diff -urNp linux-2.6.32.14/arch/x86/boot/video-vesa.c linux-2.6.32.14/arch/x86/boot/video-vesa.c +--- linux-2.6.32.14/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -5327,9 +5351,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/b } /* -diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia32/ia32entry.S ---- linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32entry.S linux-2.6.32.14/arch/x86/ia32/ia32entry.S +--- linux-2.6.32.14/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400 @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -5424,9 +5448,9 @@ diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia /* * No need to follow this irqs on/off section: the syscall * disabled irqs and here we enable it straight after entry: -diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/ia32/ia32_signal.c ---- linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32_signal.c linux-2.6.32.14/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -5445,9 +5469,9 @@ diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/ }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/arch/x86/include/asm/alternative.h ---- linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/alternative.h linux-2.6.32.14/arch/x86/include/asm/alternative.h +--- linux-2.6.32.14/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -5457,9 +5481,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/ar "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/include/asm/apm.h ---- linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/apm.h linux-2.6.32.14/arch/x86/include/asm/apm.h +--- linux-2.6.32.14/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5478,9 +5502,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/i "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch/x86/include/asm/atomic_32.h ---- linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_32.h linux-2.6.32.14/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5811,9 +5835,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch #define ATOMIC64_INIT(val) { (val) } extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch/x86/include/asm/atomic_64.h ---- linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_64.h linux-2.6.32.14/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -6391,9 +6415,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch } /** -diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/include/asm/boot.h ---- linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/boot.h linux-2.6.32.14/arch/x86/include/asm/boot.h +--- linux-2.6.32.14/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -6411,9 +6435,30 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86/include/asm/cache.h ---- linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/cacheflush.h linux-2.6.32.14/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400 +@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) + static inline unsigned long get_page_memtype(struct page *pg) + { + if (!PageUncached(pg) && !PageWC(pg)) +- return -1; ++ return ~0UL; + else if (!PageUncached(pg) && PageWC(pg)) + return _PAGE_CACHE_WC; + else if (PageUncached(pg) && !PageWC(pg)) +@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru + SetPageWC(pg); + break; + default: +- case -1: ++ case ~0UL: + ClearPageUncached(pg); + ClearPageWC(pg); + break; +diff -urNp linux-2.6.32.14/arch/x86/include/asm/cache.h linux-2.6.32.14/arch/x86/include/asm/cache.h +--- linux-2.6.32.14/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -6422,9 +6467,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86 #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/arch/x86/include/asm/checksum_32.h ---- linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/checksum_32.h linux-2.6.32.14/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6458,9 +6503,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/ar len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/include/asm/desc.h ---- linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/desc.h linux-2.6.32.14/arch/x86/include/asm/desc.h +--- linux-2.6.32.14/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -6554,7 +6599,66 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/ } #define _LDT_empty(info) \ -@@ -392,4 +402,16 @@ static inline void set_system_intr_gate_ +@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct + desc->limit = (limit >> 16) & 0xf; + } + +-static inline void _set_gate(int gate, unsigned type, void *addr, ++static inline void _set_gate(int gate, unsigned type, const void *addr, + unsigned dpl, unsigned ist, unsigned seg) + { + gate_desc s; +@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, u + * Pentium F0 0F bugfix can have resulted in the mapped + * IDT being write-protected. + */ +-static inline void set_intr_gate(unsigned int n, void *addr) ++static inline void set_intr_gate(unsigned int n, const void *addr) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); +@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsig + /* + * This routine sets up an interrupt gate at directory privilege level 3. + */ +-static inline void set_system_intr_gate(unsigned int n, void *addr) ++static inline void set_system_intr_gate(unsigned int n, const void *addr) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS); + } + +-static inline void set_system_trap_gate(unsigned int n, void *addr) ++static inline void set_system_trap_gate(unsigned int n, const void *addr) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS); + } + +-static inline void set_trap_gate(unsigned int n, void *addr) ++static inline void set_trap_gate(unsigned int n, const void *addr) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); +@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigne + static inline void set_task_gate(unsigned int n, unsigned int gdt_entry) + { + BUG_ON((unsigned)n > 0xFF); +- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3)); ++ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3)); + } + +-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist) ++static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS); + } + +-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist) ++static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist) + { + BUG_ON((unsigned)n > 0xFF); _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); } @@ -6571,9 +6675,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x86/include/asm/device.h ---- linux-2.6.32.11/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/device.h linux-2.6.32.14/arch/x86/include/asm/device.h +--- linux-2.6.32.14/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -6583,9 +6687,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x8 #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -6625,9 +6729,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/ar WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/include/asm/e820.h ---- linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/e820.h linux-2.6.32.14/arch/x86/include/asm/e820.h +--- linux-2.6.32.14/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) @@ -6637,9 +6741,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/ #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/include/asm/elf.h ---- linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/elf.h linux-2.6.32.14/arch/x86/include/asm/elf.h +--- linux-2.6.32.14/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400 @@ -257,7 +257,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -6693,9 +6797,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86/include/asm/futex.h ---- linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/futex.h linux-2.6.32.14/arch/x86/include/asm/futex.h +--- linux-2.6.32.14/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400 @@ -11,17 +11,54 @@ #include <asm/processor.h> #include <asm/system.h> @@ -6832,9 +6936,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86 : "memory" ); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/include/asm/i387.h ---- linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/i387.h linux-2.6.32.14/arch/x86/include/asm/i387.h +--- linux-2.6.32.14/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { int err; @@ -6875,9 +6979,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/ /* * These must be called with preempt disabled -diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86/include/asm/io_64.h ---- linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/io_64.h linux-2.6.32.14/arch/x86/include/asm/io_64.h +--- linux-2.6.32.14/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -6896,9 +7000,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86 #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86/include/asm/iommu.h ---- linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/iommu.h linux-2.6.32.14/arch/x86/include/asm/iommu.h +--- linux-2.6.32.14/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -6908,9 +7012,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86 extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.11/arch/x86/include/asm/irqflags.h linux-2.6.32.11/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.11/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/irqflags.h 2010-04-07 19:33:06.601891934 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/irqflags.h linux-2.6.32.14/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.14/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -6923,10 +7027,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/irqflags.h linux-2.6.32.11/arch/ #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.32.11/arch/x86/include/asm/kvm_host.h linux-2.6.32.11/arch/x86/include/asm/kvm_host.h ---- linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-04-04 20:46:41.500459645 -0400 -@@ -531,7 +531,7 @@ struct kvm_x86_ops { +diff -urNp linux-2.6.32.14/arch/x86/include/asm/kvm_host.h linux-2.6.32.14/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.14/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400 +@@ -532,7 +532,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -6935,9 +7039,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/kvm_host.h linux-2.6.32.11/arch/ int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/local.h linux-2.6.32.11/arch/x86/include/asm/local.h ---- linux-2.6.32.11/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/local.h linux-2.6.32.14/arch/x86/include/asm/local.h +--- linux-2.6.32.14/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -7162,9 +7266,23 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/local.h linux-2.6.32.11/arch/x86 : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch/x86/include/asm/microcode.h ---- linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h +--- linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400 +@@ -81,8 +81,8 @@ static inline unsigned char current_lock + #else + #define lock_cmos_prefix(reg) do {} while (0) + #define lock_cmos_suffix(reg) do {} while (0) +-#define lock_cmos(reg) +-#define unlock_cmos() ++#define lock_cmos(reg) do {} while (0) ++#define unlock_cmos() do {} while (0) + #define do_i_have_lock_cmos() 0 + #define current_lock_cmos_reg() 0 + #endif +diff -urNp linux-2.6.32.14/arch/x86/include/asm/microcode.h linux-2.6.32.14/arch/x86/include/asm/microcode.h +--- linux-2.6.32.14/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -7205,9 +7323,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch { return NULL; } -diff -urNp linux-2.6.32.11/arch/x86/include/asm/mman.h linux-2.6.32.11/arch/x86/include/asm/mman.h ---- linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/mman.h linux-2.6.32.14/arch/x86/include/asm/mman.h +--- linux-2.6.32.14/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -7223,9 +7341,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mman.h linux-2.6.32.11/arch/x86/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/arch/x86/include/asm/mmu_context.h ---- linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-04-06 22:21:53.692294722 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/mmu_context.h linux-2.6.32.14/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.14/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) @@ -7248,7 +7366,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar #ifdef CONFIG_SMP if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK) percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY); -@@ -34,37 +49,96 @@ static inline void switch_mm(struct mm_s +@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s struct task_struct *tsk) { unsigned cpu = smp_processor_id(); @@ -7284,6 +7402,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar */ if (unlikely(prev->context.ldt != next->context.ldt)) load_LDT_nolock(&next->context); +- } + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) + if (!nx_enabled) { @@ -7298,18 +7417,15 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base || + prev->context.user_cs_limit != next->context.user_cs_limit)) + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); -+#ifdef CONFIG_SMP + #ifdef CONFIG_SMP + else if (unlikely(tlbstate != TLBSTATE_OK)) + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); +#endif +#endif + - } - #ifdef CONFIG_SMP ++ } else { - percpu_write(cpu_tlbstate.state, TLBSTATE_OK); - BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next); - ++ +#ifdef CONFIG_PAX_PER_CPU_PGD + pax_open_kernel(); + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS); @@ -7318,8 +7434,11 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar + load_cr3(get_cpu_pgd(cpu)); +#endif + - if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next))) { - /* We were in lazy tlb mode and leave_mm disabled ++#ifdef CONFIG_SMP + percpu_write(cpu_tlbstate.state, TLBSTATE_OK); + BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next); + +@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. */ @@ -7343,11 +7462,15 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar +#endif + } - } +- } #endif -diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu.h linux-2.6.32.11/arch/x86/include/asm/mmu.h ---- linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400 ++ } + } + + #define activate_mm(prev, next) \ +diff -urNp linux-2.6.32.14/arch/x86/include/asm/mmu.h linux-2.6.32.14/arch/x86/include/asm/mmu.h +--- linux-2.6.32.14/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -7374,9 +7497,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu.h linux-2.6.32.11/arch/x86/i } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.11/arch/x86/include/asm/module.h linux-2.6.32.11/arch/x86/include/asm/module.h ---- linux-2.6.32.11/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/module.h linux-2.6.32.14/arch/x86/include/asm/module.h +--- linux-2.6.32.14/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400 @@ -59,13 +59,31 @@ #error unknown processor family #endif @@ -7410,9 +7533,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/module.h linux-2.6.32.11/arch/x8 #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_32_types.h linux-2.6.32.11/arch/x86/include/asm/page_32_types.h ---- linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/page_32_types.h linux-2.6.32.14/arch/x86/include/asm/page_32_types.h +--- linux-2.6.32.14/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -7424,9 +7547,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_32_types.h linux-2.6.32.11/ #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_64_types.h linux-2.6.32.11/arch/x86/include/asm/page_64_types.h ---- linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/page_64_types.h linux-2.6.32.14/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.14/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -7437,9 +7560,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_64_types.h linux-2.6.32.11/ /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-04-07 16:58:23.343008831 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/paravirt.h linux-2.6.32.14/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.14/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/paravirt.h 2010-05-28 21:27:14.915041226 -0400 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -7493,9 +7616,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/ #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -316,6 +316,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -7509,9 +7632,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h linux-2.6.32.11 }; struct raw_spinlock; -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pci_x86.h linux-2.6.32.11/arch/x86/include/asm/pci_x86.h ---- linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pci_x86.h linux-2.6.32.14/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.14/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -7534,9 +7657,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pci_x86.h linux-2.6.32.11/arch/x extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgalloc.h linux-2.6.32.14/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.14/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7551,9 +7674,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7564,9 +7687,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.11 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400 @@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -7608,9 +7731,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h linux-2.6.32.11/arc /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -7640,9 +7763,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h 2010-05-28 21:27:14.915041226 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7660,9 +7783,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.11 } /* -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h 2010-05-28 21:27:14.915041226 -0400 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; @@ -7708,9 +7831,20 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h linux-2.6.32.11/arc } /* -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable.h linux-2.6.32.11/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400 +@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; + #define MODULES_VADDR _AC(0xffffffffa0000000, UL) + #define MODULES_END _AC(0xffffffffff000000, UL) + #define MODULES_LEN (MODULES_END - MODULES_VADDR) ++#define MODULES_EXEC_VADDR MODULES_VADDR ++#define MODULES_EXEC_END MODULES_END + + #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable.h linux-2.6.32.14/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable.h 2010-05-28 21:27:14.918896182 -0400 @@ -74,12 +74,51 @@ extern struct list_head pgd_list; #define arch_end_context_switch(prev) do {} while(0) @@ -7875,9 +8009,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable.h linux-2.6.32.11/arch/x #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -7962,9 +8096,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h linux-2.6.32.11/ #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/processor.h linux-2.6.32.11/arch/x86/include/asm/processor.h ---- linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/processor.h linux-2.6.32.14/arch/x86/include/asm/processor.h +--- linux-2.6.32.14/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400 @@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -8049,9 +8183,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/processor.h linux-2.6.32.11/arch #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x86/include/asm/ptrace.h ---- linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/ptrace.h linux-2.6.32.14/arch/x86/include/asm/ptrace.h +--- linux-2.6.32.14/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -8088,9 +8222,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x8 #endif } -diff -urNp linux-2.6.32.11/arch/x86/include/asm/reboot.h linux-2.6.32.11/arch/x86/include/asm/reboot.h ---- linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/reboot.h linux-2.6.32.14/arch/x86/include/asm/reboot.h +--- linux-2.6.32.14/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -8100,13 +8234,13 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/reboot.h linux-2.6.32.11/arch/x8 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86/include/asm/rwsem.h ---- linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-04-04 20:46:41.505526780 -0400 -@@ -106,10 +106,26 @@ static inline void __down_read(struct rw +diff -urNp linux-2.6.32.14/arch/x86/include/asm/rwsem.h linux-2.6.32.14/arch/x86/include/asm/rwsem.h +--- linux-2.6.32.14/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400 +@@ -118,10 +118,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" - LOCK_PREFIX " incl (%%eax)\n\t" + LOCK_PREFIX _ASM_INC "(%1)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT +#ifdef CONFIG_X86_32 @@ -8117,7 +8251,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ LOCK_PREFIX "decl (%%eax)\n" ++ LOCK_PREFIX _ASM_DEC "(%1)\n\t" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) @@ -8132,14 +8266,14 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 "# ending down_read\n\t" : "+m" (sem->count) : "a" (sem) -@@ -124,13 +140,29 @@ static inline int __down_read_trylock(st - __s32 result, tmp; +@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st + rwsem_count_t result, tmp; asm volatile("# beginning __down_read_trylock\n\t" - " movl %0,%1\n\t" + " mov %0,%1\n\t" - "1:\n\t" + "2:\n\t" - " movl %1,%2\n\t" - " addl %3,%2\n\t" + " mov %1,%2\n\t" + " add %3,%2\n\t" - " jle 2f\n\t" + +#ifdef CONFIG_PAX_REFCOUNT @@ -8151,14 +8285,14 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ "subl %3,%2\n" ++ "sub %3,%2\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) +#endif + + " jle 3f\n\t" - LOCK_PREFIX " cmpxchgl %2,%0\n\t" + LOCK_PREFIX " cmpxchg %2,%0\n\t" - " jnz 1b\n\t" - "2:\n\t" + " jnz 2b\n\t" @@ -8166,10 +8300,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 "# ending __down_read_trylock\n\t" : "+m" (sem->count), "=&a" (result), "=&r" (tmp) : "i" (RWSEM_ACTIVE_READ_BIAS) -@@ -148,12 +180,28 @@ static inline void __down_write_nested(s +@@ -160,12 +192,28 @@ static inline void __down_write_nested(s tmp = RWSEM_ACTIVE_WRITE_BIAS; asm volatile("# beginning down_write\n\t" - LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" + LOCK_PREFIX " xadd %1,(%2)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT +#ifdef CONFIG_X86_32 @@ -8180,14 +8314,14 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ "movl %%edx,(%%eax)\n" ++ "mov %1,(%2)\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) +#endif + /* subtract 0x0000ffff, returns the old value */ - " testl %%edx,%%edx\n\t" + " test %1,%1\n\t" /* was the count 0 before? */ - " jz 1f\n" + " jz 2f\n" @@ -8197,10 +8331,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 "# ending down_write" : "+m" (sem->count), "=d" (tmp) : "a" (sem), "1" (tmp) -@@ -186,10 +234,26 @@ static inline void __up_read(struct rw_s - __s32 tmp = -RWSEM_ACTIVE_READ_BIAS; +@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s + rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS; asm volatile("# beginning __up_read\n\t" - LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" + LOCK_PREFIX " xadd %1,(%2)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT +#ifdef CONFIG_X86_32 @@ -8211,7 +8345,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ "movl %%edx,(%%eax)\n" ++ "mov %1,(%2)\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) @@ -8226,10 +8360,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 "# ending __up_read\n" : "+m" (sem->count), "=d" (tmp) : "a" (sem), "1" (tmp) -@@ -204,11 +268,27 @@ static inline void __up_write(struct rw_ +@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_ + rwsem_count_t tmp; asm volatile("# beginning __up_write\n\t" - " movl %2,%%edx\n\t" - LOCK_PREFIX " xaddl %%edx,(%%eax)\n\t" + LOCK_PREFIX " xadd %1,(%2)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT +#ifdef CONFIG_X86_32 @@ -8240,7 +8374,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ "movl %%edx,(%%eax)\n" ++ "mov %1,(%2)\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) @@ -8254,12 +8388,12 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 - "1:\n\t" + "2:\n\t" "# ending __up_write\n" - : "+m" (sem->count) - : "a" (sem), "i" (-RWSEM_ACTIVE_WRITE_BIAS) -@@ -222,10 +302,26 @@ static inline void __downgrade_write(str + : "+m" (sem->count), "=d" (tmp) + : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS) +@@ -234,13 +314,29 @@ static inline void __downgrade_write(str { asm volatile("# beginning __downgrade_write\n\t" - LOCK_PREFIX " addl %2,(%%eax)\n\t" + LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t" + +#ifdef CONFIG_PAX_REFCOUNT +#ifdef CONFIG_X86_32 @@ -8270,13 +8404,16 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ LOCK_PREFIX "subl %2,(%%eax)\n" ++ LOCK_PREFIX _ASM_SUB "%2,(%1)\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) +#endif + - /* transitions 0xZZZZ0001 -> 0xYYYY0001 */ + /* + * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386) + * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64) + */ - " jns 1f\n\t" + " jns 2f\n\t" " call call_rwsem_downgrade_wake\n" @@ -8284,13 +8421,13 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 + "2:\n\t" "# ending __downgrade_write\n" : "+m" (sem->count) - : "a" (sem), "i" (-RWSEM_WAITING_BIAS) -@@ -237,7 +333,23 @@ static inline void __downgrade_write(str - */ - static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem) + : "a" (sem), "er" (-RWSEM_WAITING_BIAS) +@@ -253,7 +349,23 @@ static inline void __downgrade_write(str + static inline void rwsem_atomic_add(rwsem_count_t delta, + struct rw_semaphore *sem) { -- asm volatile(LOCK_PREFIX "addl %1,%0" -+ asm volatile(LOCK_PREFIX "addl %1,%0\n" +- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0" ++ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n" + +#ifdef CONFIG_PAX_REFCOUNT +#ifdef CONFIG_X86_32 @@ -8301,18 +8438,18 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ LOCK_PREFIX "subl %1,%0\n" ++ LOCK_PREFIX _ASM_SUB "%1,%0\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) +#endif + : "+m" (sem->count) - : "ir" (delta)); + : "er" (delta)); } -@@ -249,7 +361,23 @@ static inline int rwsem_atomic_update(in +@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic { - int tmp = delta; + rwsem_count_t tmp = delta; - asm volatile(LOCK_PREFIX "xadd %0,%1" + asm volatile(LOCK_PREFIX "xadd %0,%1\n" @@ -8326,7 +8463,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 +#endif + ".pushsection .fixup,\"ax\"\n" + "1:\n" -+ "movl %0,%1\n" ++ "mov %0,%1\n" + "jmp 0b\n" + ".popsection\n" + _ASM_EXTABLE(0b, 1b) @@ -8335,9 +8472,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86 : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/segment.h linux-2.6.32.11/arch/x86/include/asm/segment.h ---- linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/segment.h linux-2.6.32.14/arch/x86/include/asm/segment.h +--- linux-2.6.32.14/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -8406,9 +8543,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/segment.h linux-2.6.32.11/arch/x #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) -diff -urNp linux-2.6.32.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/spinlock.h linux-2.6.32.14/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.14/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -8512,9 +8649,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/ : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.32.11/arch/x86/include/asm/system.h linux-2.6.32.11/arch/x86/include/asm/system.h ---- linux-2.6.32.11/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/system.h linux-2.6.32.14/arch/x86/include/asm/system.h +--- linux-2.6.32.14/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; @@ -8533,9 +8670,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/system.h linux-2.6.32.11/arch/x8 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) @@ -8665,9 +8802,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h linux-2.6.32.11/arc long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400 @@ -9,6 +9,9 @@ #include <linux/prefetch.h> #include <linux/lockdep.h> @@ -8859,10 +8996,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h linux-2.6.32.11/arc copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400 -@@ -8,8 +8,11 @@ +diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess.h linux-2.6.32.14/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.14/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400 +@@ -8,6 +8,8 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> #include <linux/string.h> @@ -8870,11 +9007,8 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x +#include <linux/slab.h> #include <asm/asm.h> #include <asm/page.h> -+#include <asm/segment.h> - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -29,7 +32,12 @@ +@@ -29,7 +31,12 @@ #define get_ds() (KERNEL_DS) #define get_fs() (current_thread_info()->addr_limit) @@ -8887,7 +9021,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x #define segment_eq(a, b) ((a).seg == (b).seg) -@@ -77,7 +85,33 @@ +@@ -77,7 +84,33 @@ * checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ @@ -8922,7 +9056,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x /* * The exception table consists of pairs of addresses: the first is the -@@ -183,13 +217,21 @@ extern int __get_user_bad(void); +@@ -183,13 +216,21 @@ extern int __get_user_bad(void); asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") @@ -8947,7 +9081,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x ".section .fixup,\"ax\"\n" \ "4: movl %3,%0\n" \ " jmp 3b\n" \ -@@ -197,15 +239,18 @@ extern int __get_user_bad(void); +@@ -197,15 +238,18 @@ extern int __get_user_bad(void); _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ : "=r" (err) \ @@ -8970,7 +9104,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x #define __put_user_x8(x, ptr, __ret_pu) \ asm volatile("call __put_user_8" : "=a" (__ret_pu) \ -@@ -374,16 +419,18 @@ do { \ +@@ -374,16 +418,18 @@ do { \ } while (0) #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -8992,7 +9126,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x #define __get_user_size_ex(x, ptr, size) \ do { \ -@@ -407,10 +454,12 @@ do { \ +@@ -407,10 +453,12 @@ do { \ } while (0) #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ @@ -9007,7 +9141,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x #define __put_user_nocheck(x, ptr, size) \ ({ \ -@@ -424,13 +473,24 @@ do { \ +@@ -424,13 +472,24 @@ do { \ int __gu_err; \ unsigned long __gu_val; \ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ @@ -9034,7 +9168,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x /* * Tell gcc we read from memory instead of writing: this is because -@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu +@@ -438,21 +497,26 @@ struct __large_struct { unsigned long bu * aliasing issues. */ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -9065,7 +9199,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x /* * uaccess_try and catch -@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu +@@ -530,7 +594,7 @@ struct __large_struct { unsigned long bu #define get_user_ex(x, ptr) do { \ unsigned long __gue_val; \ __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ @@ -9074,7 +9208,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x } while (0) #ifdef CONFIG_X86_WP_WORKS_OK -@@ -567,6 +632,7 @@ extern struct movsl_mask { +@@ -567,6 +631,7 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 @@ -9082,9 +9216,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.11/arch/x86/include/asm/vgtod.h linux-2.6.32.11/arch/x86/include/asm/vgtod.h ---- linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/vgtod.h linux-2.6.32.14/arch/x86/include/asm/vgtod.h +--- linux-2.6.32.14/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -9093,9 +9227,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/vgtod.h linux-2.6.32.11/arch/x86 cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.11/arch/x86/include/asm/vmi.h linux-2.6.32.11/arch/x86/include/asm/vmi.h ---- linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/vmi.h linux-2.6.32.14/arch/x86/include/asm/vmi.h +--- linux-2.6.32.14/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -9104,9 +9238,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/vmi.h linux-2.6.32.11/arch/x86/i } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.32.11/arch/x86/include/asm/vsyscall.h linux-2.6.32.11/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/vsyscall.h linux-2.6.32.14/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.14/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -9137,9 +9271,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/vsyscall.h linux-2.6.32.11/arch/ #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86/include/asm/xsave.h ---- linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/include/asm/xsave.h linux-2.6.32.14/arch/x86/include/asm/xsave.h +--- linux-2.6.32.14/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -9165,10 +9299,18 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig ---- linux-2.6.32.11/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400 -@@ -1083,7 +1083,7 @@ config PAGE_OFFSET +diff -urNp linux-2.6.32.14/arch/x86/Kconfig linux-2.6.32.14/arch/x86/Kconfig +--- linux-2.6.32.14/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 ++++ linux-2.6.32.14/arch/x86/Kconfig 2010-05-28 21:27:14.922894828 -0400 +@@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig" + + config PARAVIRT + bool "Enable paravirtualization code" ++ depends on !PAX_PER_CPU_PGD + ---help--- + This changes the kernel so it can modify itself when it is run + under a hypervisor, potentially improving performance significantly +@@ -1083,7 +1084,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT default 0x80000000 if VMSPLIT_2G @@ -9177,7 +9319,7 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig default 0x40000000 if VMSPLIT_1G default 0xC0000000 depends on X86_32 -@@ -1409,7 +1409,7 @@ config ARCH_USES_PG_UNCACHED +@@ -1414,7 +1415,7 @@ config ARCH_USES_PG_UNCACHED config EFI bool "EFI runtime service support" @@ -9186,7 +9328,7 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig ---help--- This enables the kernel to use EFI runtime services that are available (such as the EFI variable services). -@@ -1496,6 +1496,7 @@ config KEXEC_JUMP +@@ -1501,6 +1502,7 @@ config KEXEC_JUMP config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) default "0x1000000" @@ -9194,7 +9336,7 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig ---help--- This gives the physical address where the kernel is loaded. -@@ -1560,6 +1561,7 @@ config PHYSICAL_ALIGN +@@ -1565,6 +1567,7 @@ config PHYSICAL_ALIGN hex prompt "Alignment value to which kernel should be aligned" if X86_32 default "0x1000000" @@ -9202,7 +9344,7 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig range 0x2000 0x1000000 ---help--- This value puts the alignment restrictions on physical address -@@ -1591,9 +1593,10 @@ config HOTPLUG_CPU +@@ -1596,9 +1599,10 @@ config HOTPLUG_CPU Say N if you want to disable CPU hotplug. config COMPAT_VDSO @@ -9214,9 +9356,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.11/arch/x86/Kconfig.cpu linux-2.6.32.11/arch/x86/Kconfig.cpu ---- linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/Kconfig.cpu linux-2.6.32.14/arch/x86/Kconfig.cpu +--- linux-2.6.32.14/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 ++++ linux-2.6.32.14/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -9244,9 +9386,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig.cpu linux-2.6.32.11/arch/x86/Kconfig config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.11/arch/x86/Kconfig.debug linux-2.6.32.11/arch/x86/Kconfig.debug ---- linux-2.6.32.11/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/Kconfig.debug linux-2.6.32.14/arch/x86/Kconfig.debug +--- linux-2.6.32.14/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -9256,9 +9398,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig.debug linux-2.6.32.11/arch/x86/Kconf ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/kernel/acpi/boot.c ---- linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/boot.c linux-2.6.32.14/arch/x86/kernel/acpi/boot.c +--- linux-2.6.32.14/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400 @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -9268,9 +9410,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/ }; /* -diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -9280,9 +9422,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1 wrmsr 1: -diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -9327,9 +9469,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c linux-2.6.32.11/arch/x86 } -diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -9346,9 +9488,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.11/arch bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.11/arch/x86/kernel/alternative.c linux-2.6.32.11/arch/x86/kernel/alternative.c ---- linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/alternative.c linux-2.6.32.14/arch/x86/kernel/alternative.c +--- linux-2.6.32.14/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); @@ -9421,9 +9563,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/alternative.c linux-2.6.32.11/arch/x8 + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/kernel/amd_iommu.c ---- linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/amd_iommu.c linux-2.6.32.14/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32.14/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400 @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( } } @@ -9433,9 +9575,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/ .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -diff -urNp linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400 @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -9472,9 +9614,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c linux-2.6.32.11/arch/x { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.32.11/arch/x86/kernel/apm_32.c linux-2.6.32.11/arch/x86/kernel/apm_32.c ---- linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/apm_32.c linux-2.6.32.14/arch/x86/kernel/apm_32.c +--- linux-2.6.32.14/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -9576,9 +9718,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/apm_32.c linux-2.6.32.11/arch/x86/ker proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400 @@ -115,6 +115,11 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); @@ -9591,9 +9733,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.11/arch #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400 @@ -63,6 +63,18 @@ int main(void) OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); @@ -9621,9 +9763,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.11/arch DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/common.c linux-2.6.32.11/arch/x86/kernel/cpu/common.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/common.c linux-2.6.32.14/arch/x86/kernel/cpu/common.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -9732,9 +9874,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/common.c linux-2.6.32.11/arch/x86 struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -9744,9 +9886,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6. }; static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, @@ -9756,10 +9898,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel.c linux-2.6.32.11/arch/x86/kernel/cpu/intel.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400 -@@ -140,7 +140,7 @@ static void __cpuinit trap_init_f00f_bug +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/intel.c linux-2.6.32.14/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400 +@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. */ @@ -9768,10 +9910,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel.c linux-2.6.32.11/arch/x86/ load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-04 20:46:41.513555986 -0400 -@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400 +@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9780,9 +9922,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.11 .show = show, .store = store, }; -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/Makefile linux-2.6.32.14/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.14/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -9794,9 +9936,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/arch/x86 obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400 @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9806,9 +9948,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.11/ .show = show, .store = store, }; -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400 @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); @@ -9861,9 +10003,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.11/arch }; /* -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -9873,9 +10015,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.11/arch/x .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -9885,9 +10027,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.11/ar .vendor = X86_VENDOR_CENTAUR, .set = centaur_set_mcr, .get = centaur_get_mcr, -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -9897,9 +10039,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.11/arch .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ @@ -9918,9 +10060,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.11/ar .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -9939,9 +10081,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.11/arch/ { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -9992,9 +10134,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.11/arch/ #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -10028,10 +10170,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1 static struct wd_ops intel_arch_wd_ops __read_mostly = { .reserve = single_msr_reserve, .unreserve = single_msr_unreserve, -diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-04-04 20:46:41.517551870 -0400 -@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs +diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400 +@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs break; callchain_store(entry, frame.return_address); @@ -10040,10 +10182,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.11/arch } } -diff -urNp linux-2.6.32.11/arch/x86/kernel/crash.c linux-2.6.32.11/arch/x86/kernel/crash.c ---- linux-2.6.32.11/arch/x86/kernel/crash.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/crash.c 2010-04-04 20:46:41.517551870 -0400 -@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, +diff -urNp linux-2.6.32.14/arch/x86/kernel/crash.c linux-2.6.32.14/arch/x86/kernel/crash.c +--- linux-2.6.32.14/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400 +@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; #ifdef CONFIG_X86_32 @@ -10052,9 +10194,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/crash.c linux-2.6.32.11/arch/x86/kern crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.32.11/arch/x86/kernel/doublefault_32.c linux-2.6.32.11/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/doublefault_32.c linux-2.6.32.14/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.14/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -10086,9 +10228,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/doublefault_32.c linux-2.6.32.11/arch .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400 @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs * When in-kernel, we also print out the stack and code at the * time of the fault.. @@ -10133,9 +10275,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c linux-2.6.32.11/arch/x if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/kernel/dumpstack.c ---- linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/dumpstack.c linux-2.6.32.14/arch/x86/kernel/dumpstack.c +--- linux-2.6.32.14/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400 @@ -180,7 +180,7 @@ void dump_stack(void) #endif @@ -10163,9 +10305,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/ report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.32.11/arch/x86/kernel/e820.c linux-2.6.32.11/arch/x86/kernel/e820.c ---- linux-2.6.32.11/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/e820.c linux-2.6.32.14/arch/x86/kernel/e820.c +--- linux-2.6.32.14/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400 @@ -733,7 +733,7 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -10175,9 +10317,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/e820.c linux-2.6.32.11/arch/x86/kerne }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_32.c linux-2.6.32.11/arch/x86/kernel/efi_32.c ---- linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/efi_32.c linux-2.6.32.14/arch/x86/kernel/efi_32.c +--- linux-2.6.32.14/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400 @@ -38,70 +38,38 @@ */ @@ -10258,9 +10400,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_32.c linux-2.6.32.11/arch/x86/ker /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400 @@ -6,6 +6,7 @@ */ @@ -10359,9 +10501,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S linux-2.6.32.11/arch/x8 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_32.S linux-2.6.32.11/arch/x86/kernel/entry_32.S ---- linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/entry_32.S linux-2.6.32.14/arch/x86/kernel/entry_32.S +--- linux-2.6.32.14/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/entry_32.S 2010-05-28 21:27:15.031137412 -0400 @@ -191,7 +191,67 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -10675,9 +10817,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_32.S linux-2.6.32.11/arch/x86/k RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/kernel/entry_64.S ---- linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-04-07 16:58:23.343008831 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/entry_64.S linux-2.6.32.14/arch/x86/kernel/entry_64.S +--- linux-2.6.32.14/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400 @@ -53,6 +53,7 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -10876,6 +11018,24 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k .macro TRACE_IRQS_IRETQ offset=ARGOFFSET #ifdef CONFIG_TRACE_IRQFLAGS +@@ -317,7 +501,7 @@ ENTRY(save_args) + leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */ + movq_cfi rbp, 8 /* push %rbp */ + leaq 8(%rsp), %rbp /* mov %rsp, %ebp */ +- testl $3, CS(%rdi) ++ testb $3, CS(%rdi) + je 1f + SWAPGS + /* +@@ -409,7 +593,7 @@ ENTRY(ret_from_fork) + + RESTORE_REST + +- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? ++ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread? + je int_ret_from_sys_call + + testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET @@ -468,6 +652,11 @@ ENTRY(system_call_after_swapgs) movq %rsp,PER_CPU_VAR(old_rsp) @@ -10900,25 +11060,42 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k /* * sysretq will re-enable interrupts: */ -@@ -800,7 +994,16 @@ END(interrupt) +@@ -613,7 +807,7 @@ tracesys: + GLOBAL(int_ret_from_sys_call) + DISABLE_INTERRUPTS(CLBR_NONE) + TRACE_IRQS_OFF +- testl $3,CS-ARGOFFSET(%rsp) ++ testb $3,CS-ARGOFFSET(%rsp) + je retint_restore_args + movl $_TIF_ALLWORK_MASK,%edi + /* edi: mask to check */ +@@ -800,6 +994,16 @@ END(interrupt) CFI_ADJUST_CFA_OFFSET 10*8 call save_args PARTIAL_FRAME 0 -- call \func +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rdi) ++ testb $3, CS(%rdi) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: call \func + call \func .endm - /* -@@ -844,12 +1047,18 @@ retint_swapgs: /* return to user-space +@@ -822,7 +1026,7 @@ ret_from_intr: + CFI_ADJUST_CFA_OFFSET -8 + exit_intr: + GET_THREAD_INFO(%rcx) +- testl $3,CS-ARGOFFSET(%rsp) ++ testb $3,CS-ARGOFFSET(%rsp) + je retint_kernel + + /* Interrupt came from user space */ +@@ -844,12 +1048,18 @@ retint_swapgs: /* return to user-space * The iretq could re-enable interrupts: */ DISABLE_INTERRUPTS(CLBR_ANY) @@ -10937,57 +11114,55 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k /* * The iretq could re-enable interrupts: */ -@@ -1032,7 +1241,16 @@ ENTRY(\sym) +@@ -1032,6 +1242,16 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET 15*8 call error_entry DEFAULT_FRAME 0 -- movq %rsp,%rdi /* pt_regs pointer */ +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rsp) ++ testb $3, CS(%rsp) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: movq %rsp,%rdi /* pt_regs pointer */ + movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym - jmp error_exit /* %ebx: no swapgs flag */ -@@ -1049,7 +1267,16 @@ ENTRY(\sym) +@@ -1049,6 +1269,16 @@ ENTRY(\sym) subq $15*8, %rsp call save_paranoid TRACE_IRQS_OFF -- movq %rsp,%rdi /* pt_regs pointer */ +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rsp) ++ testb $3, CS(%rsp) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: movq %rsp,%rdi /* pt_regs pointer */ + movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym - jmp paranoid_exit /* %ebx: no swapgs flag */ -@@ -1066,9 +1293,23 @@ ENTRY(\sym) +@@ -1066,9 +1296,24 @@ ENTRY(\sym) subq $15*8, %rsp call save_paranoid TRACE_IRQS_OFF -- movq %rsp,%rdi /* pt_regs pointer */ +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rsp) ++ testb $3, CS(%rsp) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: movq %rsp,%rdi /* pt_regs pointer */ + movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ - PER_CPU(init_tss, %rbp) +#ifdef CONFIG_SMP @@ -10999,47 +11174,60 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) call \do_sym addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) -@@ -1085,7 +1326,16 @@ ENTRY(\sym) +@@ -1085,6 +1330,16 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET 15*8 call error_entry DEFAULT_FRAME 0 -- movq %rsp,%rdi /* pt_regs pointer */ +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rsp) ++ testb $3, CS(%rsp) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: movq %rsp,%rdi /* pt_regs pointer */ + movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ - call \do_sym -@@ -1104,7 +1354,16 @@ ENTRY(\sym) +@@ -1104,6 +1359,16 @@ ENTRY(\sym) call save_paranoid DEFAULT_FRAME 0 TRACE_IRQS_OFF -- movq %rsp,%rdi /* pt_regs pointer */ +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rsp) ++ testb $3, CS(%rsp) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: movq %rsp,%rdi /* pt_regs pointer */ + movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ - call \do_sym -@@ -1408,11 +1667,13 @@ ENTRY(paranoid_exit) - testl $3,CS(%rsp) +@@ -1405,14 +1670,27 @@ ENTRY(paranoid_exit) + TRACE_IRQS_OFF + testl %ebx,%ebx /* swapgs needed? */ + jnz paranoid_restore +- testl $3,CS(%rsp) ++ testb $3,CS(%rsp) jnz paranoid_userspace ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ call pax_exit_kernel ++ TRACE_IRQS_IRETQ 0 ++ SWAPGS_UNSAFE_STACK ++ RESTORE_ALL 8 ++ jmp irq_return ++#endif paranoid_swapgs: ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ call pax_exit_kernel_user ++#else + call pax_exit_kernel ++#endif TRACE_IRQS_IRETQ 0 SWAPGS_UNSAFE_STACK RESTORE_ALL 8 @@ -11049,24 +11237,39 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k TRACE_IRQS_IRETQ 0 RESTORE_ALL 8 jmp irq_return -@@ -1529,6 +1790,16 @@ ENTRY(nmi) +@@ -1470,7 +1748,7 @@ ENTRY(error_entry) + movq_cfi r14, R14+8 + movq_cfi r15, R15+8 + xorl %ebx,%ebx +- testl $3,CS+8(%rsp) ++ testb $3,CS+8(%rsp) + je error_kernelspace + error_swapgs: + SWAPGS +@@ -1529,6 +1807,16 @@ ENTRY(nmi) CFI_ADJUST_CFA_OFFSET 15*8 call save_paranoid DEFAULT_FRAME 0 +#ifdef CONFIG_PAX_MEMORY_UDEREF -+ testl $3, CS(%rsp) ++ testb $3, CS(%rsp) + jnz 1f + call pax_enter_kernel + jmp 2f +1: call pax_enter_kernel_user ++2: +#else + call pax_enter_kernel +#endif -+2: /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi -@@ -1544,6 +1815,7 @@ ENTRY(nmi) +@@ -1539,11 +1827,12 @@ ENTRY(nmi) + DISABLE_INTERRUPTS(CLBR_NONE) + testl %ebx,%ebx /* swapgs needed? */ + jnz nmi_restore +- testl $3,CS(%rsp) ++ testb $3,CS(%rsp) + jnz nmi_userspace nmi_swapgs: SWAPGS_UNSAFE_STACK nmi_restore: @@ -11074,9 +11277,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k RESTORE_ALL 8 jmp irq_return nmi_userspace: -diff -urNp linux-2.6.32.11/arch/x86/kernel/ftrace.c linux-2.6.32.11/arch/x86/kernel/ftrace.c ---- linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/ftrace.c linux-2.6.32.14/arch/x86/kernel/ftrace.c +--- linux-2.6.32.14/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -11142,9 +11345,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ftrace.c linux-2.6.32.11/arch/x86/ker if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.32.11/arch/x86/kernel/head32.c linux-2.6.32.11/arch/x86/kernel/head32.c ---- linux-2.6.32.11/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/head32.c linux-2.6.32.14/arch/x86/kernel/head32.c +--- linux-2.6.32.14/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400 @@ -16,6 +16,7 @@ #include <asm/apic.h> #include <asm/io_apic.h> @@ -11162,9 +11365,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head32.c linux-2.6.32.11/arch/x86/ker #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.11/arch/x86/kernel/head_32.S linux-2.6.32.11/arch/x86/kernel/head_32.S ---- linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/head_32.S linux-2.6.32.14/arch/x86/kernel/head_32.S +--- linux-2.6.32.14/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/head_32.S 2010-05-28 21:27:15.039159907 -0400 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -11606,9 +11809,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head_32.S linux-2.6.32.11/arch/x86/ke + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.32.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/kernel/head64.c ---- linux-2.6.32.11/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/head64.c linux-2.6.32.14/arch/x86/kernel/head64.c +--- linux-2.6.32.14/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/head64.c 2010-05-28 21:27:15.039159907 -0400 @@ -29,7 +29,13 @@ static void __init zap_identity_mappings(void) { @@ -11623,9 +11826,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/ker __flush_tlb_all(); } -diff -urNp linux-2.6.32.11/arch/x86/kernel/head_64.S linux-2.6.32.11/arch/x86/kernel/head_64.S ---- linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/head_64.S linux-2.6.32.14/arch/x86/kernel/head_64.S +--- linux-2.6.32.14/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -11896,9 +12099,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head_64.S linux-2.6.32.11/arch/x86/ke __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -11920,9 +12123,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.11/arch/ +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.11/arch/x86/kernel/init_task.c linux-2.6.32.11/arch/x86/kernel/init_task.c ---- linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/init_task.c linux-2.6.32.14/arch/x86/kernel/init_task.c +--- linux-2.6.32.14/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. @@ -11931,9 +12134,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/init_task.c linux-2.6.32.11/arch/x86/ - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.32.11/arch/x86/kernel/ioport.c linux-2.6.32.11/arch/x86/kernel/ioport.c ---- linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/ioport.c linux-2.6.32.14/arch/x86/kernel/ioport.c +--- linux-2.6.32.14/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/ioport.c 2010-05-28 21:27:15.039159907 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -11978,9 +12181,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ioport.c linux-2.6.32.11/arch/x86/ker } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.32.11/arch/x86/kernel/irq_32.c linux-2.6.32.11/arch/x86/kernel/irq_32.c ---- linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/irq_32.c linux-2.6.32.14/arch/x86/kernel/irq_32.c +--- linux-2.6.32.14/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -11999,9 +12202,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/irq_32.c linux-2.6.32.11/arch/x86/ker call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kernel/kgdb.c ---- linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/kgdb.c linux-2.6.32.14/arch/x86/kernel/kgdb.c +--- linux-2.6.32.14/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -12011,9 +12214,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kerne /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/kernel/kprobes.c ---- linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/kprobes.c linux-2.6.32.14/arch/x86/kernel/kprobes.c +--- linux-2.6.32.14/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -12029,7 +12232,17 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke } /* -@@ -345,16 +349,18 @@ static void __kprobes fix_riprel(struct +@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct + disp = (u8 *) p->addr + *((s32 *) insn) - + (u8 *) p->ainsn.insn; + BUG_ON((s64) (s32) disp != disp); /* Sanity check. */ ++ pax_open_kernel(); + *(s32 *)insn = (s32) disp; ++ pax_close_kernel(); + } + } + #endif +@@ -345,16 +351,18 @@ static void __kprobes fix_riprel(struct static void __kprobes arch_copy_kprobe(struct kprobe *p) { @@ -12051,7 +12264,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke } int __kprobes arch_prepare_kprobe(struct kprobe *p) -@@ -432,7 +438,7 @@ static void __kprobes prepare_singlestep +@@ -432,7 +440,7 @@ static void __kprobes prepare_singlestep if (p->opcode == BREAKPOINT_INSTRUCTION) regs->ip = (unsigned long)p->addr; else @@ -12060,7 +12273,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke } void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, -@@ -453,7 +459,7 @@ static void __kprobes setup_singlestep(s +@@ -453,7 +461,7 @@ static void __kprobes setup_singlestep(s if (p->ainsn.boostable == 1 && !p->post_handler) { /* Boost up -- we can execute copied instructions directly */ reset_current_kprobe(); @@ -12069,7 +12282,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke preempt_enable_no_resched(); return; } -@@ -523,7 +529,7 @@ static int __kprobes kprobe_handler(stru +@@ -523,7 +531,7 @@ static int __kprobes kprobe_handler(stru struct kprobe_ctlblk *kcb; addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t)); @@ -12078,7 +12291,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke /* * The breakpoint instruction was removed right * after we hit it. Another cpu has removed -@@ -775,7 +781,7 @@ static void __kprobes resume_execution(s +@@ -775,7 +783,7 @@ static void __kprobes resume_execution(s struct pt_regs *regs, struct kprobe_ctlblk *kcb) { unsigned long *tos = stack_addr(regs); @@ -12087,7 +12300,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke unsigned long orig_ip = (unsigned long)p->addr; kprobe_opcode_t *insn = p->ainsn.insn; -@@ -958,7 +964,7 @@ int __kprobes kprobe_exceptions_notify(s +@@ -958,7 +966,7 @@ int __kprobes kprobe_exceptions_notify(s struct die_args *args = data; int ret = NOTIFY_DONE; @@ -12096,9 +12309,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke return ret; switch (val) { -diff -urNp linux-2.6.32.11/arch/x86/kernel/ldt.c linux-2.6.32.11/arch/x86/kernel/ldt.c ---- linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/ldt.c linux-2.6.32.14/arch/x86/kernel/ldt.c +--- linux-2.6.32.14/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -12163,9 +12376,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ldt.c linux-2.6.32.11/arch/x86/kernel fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -12193,9 +12406,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.11/ar relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c ---- linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c +--- linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c 2010-05-28 21:27:15.043064911 -0400 @@ -126,7 +126,13 @@ static int init_level4_page(struct kimag } /* clear the unused entries */ @@ -12210,9 +12423,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.11/ar addr += PGDIR_SIZE; } out: -diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_amd.c linux-2.6.32.14/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.14/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -12231,9 +12444,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/ { return µcode_amd_ops; } -diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_core.c linux-2.6.32.11/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_core.c linux-2.6.32.14/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.14/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -12243,9 +12456,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_core.c linux-2.6.32.11/arch /* * Synchronization. -diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_intel.c linux-2.6.32.11/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_intel.c linux-2.6.32.14/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.14/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -12280,9 +12493,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_intel.c linux-2.6.32.11/arc { return µcode_intel_ops; } -diff -urNp linux-2.6.32.11/arch/x86/kernel/module.c linux-2.6.32.11/arch/x86/kernel/module.c ---- linux-2.6.32.11/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/module.c linux-2.6.32.14/arch/x86/kernel/module.c +--- linux-2.6.32.14/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -12423,37 +12636,36 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/module.c linux-2.6.32.11/arch/x86/ker #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt.c linux-2.6.32.11/arch/x86/kernel/paravirt.c ---- linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-04-04 20:46:41.521777445 -0400 -@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu - - /* Neat trick to map patch type back to the call within the +diff -urNp linux-2.6.32.14/arch/x86/kernel/paravirt.c linux-2.6.32.14/arch/x86/kernel/paravirt.c +--- linux-2.6.32.14/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400 +@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ --static void *get_call_destination(u8 type) -+static const void *get_call_destination(u8 type) + static void *get_call_destination(u8 type) { - struct paravirt_patch_template tmpl = { + const struct paravirt_patch_template tmpl = { .pv_init_ops = pv_init_ops, .pv_time_ops = pv_time_ops, .pv_cpu_ops = pv_cpu_ops, -@@ -133,13 +133,13 @@ static void *get_call_destination(u8 typ - .pv_lock_ops = pv_lock_ops, - #endif - }; -- return *((void **)&tmpl + type); -+ return *((const void **)&tmpl + type); - } - - unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, - unsigned long addr, unsigned len) - { -- void *opfunc = get_call_destination(type); -+ const void *opfunc = get_call_destination(type); - unsigned ret; - +@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type, if (opfunc == NULL) + /* If there's no function, patch it with a ud2a (BUG) */ + ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); +- else if (opfunc == _paravirt_nop) ++ else if (opfunc == (void *)_paravirt_nop) + /* If the operation is a nop, then nop the callsite */ + ret = paravirt_patch_nop(); + + /* identity functions just return their single argument */ +- else if (opfunc == _paravirt_ident_32) ++ else if (opfunc == (void *)_paravirt_ident_32) + ret = paravirt_patch_ident_32(insnbuf, len); +- else if (opfunc == _paravirt_ident_64) ++ else if (opfunc == (void *)_paravirt_ident_64) + ret = paravirt_patch_ident_64(insnbuf, len); + + else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || @@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn if (insn_len > len || start == NULL) insn_len = len; @@ -12530,9 +12742,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt.c linux-2.6.32.11/arch/x86/k }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -12542,9 +12754,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/ #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400 @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -12554,9 +12766,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.11/arch .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-dma.c linux-2.6.32.11/arch/x86/kernel/pci-dma.c ---- linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-dma.c linux-2.6.32.14/arch/x86/kernel/pci-dma.c +--- linux-2.6.32.14/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400 @@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -12575,10 +12787,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-dma.c linux-2.6.32.11/arch/x86/ke #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c ---- linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-04-04 20:46:41.521777445 -0400 -@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag +diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400 +@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -12587,9 +12799,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c linux-2.6.32.11/arch/x8 .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/kernel/pci-nommu.c ---- linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-nommu.c linux-2.6.32.14/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32.14/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -12599,9 +12811,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/ .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -12611,9 +12823,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/arch/x8 .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, -diff -urNp linux-2.6.32.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86/kernel/process_32.c ---- linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/process_32.c linux-2.6.32.14/arch/x86/kernel/process_32.c +--- linux-2.6.32.14/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -12708,9 +12920,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86 + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86/kernel/process_64.c ---- linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/process_64.c linux-2.6.32.14/arch/x86/kernel/process_64.c +--- linux-2.6.32.14/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -12729,7 +12941,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86 init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version, board); -@@ -381,7 +381,7 @@ __switch_to(struct task_struct *prev_p, +@@ -380,7 +380,7 @@ __switch_to(struct task_struct *prev_p, struct thread_struct *prev = &prev_p->thread; struct thread_struct *next = &next_p->thread; int cpu = smp_processor_id(); @@ -12738,7 +12950,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86 unsigned fsindex, gsindex; bool preload_fpu; -@@ -561,12 +561,11 @@ unsigned long get_wchan(struct task_stru +@@ -560,12 +560,11 @@ unsigned long get_wchan(struct task_stru if (!p || p == current || p->state == TASK_RUNNING) return 0; stack = (unsigned long)task_stack_page(p); @@ -12753,9 +12965,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86 return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/kernel/process.c ---- linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/process.c linux-2.6.32.14/arch/x86/kernel/process.c +--- linux-2.6.32.14/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400 @@ -73,7 +73,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -12775,7 +12987,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/ke tsk->thread.debugreg0 = 0; tsk->thread.debugreg1 = 0; tsk->thread.debugreg2 = 0; -@@ -600,17 +603,3 @@ static int __init idle_setup(char *str) +@@ -602,17 +605,3 @@ static int __init idle_setup(char *str) return 0; } early_param("idle", idle_setup); @@ -12793,9 +13005,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/ke - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - -diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/kernel/ptrace.c ---- linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/ptrace.c linux-2.6.32.14/arch/x86/kernel/ptrace.c +--- linux-2.6.32.14/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400 @@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, long data) { @@ -12864,9 +13076,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/ker /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/kernel/reboot.c ---- linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/reboot.c linux-2.6.32.14/arch/x86/kernel/reboot.c +--- linux-2.6.32.14/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -12943,9 +13155,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/ker /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.32.11/arch/x86/kernel/setup.c linux-2.6.32.11/arch/x86/kernel/setup.c ---- linux-2.6.32.11/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/setup.c linux-2.6.32.14/arch/x86/kernel/setup.c +--- linux-2.6.32.14/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400 @@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) @@ -12966,9 +13178,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/setup.c linux-2.6.32.11/arch/x86/kern data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.32.11/arch/x86/kernel/setup_percpu.c linux-2.6.32.11/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/setup_percpu.c linux-2.6.32.14/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.14/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -13031,9 +13243,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/setup_percpu.c linux-2.6.32.11/arch/x /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.32.11/arch/x86/kernel/signal.c linux-2.6.32.11/arch/x86/kernel/signal.c ---- linux-2.6.32.11/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/signal.c linux-2.6.32.14/arch/x86/kernel/signal.c +--- linux-2.6.32.14/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. @@ -13105,9 +13317,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/signal.c linux-2.6.32.11/arch/x86/ker return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.11/arch/x86/kernel/smpboot.c linux-2.6.32.11/arch/x86/kernel/smpboot.c ---- linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/smpboot.c linux-2.6.32.14/arch/x86/kernel/smpboot.c +--- linux-2.6.32.14/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400 @@ -729,7 +729,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - KERNEL_STACK_OFFSET + THREAD_SIZE; @@ -13133,9 +13345,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/smpboot.c linux-2.6.32.11/arch/x86/ke #ifdef CONFIG_X86_32 /* init low mem mapping */ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, -diff -urNp linux-2.6.32.11/arch/x86/kernel/step.c linux-2.6.32.11/arch/x86/kernel/step.c ---- linux-2.6.32.11/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/step.c linux-2.6.32.14/arch/x86/kernel/step.c +--- linux-2.6.32.14/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -13168,17 +13380,17 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/step.c linux-2.6.32.11/arch/x86/kerne /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -13425,9 +13637,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c linux-2.6.32.11/arch/x8 } case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) -diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -13509,9 +13721,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c linux-2.6.32.11/arch/x86 mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.32.11/arch/x86/kernel/time.c linux-2.6.32.11/arch/x86/kernel/time.c ---- linux-2.6.32.11/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/time.c linux-2.6.32.14/arch/x86/kernel/time.c +--- linux-2.6.32.14/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -13550,9 +13762,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/time.c linux-2.6.32.11/arch/x86/kerne } return pc; } -diff -urNp linux-2.6.32.11/arch/x86/kernel/tls.c linux-2.6.32.11/arch/x86/kernel/tls.c ---- linux-2.6.32.11/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/tls.c linux-2.6.32.14/arch/x86/kernel/tls.c +--- linux-2.6.32.14/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -13565,9 +13777,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/tls.c linux-2.6.32.11/arch/x86/kernel set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.32.11/arch/x86/kernel/trampoline_32.S linux-2.6.32.11/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/trampoline_32.S linux-2.6.32.14/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.14/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -13590,9 +13802,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/trampoline_32.S linux-2.6.32.11/arch/ # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.32.11/arch/x86/kernel/traps.c linux-2.6.32.11/arch/x86/kernel/traps.c ---- linux-2.6.32.11/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/traps.c linux-2.6.32.14/arch/x86/kernel/traps.c +--- linux-2.6.32.14/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -13742,9 +13954,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/traps.c linux-2.6.32.11/arch/x86/kern handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel/tsc.c ---- linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/tsc.c linux-2.6.32.14/arch/x86/kernel/tsc.c +--- linux-2.6.32.14/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400 @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -13754,9 +13966,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.32.11/arch/x86/kernel/vm86_32.c linux-2.6.32.11/arch/x86/kernel/vm86_32.c ---- linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/vm86_32.c linux-2.6.32.14/arch/x86/kernel/vm86_32.c +--- linux-2.6.32.14/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -13821,9 +14033,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vm86_32.c linux-2.6.32.11/arch/x86/ke if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.32.11/arch/x86/kernel/vmi_32.c linux-2.6.32.11/arch/x86/kernel/vmi_32.c ---- linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/vmi_32.c linux-2.6.32.14/arch/x86/kernel/vmi_32.c +--- linux-2.6.32.14/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -13983,9 +14195,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vmi_32.c linux-2.6.32.11/arch/x86/ker return; local_irq_save(flags); -diff -urNp linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400 @@ -26,6 +26,22 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -14273,9 +14485,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.11/arch/x8 "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -14309,9 +14521,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c linux-2.6.32.11/arch/x8 }; #endif -diff -urNp linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -14321,9 +14533,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.11/arch EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.11/arch/x86/kernel/xsave.c linux-2.6.32.11/arch/x86/kernel/xsave.c ---- linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kernel/xsave.c linux-2.6.32.14/arch/x86/kernel/xsave.c +--- linux-2.6.32.14/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -14351,10 +14563,21 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/xsave.c linux-2.6.32.11/arch/x86/kern buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/emulate.c ---- linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-04-04 20:46:41.529538490 -0400 -@@ -404,6 +404,7 @@ static u32 group2_table[] = { +diff -urNp linux-2.6.32.14/arch/x86/kvm/emulate.c linux-2.6.32.14/arch/x86/kvm/emulate.c +--- linux-2.6.32.14/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 ++++ linux-2.6.32.14/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400 +@@ -81,8 +81,8 @@ + #define Src2CL (1<<29) + #define Src2ImmByte (2<<29) + #define Src2One (3<<29) +-#define Src2Imm16 (4<<29) +-#define Src2Mask (7<<29) ++#define Src2Imm16 (4U<<29) ++#define Src2Mask (7U<<29) + + enum { + Group1_80, Group1_81, Group1_82, Group1_83, +@@ -411,6 +411,7 @@ static u32 group2_table[] = { #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ do { \ @@ -14362,7 +14585,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/e __asm__ __volatile__ ( \ _PRE_EFLAGS("0", "4", "2") \ _op _suffix " %"_x"3,%1; " \ -@@ -417,8 +418,6 @@ static u32 group2_table[] = { +@@ -424,8 +425,6 @@ static u32 group2_table[] = { /* Raw emulation: instruction has two explicit operands. */ #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ do { \ @@ -14371,7 +14594,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/e switch ((_dst).bytes) { \ case 2: \ ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ -@@ -434,7 +433,6 @@ static u32 group2_table[] = { +@@ -441,7 +440,6 @@ static u32 group2_table[] = { #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ do { \ @@ -14379,10 +14602,22 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/e switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c ---- linux-2.6.32.11/arch/x86/kvm/svm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kvm/svm.c 2010-04-04 20:46:41.529538490 -0400 -@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k +diff -urNp linux-2.6.32.14/arch/x86/kvm/lapic.c linux-2.6.32.14/arch/x86/kvm/lapic.c +--- linux-2.6.32.14/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400 +@@ -52,7 +52,7 @@ + #define APIC_BUS_CYCLE_NS 1 + + /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ +-#define apic_debug(fmt, arg...) ++#define apic_debug(fmt, arg...) do {} while (0) + + #define APIC_LVT_NUM 6 + /* 14 is the version for Xeon and Pentium 8.4.8*/ +diff -urNp linux-2.6.32.14/arch/x86/kvm/svm.c linux-2.6.32.14/arch/x86/kvm/svm.c +--- linux-2.6.32.14/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 ++++ linux-2.6.32.14/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400 +@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { int cpu = raw_smp_processor_id(); @@ -14396,7 +14631,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c load_TR_desc(); } -@@ -2839,7 +2842,7 @@ static bool svm_gb_page_enable(void) +@@ -2845,7 +2848,7 @@ static bool svm_gb_page_enable(void) return true; } @@ -14405,10 +14640,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c ---- linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-04-04 20:46:41.529538490 -0400 -@@ -566,7 +566,11 @@ static void reload_tss(void) +diff -urNp linux-2.6.32.14/arch/x86/kvm/vmx.c linux-2.6.32.14/arch/x86/kvm/vmx.c +--- linux-2.6.32.14/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 ++++ linux-2.6.32.14/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400 +@@ -568,7 +568,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); descs = (void *)gdt.base; @@ -14420,7 +14655,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c load_TR_desc(); } -@@ -1388,8 +1392,11 @@ static __init int hardware_setup(void) +@@ -1395,8 +1399,11 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; @@ -14434,7 +14669,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); -@@ -2339,7 +2346,7 @@ static int vmx_vcpu_setup(struct vcpu_vm +@@ -2347,7 +2354,7 @@ static int vmx_vcpu_setup(struct vcpu_vm vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); @@ -14443,7 +14678,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); -@@ -3682,6 +3689,12 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3703,6 +3710,12 @@ static void vmx_vcpu_run(struct kvm_vcpu "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".Lkvm_vmx_return: " @@ -14456,7 +14691,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" -@@ -3728,6 +3741,11 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3749,8 +3762,13 @@ static void vmx_vcpu_run(struct kvm_vcpu [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) @@ -14466,9 +14701,12 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c +#endif + : "cc", "memory" - , R"bx", R"di", R"si" +- , R"bx", R"di", R"si" ++ , R"ax", R"bx", R"di", R"si" #ifdef CONFIG_X86_64 -@@ -3746,7 +3764,7 @@ static void vmx_vcpu_run(struct kvm_vcpu + , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" + #endif +@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu if (vmx->rmode.irq.pending) fixup_rmode_irq(vmx); @@ -14477,7 +14715,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c vmx->launched = 1; vmx_complete_interrupts(vmx); -@@ -3921,7 +3939,7 @@ static bool vmx_gb_page_enable(void) +@@ -3942,7 +3960,7 @@ static bool vmx_gb_page_enable(void) return false; } @@ -14486,9 +14724,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c ---- linux-2.6.32.11/arch/x86/kvm/x86.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/kvm/x86.c 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/kvm/x86.c linux-2.6.32.14/arch/x86/kvm/x86.c +--- linux-2.6.32.14/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 ++++ linux-2.6.32.14/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -14568,7 +14806,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c { NULL } }; -@@ -1658,7 +1658,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -1635,7 +1635,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -14577,7 +14815,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -3170,10 +3170,10 @@ static struct notifier_block kvmclock_cp +@@ -3205,10 +3205,10 @@ static struct notifier_block kvmclock_cp .notifier_call = kvmclock_cpufreq_notifier }; @@ -14590,9 +14828,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.32.11/arch/x86/lib/checksum_32.S linux-2.6.32.11/arch/x86/lib/checksum_32.S ---- linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/checksum_32.S linux-2.6.32.14/arch/x86/lib/checksum_32.S +--- linux-2.6.32.14/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -14838,9 +15076,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/checksum_32.S linux-2.6.32.11/arch/x86/l #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.32.11/arch/x86/lib/clear_page_64.S linux-2.6.32.11/arch/x86/lib/clear_page_64.S ---- linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/clear_page_64.S linux-2.6.32.14/arch/x86/lib/clear_page_64.S +--- linux-2.6.32.14/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -14850,9 +15088,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/clear_page_64.S linux-2.6.32.11/arch/x86 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.11/arch/x86/lib/copy_page_64.S linux-2.6.32.11/arch/x86/lib/copy_page_64.S ---- linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/copy_page_64.S linux-2.6.32.14/arch/x86/lib/copy_page_64.S +--- linux-2.6.32.14/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -14862,9 +15100,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/copy_page_64.S linux-2.6.32.11/arch/x86/ 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_64.S linux-2.6.32.11/arch/x86/lib/copy_user_64.S ---- linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/copy_user_64.S linux-2.6.32.14/arch/x86/lib/copy_user_64.S +--- linux-2.6.32.14/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -15,13 +15,14 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -14939,9 +15177,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_64.S linux-2.6.32.11/arch/x86/ movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -14,6 +14,7 @@ #include <asm/current.h> #include <asm/asm-offsets.h> @@ -14966,9 +15204,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.11/a cmpl $8,%edx jb 20f /* less then 8 bytes, go to byte copy loop */ ALIGN_DESTINATION -diff -urNp linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -14987,9 +15225,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.11/arch/ return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp); } -diff -urNp linux-2.6.32.11/arch/x86/lib/getuser.S linux-2.6.32.11/arch/x86/lib/getuser.S ---- linux-2.6.32.11/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/getuser.S linux-2.6.32.14/arch/x86/lib/getuser.S +--- linux-2.6.32.14/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400 @@ -33,14 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15126,9 +15364,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/getuser.S linux-2.6.32.11/arch/x86/lib/g xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.32.11/arch/x86/lib/memcpy_64.S linux-2.6.32.11/arch/x86/lib/memcpy_64.S ---- linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/memcpy_64.S linux-2.6.32.14/arch/x86/lib/memcpy_64.S +--- linux-2.6.32.14/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -15138,9 +15376,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/memcpy_64.S linux-2.6.32.11/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.11/arch/x86/lib/memset_64.S linux-2.6.32.11/arch/x86/lib/memset_64.S ---- linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/memset_64.S linux-2.6.32.14/arch/x86/lib/memset_64.S +--- linux-2.6.32.14/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -15150,9 +15388,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/memset_64.S linux-2.6.32.11/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.11/arch/x86/lib/mmx_32.c linux-2.6.32.11/arch/x86/lib/mmx_32.c ---- linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/mmx_32.c linux-2.6.32.14/arch/x86/lib/mmx_32.c +--- linux-2.6.32.14/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -15468,9 +15706,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/mmx_32.c linux-2.6.32.11/arch/x86/lib/mm from += 64; to += 64; -diff -urNp linux-2.6.32.11/arch/x86/lib/putuser.S linux-2.6.32.11/arch/x86/lib/putuser.S ---- linux-2.6.32.11/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/putuser.S linux-2.6.32.14/arch/x86/lib/putuser.S +--- linux-2.6.32.14/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400 @@ -15,7 +15,8 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -15640,9 +15878,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/putuser.S linux-2.6.32.11/arch/x86/lib/p movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_32.c linux-2.6.32.11/arch/x86/lib/usercopy_32.c ---- linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/usercopy_32.c linux-2.6.32.14/arch/x86/lib/usercopy_32.c +--- linux-2.6.32.14/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -16611,9 +16849,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_32.c linux-2.6.32.11/arch/x86/l +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_64.c linux-2.6.32.11/arch/x86/lib/usercopy_64.c ---- linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/lib/usercopy_64.c linux-2.6.32.14/arch/x86/lib/usercopy_64.c +--- linux-2.6.32.14/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -16650,9 +16888,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_64.c linux-2.6.32.11/arch/x86/l } EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.11/arch/x86/Makefile linux-2.6.32.11/arch/x86/Makefile ---- linux-2.6.32.11/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/Makefile linux-2.6.32.14/arch/x86/Makefile +--- linux-2.6.32.14/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' @@ -16666,9 +16904,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Makefile linux-2.6.32.11/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.11/arch/x86/mm/extable.c linux-2.6.32.11/arch/x86/mm/extable.c ---- linux-2.6.32.11/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/extable.c linux-2.6.32.14/arch/x86/mm/extable.c +--- linux-2.6.32.14/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -16742,9 +16980,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/extable.c linux-2.6.32.11/arch/x86/mm/ext extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault.c ---- linux-2.6.32.11/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/fault.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/fault.c linux-2.6.32.14/arch/x86/mm/fault.c +--- linux-2.6.32.14/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/fault.c 2010-05-28 21:27:15.107152206 -0400 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -16805,7 +17043,43 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault DEFINE_SPINLOCK(pgd_lock); LIST_HEAD(pgd_list); -@@ -332,15 +365,27 @@ void vmalloc_sync_all(void) +@@ -224,11 +257,24 @@ void vmalloc_sync_all(void) + address += PMD_SIZE) { + + unsigned long flags; ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ unsigned long cpu; ++#else + struct page *page; ++#endif + + spin_lock_irqsave(&pgd_lock, flags); ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ for (cpu = 0; cpu < NR_CPUS; ++cpu) { ++ pgd_t *pgd = get_cpu_pgd(cpu); ++#else + list_for_each_entry(page, &pgd_list, lru) { +- if (!vmalloc_sync_one(page_address(page), address)) ++ pgd_t *pgd = page_address(page); ++#endif ++ ++ if (!vmalloc_sync_one(pgd, address)) + break; + } + spin_unlock_irqrestore(&pgd_lock, flags); +@@ -257,6 +303,9 @@ static noinline int vmalloc_fault(unsign + * Do _not_ use "current" here. We might be inside + * an interrupt in the middle of a task switch.. + */ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK)); ++#endif + pgd_paddr = read_cr3(); + pmd_k = vmalloc_sync_one(__va(pgd_paddr), address); + if (!pmd_k) +@@ -332,15 +381,27 @@ void vmalloc_sync_all(void) const pgd_t *pgd_ref = pgd_offset_k(address); unsigned long flags; @@ -16833,7 +17107,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault if (pgd_none(*pgd)) set_pgd(pgd, *pgd_ref); else -@@ -373,7 +418,14 @@ static noinline int vmalloc_fault(unsign +@@ -373,7 +434,14 @@ static noinline int vmalloc_fault(unsign * happen within a race in page table update. In the later * case just flush: */ @@ -16848,7 +17122,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault pgd_ref = pgd_offset_k(address); if (pgd_none(*pgd_ref)) return -1; -@@ -535,7 +587,7 @@ static int is_errata93(struct pt_regs *r +@@ -535,7 +603,7 @@ static int is_errata93(struct pt_regs *r static int is_errata100(struct pt_regs *regs, unsigned long address) { #ifdef CONFIG_X86_64 @@ -16857,7 +17131,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault return 1; #endif return 0; -@@ -562,7 +614,7 @@ static int is_f00f_bug(struct pt_regs *r +@@ -562,7 +630,7 @@ static int is_f00f_bug(struct pt_regs *r } static const char nx_warning[] = KERN_CRIT @@ -16866,7 +17140,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, -@@ -571,15 +623,26 @@ show_fault_oops(struct pt_regs *regs, un +@@ -571,15 +639,26 @@ show_fault_oops(struct pt_regs *regs, un if (!oops_may_print()) return; @@ -16895,7 +17169,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault printk(KERN_ALERT "BUG: unable to handle kernel "); if (address < PAGE_SIZE) printk(KERN_CONT "NULL pointer dereference"); -@@ -704,6 +767,68 @@ __bad_area_nosemaphore(struct pt_regs *r +@@ -704,6 +783,68 @@ __bad_area_nosemaphore(struct pt_regs *r unsigned long address, int si_code) { struct task_struct *tsk = current; @@ -16964,7 +17238,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault /* User mode accesses just cause a SIGSEGV */ if (error_code & PF_USER) { -@@ -848,6 +973,106 @@ static int spurious_fault_check(unsigned +@@ -848,6 +989,106 @@ static int spurious_fault_check(unsigned return 1; } @@ -17071,7 +17345,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault /* * Handle a spurious fault caused by a stale TLB entry. * -@@ -914,6 +1139,9 @@ int show_unhandled_signals = 1; +@@ -914,6 +1155,9 @@ int show_unhandled_signals = 1; static inline int access_error(unsigned long error_code, int write, struct vm_area_struct *vma) { @@ -17081,7 +17355,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault if (write) { /* write, present and write, not present: */ if (unlikely(!(vma->vm_flags & VM_WRITE))) -@@ -947,17 +1175,29 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -947,17 +1191,31 @@ do_page_fault(struct pt_regs *regs, unsi { struct vm_area_struct *vma; struct task_struct *tsk; @@ -17094,14 +17368,16 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault + unsigned long address = read_cr2(); + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) -+ if (!user_mode(regs)) { ++ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) { ++ if (!search_exception_tables(regs->ip)) { ++ bad_area_nosemaphore(regs, error_code, address); ++ return; ++ } + if (address < PAX_USER_SHADOW_BASE) { -+ if (search_exception_tables(regs->ip)) { -+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n"); -+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip); -+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR); -+ } -+ } else if (address < 2 * PAX_USER_SHADOW_BASE) ++ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n"); ++ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip); ++ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR); ++ } else + address -= PAX_USER_SHADOW_BASE; + } +#endif @@ -17115,7 +17391,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault /* * Detect and handle instructions that would cause a page fault for * both a tracked kernel page and a userspace page. -@@ -1017,7 +1257,7 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1017,7 +1275,7 @@ do_page_fault(struct pt_regs *regs, unsi * User-mode registers count as a user access even for any * potential system fault or CPU buglet: */ @@ -17124,7 +17400,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault local_irq_enable(); error_code |= PF_USER; } else { -@@ -1071,6 +1311,11 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1071,6 +1329,11 @@ do_page_fault(struct pt_regs *regs, unsi might_sleep(); } @@ -17136,7 +17412,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault vma = find_vma(mm, address); if (unlikely(!vma)) { bad_area(regs, error_code, address); -@@ -1082,18 +1327,24 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1082,18 +1345,24 @@ do_page_fault(struct pt_regs *regs, unsi bad_area(regs, error_code, address); return; } @@ -17172,7 +17448,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault if (unlikely(expand_stack(vma, address))) { bad_area(regs, error_code, address); return; -@@ -1137,3 +1388,199 @@ good_area: +@@ -1137,3 +1406,199 @@ good_area: up_read(&mm->mmap_sem); } @@ -17372,9 +17648,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.11/arch/x86/mm/gup.c linux-2.6.32.11/arch/x86/mm/gup.c ---- linux-2.6.32.11/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/gup.c linux-2.6.32.14/arch/x86/mm/gup.c +--- linux-2.6.32.14/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -17384,9 +17660,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/gup.c linux-2.6.32.11/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.32.11/arch/x86/mm/highmem_32.c linux-2.6.32.11/arch/x86/mm/highmem_32.c ---- linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/highmem_32.c linux-2.6.32.14/arch/x86/mm/highmem_32.c +--- linux-2.6.32.14/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -17398,9 +17674,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/highmem_32.c linux-2.6.32.11/arch/x86/mm/ return (void *)vaddr; } -diff -urNp linux-2.6.32.11/arch/x86/mm/hugetlbpage.c linux-2.6.32.11/arch/x86/mm/hugetlbpage.c ---- linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/hugetlbpage.c linux-2.6.32.14/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32.14/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -17535,9 +17811,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/hugetlbpage.c linux-2.6.32.11/arch/x86/mm (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.32.11/arch/x86/mm/init_32.c linux-2.6.32.11/arch/x86/mm/init_32.c ---- linux-2.6.32.11/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/init_32.c linux-2.6.32.14/arch/x86/mm/init_32.c +--- linux-2.6.32.14/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -17841,9 +18117,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/init_32.c linux-2.6.32.11/arch/x86/mm/ini set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.32.11/arch/x86/mm/init_64.c linux-2.6.32.11/arch/x86/mm/init_64.c ---- linux-2.6.32.11/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/init_64.c linux-2.6.32.14/arch/x86/mm/init_64.c +--- linux-2.6.32.14/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -17904,9 +18180,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/init_64.c linux-2.6.32.11/arch/x86/mm/ini return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.11/arch/x86/mm/init.c linux-2.6.32.11/arch/x86/mm/init.c ---- linux-2.6.32.11/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/init.c linux-2.6.32.14/arch/x86/mm/init.c +--- linux-2.6.32.14/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/init.c 2010-05-28 21:27:15.114903294 -0400 @@ -69,11 +69,7 @@ static void __init find_early_table_spac * cause a hotspot and fill up ZONE_DMA. The page tables * need roughly 0.5KB per GB. @@ -18023,9 +18299,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/init.c linux-2.6.32.11/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.32.11/arch/x86/mm/iomap_32.c linux-2.6.32.11/arch/x86/mm/iomap_32.c ---- linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/iomap_32.c linux-2.6.32.14/arch/x86/mm/iomap_32.c +--- linux-2.6.32.14/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -18038,9 +18314,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/iomap_32.c linux-2.6.32.11/arch/x86/mm/io arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.32.11/arch/x86/mm/ioremap.c linux-2.6.32.11/arch/x86/mm/ioremap.c ---- linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/ioremap.c linux-2.6.32.14/arch/x86/mm/ioremap.c +--- linux-2.6.32.14/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * area (640->1Mb) as ram even though it is not. @@ -18087,9 +18363,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/ioremap.c linux-2.6.32.11/arch/x86/mm/ior /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. @@ -18102,9 +18378,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.11/arc return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.32.11/arch/x86/mm/mmap.c linux-2.6.32.11/arch/x86/mm/mmap.c ---- linux-2.6.32.11/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/mmap.c linux-2.6.32.14/arch/x86/mm/mmap.c +--- linux-2.6.32.14/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -18186,9 +18462,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/mmap.c linux-2.6.32.11/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.11/arch/x86/mm/numa_32.c linux-2.6.32.11/arch/x86/mm/numa_32.c ---- linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/numa_32.c linux-2.6.32.14/arch/x86/mm/numa_32.c +--- linux-2.6.32.14/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -18197,9 +18473,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/numa_32.c linux-2.6.32.11/arch/x86/mm/num extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr.c linux-2.6.32.11/arch/x86/mm/pageattr.c ---- linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/pageattr.c linux-2.6.32.14/arch/x86/mm/pageattr.c +--- linux-2.6.32.14/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/pageattr.c 2010-05-28 21:27:15.118897735 -0400 @@ -268,9 +268,10 @@ static inline pgprot_t static_protection * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping @@ -18231,9 +18507,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr.c linux-2.6.32.11/arch/x86/mm/pa #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr-test.c linux-2.6.32.11/arch/x86/mm/pageattr-test.c ---- linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/pageattr-test.c linux-2.6.32.14/arch/x86/mm/pageattr-test.c +--- linux-2.6.32.14/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -18243,9 +18519,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr-test.c linux-2.6.32.11/arch/x86/ } struct split_state { -diff -urNp linux-2.6.32.11/arch/x86/mm/pat.c linux-2.6.32.11/arch/x86/mm/pat.c ---- linux-2.6.32.11/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/pat.c linux-2.6.32.14/arch/x86/mm/pat.c +--- linux-2.6.32.14/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -18282,9 +18558,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pat.c linux-2.6.32.11/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable_32.c linux-2.6.32.11/arch/x86/mm/pgtable_32.c ---- linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/pgtable_32.c linux-2.6.32.14/arch/x86/mm/pgtable_32.c +--- linux-2.6.32.14/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -18299,9 +18575,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable_32.c linux-2.6.32.11/arch/x86/mm/ /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable.c linux-2.6.32.11/arch/x86/mm/pgtable.c ---- linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/pgtable.c linux-2.6.32.14/arch/x86/mm/pgtable.c +--- linux-2.6.32.14/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/pgtable.c 2010-05-28 21:27:15.118897735 -0400 @@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * #if PAGETABLE_LEVELS > 3 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) @@ -18571,9 +18847,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable.c linux-2.6.32.11/arch/x86/mm/pgt pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.32.11/arch/x86/mm/setup_nx.c linux-2.6.32.11/arch/x86/mm/setup_nx.c ---- linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/setup_nx.c linux-2.6.32.14/arch/x86/mm/setup_nx.c +--- linux-2.6.32.14/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400 @@ -4,11 +4,10 @@ #include <asm/pgtable.h> @@ -18639,9 +18915,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/setup_nx.c linux-2.6.32.11/arch/x86/mm/se __supported_pte_mask &= ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.11/arch/x86/mm/tlb.c linux-2.6.32.11/arch/x86/mm/tlb.c ---- linux-2.6.32.11/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/arch/x86/mm/tlb.c linux-2.6.32.14/arch/x86/mm/tlb.c +--- linux-2.6.32.14/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -18663,9 +18939,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/tlb.c linux-2.6.32.11/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/arch/x86/oprofile/backtrace.c ---- linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/oprofile/backtrace.c linux-2.6.32.14/arch/x86/oprofile/backtrace.c +--- linux-2.6.32.14/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; @@ -18684,9 +18960,9 @@ diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/arch/x8 unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -18696,9 +18972,9 @@ diff -urNp linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c linux-2.6.32.11/arch/ { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.32.11/arch/x86/pci/common.c linux-2.6.32.11/arch/x86/pci/common.c ---- linux-2.6.32.11/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/common.c linux-2.6.32.14/arch/x86/pci/common.c +--- linux-2.6.32.14/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -18719,9 +18995,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/common.c linux-2.6.32.11/arch/x86/pci/co }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.32.11/arch/x86/pci/direct.c linux-2.6.32.11/arch/x86/pci/direct.c ---- linux-2.6.32.11/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/direct.c linux-2.6.32.14/arch/x86/pci/direct.c +--- linux-2.6.32.14/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -18749,9 +19025,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/direct.c linux-2.6.32.11/arch/x86/pci/di { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.32.11/arch/x86/pci/fixup.c linux-2.6.32.11/arch/x86/pci/fixup.c ---- linux-2.6.32.11/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/fixup.c linux-2.6.32.14/arch/x86/pci/fixup.c +--- linux-2.6.32.14/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -18770,9 +19046,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/fixup.c linux-2.6.32.11/arch/x86/pci/fix }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c ---- linux-2.6.32.11/arch/x86/pci/irq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/irq.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/irq.c linux-2.6.32.14/arch/x86/pci/irq.c +--- linux-2.6.32.14/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 ++++ linux-2.6.32.14/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str static struct pci_device_id __initdata pirq_440gx[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, @@ -18782,7 +19058,7 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c }; /* 440GX has a proprietary PIRQ router -- don't use it */ -@@ -1107,7 +1107,7 @@ static struct dmi_system_id __initdata p +@@ -1109,7 +1109,7 @@ static struct dmi_system_id __initdata p DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, @@ -18791,9 +19067,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_32.c linux-2.6.32.11/arch/x86/pci/mmconfig_32.c ---- linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/mmconfig_32.c linux-2.6.32.14/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32.14/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -18803,9 +19079,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_32.c linux-2.6.32.11/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_64.c linux-2.6.32.11/arch/x86/pci/mmconfig_64.c ---- linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/mmconfig_64.c linux-2.6.32.14/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32.14/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -18815,9 +19091,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_64.c linux-2.6.32.11/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.11/arch/x86/pci/numaq_32.c linux-2.6.32.11/arch/x86/pci/numaq_32.c ---- linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/numaq_32.c linux-2.6.32.14/arch/x86/pci/numaq_32.c +--- linux-2.6.32.14/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -18827,9 +19103,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/numaq_32.c linux-2.6.32.11/arch/x86/pci/ .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.32.11/arch/x86/pci/olpc.c linux-2.6.32.11/arch/x86/pci/olpc.c ---- linux-2.6.32.11/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/olpc.c linux-2.6.32.14/arch/x86/pci/olpc.c +--- linux-2.6.32.14/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -18839,9 +19115,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/olpc.c linux-2.6.32.11/arch/x86/pci/olpc .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.32.11/arch/x86/pci/pcbios.c linux-2.6.32.11/arch/x86/pci/pcbios.c ---- linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/pci/pcbios.c linux-2.6.32.14/arch/x86/pci/pcbios.c +--- linux-2.6.32.14/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -19164,9 +19440,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/pcbios.c linux-2.6.32.11/arch/x86/pci/pc return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.11/arch/x86/power/cpu.c linux-2.6.32.11/arch/x86/power/cpu.c ---- linux-2.6.32.11/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/power/cpu.c linux-2.6.32.14/arch/x86/power/cpu.c +--- linux-2.6.32.14/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400 @@ -126,7 +126,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -19186,9 +19462,9 @@ diff -urNp linux-2.6.32.11/arch/x86/power/cpu.c linux-2.6.32.11/arch/x86/power/c syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.11/arch/x86/vdso/Makefile linux-2.6.32.11/arch/x86/vdso/Makefile ---- linux-2.6.32.11/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400 +diff -urNp linux-2.6.32.14/arch/x86/vdso/Makefile linux-2.6.32.14/arch/x86/vdso/Makefile +--- linux-2.6.32.14/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -19198,9 +19474,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/Makefile linux-2.6.32.11/arch/x86/vdso/ GCOV_PROFILE := n # -diff -urNp linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -19299,9 +19575,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c linux-2.6.32.11/arch/x } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -19402,9 +19678,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c linux-2.6.32.11/arch/x86 return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso.lds.S linux-2.6.32.11/arch/x86/vdso/vdso.lds.S ---- linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/vdso/vdso.lds.S linux-2.6.32.14/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32.14/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -19415,9 +19691,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso.lds.S linux-2.6.32.11/arch/x86/vds +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.11/arch/x86/vdso/vextern.h linux-2.6.32.11/arch/x86/vdso/vextern.h ---- linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/vdso/vextern.h linux-2.6.32.14/arch/x86/vdso/vextern.h +--- linux-2.6.32.14/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -19425,9 +19701,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vextern.h linux-2.6.32.11/arch/x86/vdso -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.11/arch/x86/vdso/vma.c linux-2.6.32.11/arch/x86/vdso/vma.c ---- linux-2.6.32.11/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/vdso/vma.c linux-2.6.32.14/arch/x86/vdso/vma.c +--- linux-2.6.32.14/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -19474,9 +19750,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vma.c linux-2.6.32.11/arch/x86/vdso/vma - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen/enlighten.c ---- linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/xen/enlighten.c linux-2.6.32.14/arch/x86/xen/enlighten.c +--- linux-2.6.32.14/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -19495,7 +19771,30 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen end = start + __get_cpu_var(idt_desc).size + 1; xen_mc_flush(); -@@ -1133,13 +1131,6 @@ asmlinkage void __init xen_start_kernel( +@@ -1099,9 +1097,20 @@ asmlinkage void __init xen_start_kernel( + */ + __userpte_alloc_gfp &= ~__GFP_HIGHMEM; + +-#ifdef CONFIG_X86_64 + /* Work out if we support NX */ +- check_efer(); ++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) ++ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 && ++ (cpuid_edx(0x80000001) & (1 << (X86_FEATURE_NX & 31)))) { ++ unsigned l, h; ++ ++#if defined(CONFIG_X86_32) ++ nx_enabled = 1; ++#endif ++ __supported_pte_mask |= _PAGE_NX; ++ rdmsr(MSR_EFER, l, h); ++ l |= EFER_NX; ++ wrmsr(MSR_EFER, l, h); ++ } + #endif + + xen_setup_features(); +@@ -1133,13 +1142,6 @@ asmlinkage void __init xen_start_kernel( machine_ops = xen_machine_ops; @@ -19509,9 +19808,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.11/arch/x86/xen/mmu.c linux-2.6.32.11/arch/x86/xen/mmu.c ---- linux-2.6.32.11/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/xen/mmu.c linux-2.6.32.14/arch/x86/xen/mmu.c +--- linux-2.6.32.14/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400 @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -19532,9 +19831,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/mmu.c linux-2.6.32.11/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -diff -urNp linux-2.6.32.11/arch/x86/xen/smp.c linux-2.6.32.11/arch/x86/xen/smp.c ---- linux-2.6.32.11/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/xen/smp.c linux-2.6.32.14/arch/x86/xen/smp.c +--- linux-2.6.32.14/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -19558,9 +19857,30 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/smp.c linux-2.6.32.11/arch/x86/xen/smp.c ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.32.11/arch/x86/xen/xen-ops.h linux-2.6.32.11/arch/x86/xen/xen-ops.h ---- linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/arch/x86/xen/xen-head.S linux-2.6.32.14/arch/x86/xen/xen-head.S +--- linux-2.6.32.14/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400 +@@ -19,6 +19,17 @@ ENTRY(startup_xen) + #ifdef CONFIG_X86_32 + mov %esi,xen_start_info + mov $init_thread_union+THREAD_SIZE,%esp ++#ifdef CONFIG_SMP ++ movl $cpu_gdt_table,%edi ++ movl $__per_cpu_load,%eax ++ movw %ax,__KERNEL_PERCPU + 2(%edi) ++ rorl $16,%eax ++ movb %al,__KERNEL_PERCPU + 4(%edi) ++ movb %ah,__KERNEL_PERCPU + 7(%edi) ++ movl $__per_cpu_end - 1,%eax ++ subl $__per_cpu_start,%eax ++ movw %ax,__KERNEL_PERCPU + 0(%edi) ++#endif + #else + mov %rsi,xen_start_info + mov $init_thread_union+THREAD_SIZE,%rsp +diff -urNp linux-2.6.32.14/arch/x86/xen/xen-ops.h linux-2.6.32.14/arch/x86/xen/xen-ops.h +--- linux-2.6.32.14/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -19570,9 +19890,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/xen-ops.h linux-2.6.32.11/arch/x86/xen/x struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integrity.c ---- linux-2.6.32.11/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/block/blk-integrity.c linux-2.6.32.14/block/blk-integrity.c +--- linux-2.6.32.14/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -19582,9 +19902,9 @@ diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integ .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.32.11/block/blk-iopoll.c linux-2.6.32.11/block/blk-iopoll.c ---- linux-2.6.32.11/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/block/blk-iopoll.c linux-2.6.32.14/block/blk-iopoll.c +--- linux-2.6.32.14/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -19594,9 +19914,9 @@ diff -urNp linux-2.6.32.11/block/blk-iopoll.c linux-2.6.32.11/block/blk-iopoll.c { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-2.6.32.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c ---- linux-2.6.32.11/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/block/blk-map.c linux-2.6.32.14/block/blk-map.c +--- linux-2.6.32.14/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -19615,9 +19935,9 @@ diff -urNp linux-2.6.32.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.11/block/blk-softirq.c linux-2.6.32.11/block/blk-softirq.c ---- linux-2.6.32.11/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/block/blk-softirq.c linux-2.6.32.14/block/blk-softirq.c +--- linux-2.6.32.14/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, * Softirq action handler - move entries to local list and loop over them * while passing them to the queue registered handler. @@ -19627,9 +19947,9 @@ diff -urNp linux-2.6.32.11/block/blk-softirq.c linux-2.6.32.11/block/blk-softirq { struct list_head *cpu_list, local_list; -diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c ---- linux-2.6.32.11/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/block/blk-sysfs.c linux-2.6.32.14/block/blk-sysfs.c +--- linux-2.6.32.14/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -19639,9 +19959,9 @@ diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c ---- linux-2.6.32.11/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/block/elevator.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/block/elevator.c linux-2.6.32.14/block/elevator.c +--- linux-2.6.32.14/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/block/elevator.c 2010-05-28 21:27:15.179152446 -0400 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -19651,9 +19971,9 @@ diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.32.11/crypto/lrw.c linux-2.6.32.11/crypto/lrw.c ---- linux-2.6.32.11/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/crypto/lrw.c linux-2.6.32.14/crypto/lrw.c +--- linux-2.6.32.14/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); struct crypto_cipher *child = ctx->child; @@ -19663,9 +19983,9 @@ diff -urNp linux-2.6.32.11/crypto/lrw.c linux-2.6.32.11/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/dontdiff ---- linux-2.6.32.11/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400 +diff -urNp linux-2.6.32.14/Documentation/dontdiff linux-2.6.32.14/Documentation/dontdiff +--- linux-2.6.32.14/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -19773,10 +20093,10 @@ diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/ zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.11/Documentation/kernel-parameters.txt linux-2.6.32.11/Documentation/kernel-parameters.txt ---- linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400 -@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. +diff -urNp linux-2.6.32.14/Documentation/kernel-parameters.txt linux-2.6.32.14/Documentation/kernel-parameters.txt +--- linux-2.6.32.14/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 ++++ linux-2.6.32.14/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400 +@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -19789,9 +20109,9 @@ diff -urNp linux-2.6.32.11/Documentation/kernel-parameters.txt linux-2.6.32.11/D pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/battery.c ---- linux-2.6.32.11/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/battery.c linux-2.6.32.14/drivers/acpi/battery.c +--- linux-2.6.32.14/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -19801,9 +20121,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/b mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.32.11/drivers/acpi/blacklist.c linux-2.6.32.11/drivers/acpi/blacklist.c ---- linux-2.6.32.11/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/blacklist.c linux-2.6.32.14/drivers/acpi/blacklist.c +--- linux-2.6.32.14/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -19813,9 +20133,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/blacklist.c linux-2.6.32.11/drivers/acpi }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.32.11/drivers/acpi/dock.c linux-2.6.32.11/drivers/acpi/dock.c ---- linux-2.6.32.11/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/dock.c linux-2.6.32.14/drivers/acpi/dock.c +--- linux-2.6.32.14/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -19834,9 +20154,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/dock.c linux-2.6.32.11/drivers/acpi/dock void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c ---- linux-2.6.32.11/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/osl.c linux-2.6.32.14/drivers/acpi/osl.c +--- linux-2.6.32.14/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -19855,9 +20175,59 @@ diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers/acpi/processor_core.c ---- linux-2.6.32.11/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/power_meter.c linux-2.6.32.14/drivers/acpi/power_meter.c +--- linux-2.6.32.14/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 ++++ linux-2.6.32.14/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400 +@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d + return res; + + temp /= 1000; +- if (temp < 0) +- return -EINVAL; + + mutex_lock(&resource->lock); + resource->trip[attr->index - 7] = temp; +diff -urNp linux-2.6.32.14/drivers/acpi/proc.c linux-2.6.32.14/drivers/acpi/proc.c +--- linux-2.6.32.14/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400 +@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f + size_t count, loff_t * ppos) + { + struct list_head *node, *next; +- char strbuf[5]; +- char str[5] = ""; +- unsigned int len = count; ++ char strbuf[5] = {0}; + struct acpi_device *found_dev = NULL; + +- if (len > 4) +- len = 4; +- if (len < 0) +- return -EFAULT; ++ if (count > 4) ++ count = 4; + +- if (copy_from_user(strbuf, buffer, len)) ++ if (copy_from_user(strbuf, buffer, count)) + return -EFAULT; +- strbuf[len] = '\0'; +- sscanf(strbuf, "%s", str); ++ strbuf[count] = '\0'; + + mutex_lock(&acpi_device_lock); + list_for_each_safe(node, next, &acpi_wakeup_device_list) { +@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f + if (!dev->wakeup.flags.valid) + continue; + +- if (!strncmp(dev->pnp.bus_id, str, 4)) { ++ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) { + dev->wakeup.state.enabled = + dev->wakeup.state.enabled ? 0 : 1; + found_dev = dev; +diff -urNp linux-2.6.32.14/drivers/acpi/processor_core.c linux-2.6.32.14/drivers/acpi/processor_core.c +--- linux-2.6.32.14/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400 @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -19867,9 +20237,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers /* * Buggy BIOS check -diff -urNp linux-2.6.32.11/drivers/acpi/processor_idle.c linux-2.6.32.11/drivers/acpi/processor_idle.c ---- linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/processor_idle.c linux-2.6.32.14/drivers/acpi/processor_idle.c +--- linux-2.6.32.14/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400 @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, @@ -19879,10 +20249,10 @@ diff -urNp linux-2.6.32.11/drivers/acpi/processor_idle.c linux-2.6.32.11/drivers }; -diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sleep.c ---- linux-2.6.32.11/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400 -@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp +diff -urNp linux-2.6.32.14/drivers/acpi/sleep.c linux-2.6.32.14/drivers/acpi/sleep.c +--- linux-2.6.32.14/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400 ++++ linux-2.6.32.14/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400 +@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp } } @@ -19891,7 +20261,7 @@ diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sle .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin, .prepare_late = acpi_pm_prepare, -@@ -325,7 +325,7 @@ static int acpi_suspend_begin_old(suspen +@@ -330,7 +330,7 @@ static int acpi_suspend_begin_old(suspen * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ @@ -19900,7 +20270,7 @@ diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sle .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_disable_gpes, -@@ -552,7 +552,7 @@ static void acpi_pm_enable_gpes(void) +@@ -613,7 +613,7 @@ static void acpi_pm_enable_gpes(void) acpi_enable_all_runtime_gpes(); } @@ -19909,7 +20279,7 @@ diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sle .begin = acpi_hibernation_begin, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot, -@@ -605,7 +605,7 @@ static int acpi_hibernation_pre_snapshot +@@ -666,7 +666,7 @@ static int acpi_hibernation_pre_snapshot * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ @@ -19918,9 +20288,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sle .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.32.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/video.c ---- linux-2.6.32.11/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/acpi/video.c linux-2.6.32.14/drivers/acpi/video.c +--- linux-2.6.32.14/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -19930,9 +20300,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/vid .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c ---- linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:41:49.920655481 -0400 -+++ linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/ahci.c linux-2.6.32.14/drivers/ata/ahci.c +--- linux-2.6.32.14/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 ++++ linux-2.6.32.14/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -19963,7 +20333,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c .inherits = &ahci_ops, .softreset = ahci_sb600_softreset, .pmp_softreset = ahci_sb600_softreset, -@@ -681,7 +681,7 @@ static const struct pci_device_id ahci_p +@@ -687,7 +687,7 @@ static const struct pci_device_id ahci_p { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, @@ -19972,9 +20342,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c }; -diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata/ata_generic.c ---- linux-2.6.32.11/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/ata_generic.c linux-2.6.32.14/drivers/ata/ata_generic.c +--- linux-2.6.32.14/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -19984,19 +20354,19 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/ata_piix.c ---- linux-2.6.32.11/drivers/ata/ata_piix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/ata_piix.c 2010-04-04 20:46:41.544756868 -0400 -@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p - { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, - /* SATA Controller IDE (PCH) */ - { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, +diff -urNp linux-2.6.32.14/drivers/ata/ata_piix.c linux-2.6.32.14/drivers/ata/ata_piix.c +--- linux-2.6.32.14/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 ++++ linux-2.6.32.14/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400 +@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p + { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + /* SATA Controller IDE (CPT) */ + { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, - { } /* terminate list */ + { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ }; static struct pci_driver piix_pci_driver = { -@@ -309,7 +309,7 @@ static struct scsi_host_template piix_sh +@@ -317,7 +317,7 @@ static struct scsi_host_template piix_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -20005,7 +20375,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at .inherits = &ata_bmdma32_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = piix_set_piomode, -@@ -317,22 +317,22 @@ static struct ata_port_operations piix_p +@@ -325,22 +325,22 @@ static struct ata_port_operations piix_p .prereset = piix_pata_prereset, }; @@ -20032,7 +20402,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at .inherits = &piix_sata_ops, .hardreset = sata_std_hardreset, .scr_read = piix_sidpr_scr_read, -@@ -608,7 +608,7 @@ static const struct ich_laptop ich_lapto +@@ -616,7 +616,7 @@ static const struct ich_laptop ich_lapto { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ /* end marker */ @@ -20041,7 +20411,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at }; /** -@@ -1086,7 +1086,7 @@ static int piix_broken_suspend(void) +@@ -1094,7 +1094,7 @@ static int piix_broken_suspend(void) }, }, @@ -20050,9 +20420,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata/libata-acpi.c ---- linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/libata-acpi.c linux-2.6.32.14/drivers/ata/libata-acpi.c +--- linux-2.6.32.14/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -20068,9 +20438,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata/libata-core.c ---- linux-2.6.32.11/drivers/ata/libata-core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/libata-core.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/libata-core.c linux-2.6.32.14/drivers/ata/libata-core.c +--- linux-2.6.32.14/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 ++++ linux-2.6.32.14/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400 @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, @@ -20089,7 +20459,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata }; #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4385,7 +4385,7 @@ static const struct ata_blacklist_entry +@@ -4388,7 +4388,7 @@ static const struct ata_blacklist_entry { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, /* End Marker */ @@ -20098,7 +20468,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -@@ -5961,7 +5961,7 @@ static void ata_host_stop(struct device +@@ -5964,7 +5964,7 @@ static void ata_host_stop(struct device * LOCKING: * None. */ @@ -20107,7 +20477,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata { static DEFINE_SPINLOCK(lock); const struct ata_port_operations *cur; -@@ -5973,6 +5973,7 @@ static void ata_finalize_port_ops(struct +@@ -5976,6 +5976,7 @@ static void ata_finalize_port_ops(struct return; spin_lock(&lock); @@ -20115,7 +20485,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5986,8 +5987,9 @@ static void ata_finalize_port_ops(struct +@@ -5989,8 +5990,9 @@ static void ata_finalize_port_ops(struct if (IS_ERR(*pp)) *pp = NULL; @@ -20126,7 +20496,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata spin_unlock(&lock); } -@@ -6084,7 +6086,7 @@ int ata_host_start(struct ata_host *host +@@ -6087,7 +6089,7 @@ int ata_host_start(struct ata_host *host */ /* KILLME - the only user left is ipr */ void ata_host_init(struct ata_host *host, struct device *dev, @@ -20135,7 +20505,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata { spin_lock_init(&host->lock); host->dev = dev; -@@ -6747,7 +6749,7 @@ static void ata_dummy_error_handler(stru +@@ -6750,7 +6752,7 @@ static void ata_dummy_error_handler(stru /* truly dummy */ } @@ -20144,10 +20514,10 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.32.11/drivers/ata/libata-eh.c linux-2.6.32.11/drivers/ata/libata-eh.c ---- linux-2.6.32.11/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400 -@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ +diff -urNp linux-2.6.32.14/drivers/ata/libata-eh.c linux-2.6.32.14/drivers/ata/libata-eh.c +--- linux-2.6.32.14/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 ++++ linux-2.6.32.14/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400 +@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) { @@ -20156,9 +20526,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-eh.c linux-2.6.32.11/drivers/ata/l ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.32.11/drivers/ata/libata-pmp.c linux-2.6.32.11/drivers/ata/libata-pmp.c ---- linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/libata-pmp.c linux-2.6.32.14/drivers/ata/libata-pmp.c +--- linux-2.6.32.14/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -20168,9 +20538,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-pmp.c linux-2.6.32.11/drivers/ata/ int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; -diff -urNp linux-2.6.32.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/pata_acpi.c ---- linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_acpi.c linux-2.6.32.14/drivers/ata/pata_acpi.c +--- linux-2.6.32.14/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20180,9 +20550,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/drivers/ata/pata_ali.c ---- linux-2.6.32.11/drivers/ata/pata_ali.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_ali.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_ali.c linux-2.6.32.14/drivers/ata/pata_ali.c +--- linux-2.6.32.14/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -20228,9 +20598,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/drivers/ata/pa .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pata_amd.c ---- linux-2.6.32.11/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_amd.c linux-2.6.32.14/drivers/ata/pata_amd.c +--- linux-2.6.32.14/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -20280,9 +20650,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pa .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/pata_artop.c ---- linux-2.6.32.11/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_artop.c linux-2.6.32.14/drivers/ata/pata_artop.c +--- linux-2.6.32.14/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -20301,9 +20671,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/drivers/ata/pata_at32.c ---- linux-2.6.32.11/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_at32.c linux-2.6.32.14/drivers/ata/pata_at32.c +--- linux-2.6.32.14/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -20313,9 +20683,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/pata_at91.c ---- linux-2.6.32.11/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_at91.c linux-2.6.32.14/drivers/ata/pata_at91.c +--- linux-2.6.32.14/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -20325,9 +20695,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata/pata_atiixp.c ---- linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_atiixp.c linux-2.6.32.14/drivers/ata/pata_atiixp.c +--- linux-2.6.32.14/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20337,9 +20707,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/ata/pata_atp867x.c ---- linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_atp867x.c linux-2.6.32.14/drivers/ata/pata_atp867x.c +--- linux-2.6.32.14/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -20349,9 +20719,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/pata_bf54x.c ---- linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_bf54x.c linux-2.6.32.14/drivers/ata/pata_bf54x.c +--- linux-2.6.32.14/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -20361,9 +20731,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/ .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/drivers/ata/pata_cmd640.c ---- linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cmd640.c linux-2.6.32.14/drivers/ata/pata_cmd640.c +--- linux-2.6.32.14/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20373,9 +20743,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata/pata_cmd64x.c ---- linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cmd64x.c linux-2.6.32.14/drivers/ata/pata_cmd64x.c +--- linux-2.6.32.14/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -20398,9 +20768,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/drivers/ata/pata_cs5520.c ---- linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5520.c linux-2.6.32.14/drivers/ata/pata_cs5520.c +--- linux-2.6.32.14/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20410,9 +20780,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata/pata_cs5530.c ---- linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5530.c linux-2.6.32.14/drivers/ata/pata_cs5530.c +--- linux-2.6.32.14/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -20422,9 +20792,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata/pata_cs5535.c ---- linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5535.c linux-2.6.32.14/drivers/ata/pata_cs5535.c +--- linux-2.6.32.14/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20434,9 +20804,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata/pata_cs5536.c ---- linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5536.c linux-2.6.32.14/drivers/ata/pata_cs5536.c +--- linux-2.6.32.14/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20446,9 +20816,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/ata/pata_cypress.c ---- linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_cypress.c linux-2.6.32.14/drivers/ata/pata_cypress.c +--- linux-2.6.32.14/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -20458,9 +20828,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/pata_efar.c ---- linux-2.6.32.11/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_efar.c linux-2.6.32.14/drivers/ata/pata_efar.c +--- linux-2.6.32.14/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -20470,9 +20840,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata/pata_hpt366.c ---- linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt366.c linux-2.6.32.14/drivers/ata/pata_hpt366.c +--- linux-2.6.32.14/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -20482,9 +20852,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata/pata_hpt37x.c ---- linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt37x.c linux-2.6.32.14/drivers/ata/pata_hpt37x.c +--- linux-2.6.32.14/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -20521,9 +20891,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -20533,9 +20903,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata/pata_hpt3x3.c ---- linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt3x3.c linux-2.6.32.14/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32.14/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20545,9 +20915,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/drivers/ata/pata_icside.c ---- linux-2.6.32.11/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_icside.c linux-2.6.32.14/drivers/ata/pata_icside.c +--- linux-2.6.32.14/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -20557,9 +20927,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/drivers/ata .inherits = &ata_sff_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/drivers/ata/pata_isapnp.c ---- linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_isapnp.c linux-2.6.32.14/drivers/ata/pata_isapnp.c +--- linux-2.6.32.14/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -20575,9 +20945,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.32.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata/pata_it8213.c ---- linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_it8213.c linux-2.6.32.14/drivers/ata/pata_it8213.c +--- linux-2.6.32.14/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -20587,9 +20957,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata/pata_it821x.c ---- linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_it821x.c linux-2.6.32.14/drivers/ata/pata_it821x.c +--- linux-2.6.32.14/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -20617,9 +20987,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -20629,9 +20999,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/ .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/ata/pata_jmicron.c ---- linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_jmicron.c linux-2.6.32.14/drivers/ata/pata_jmicron.c +--- linux-2.6.32.14/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -20641,9 +21011,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.32.11/drivers/ata/pata_legacy.c linux-2.6.32.11/drivers/ata/pata_legacy.c ---- linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_legacy.c linux-2.6.32.14/drivers/ata/pata_legacy.c +--- linux-2.6.32.14/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -20755,9 +21125,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_legacy.c linux-2.6.32.11/drivers/ata struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.32.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/ata/pata_marvell.c ---- linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_marvell.c linux-2.6.32.14/drivers/ata/pata_marvell.c +--- linux-2.6.32.14/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -20767,9 +21137,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/ata/pata_mpc52xx.c ---- linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_mpc52xx.c linux-2.6.32.14/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32.14/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -20779,9 +21149,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/at .inherits = &ata_sff_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/pata_mpiix.c ---- linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_mpiix.c linux-2.6.32.14/drivers/ata/pata_mpiix.c +--- linux-2.6.32.14/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -20791,9 +21161,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/ata/pata_netcell.c ---- linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_netcell.c linux-2.6.32.14/drivers/ata/pata_netcell.c +--- linux-2.6.32.14/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -20803,9 +21173,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/ata/pata_ninja32.c ---- linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_ninja32.c linux-2.6.32.14/drivers/ata/pata_ninja32.c +--- linux-2.6.32.14/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -20815,9 +21185,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/ata/pata_ns87410.c ---- linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_ns87410.c linux-2.6.32.14/drivers/ata/pata_ns87410.c +--- linux-2.6.32.14/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -20827,9 +21197,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/at .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87415.c linux-2.6.32.11/drivers/ata/pata_ns87415.c ---- linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_ns87415.c linux-2.6.32.14/drivers/ata/pata_ns87415.c +--- linux-2.6.32.14/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -20848,9 +21218,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87415.c linux-2.6.32.11/drivers/at .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_octeon_cf.c linux-2.6.32.14/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.14/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -20859,9 +21229,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/drivers/ static struct ata_port_operations octeon_cf_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = octeon_cf_check_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/ata/pata_oldpiix.c ---- linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_oldpiix.c linux-2.6.32.14/drivers/ata/pata_oldpiix.c +--- linux-2.6.32.14/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -20871,9 +21241,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/pata_opti.c ---- linux-2.6.32.11/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_opti.c linux-2.6.32.14/drivers/ata/pata_opti.c +--- linux-2.6.32.14/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -20883,9 +21253,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/ata/pata_optidma.c ---- linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_optidma.c linux-2.6.32.14/drivers/ata/pata_optidma.c +--- linux-2.6.32.14/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -20904,9 +21274,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/at .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/drivers/ata/pata_palmld.c ---- linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_palmld.c linux-2.6.32.14/drivers/ata/pata_palmld.c +--- linux-2.6.32.14/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -20916,9 +21286,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata/pata_pcmcia.c ---- linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_pcmcia.c linux-2.6.32.14/drivers/ata/pata_pcmcia.c +--- linux-2.6.32.14/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -20945,9 +21315,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/ata/pata_pdc2027x.c ---- linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_pdc2027x.c linux-2.6.32.14/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32.14/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -20965,9 +21335,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/a .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400 @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -20986,9 +21356,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drive .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/drivers/ata/pata_platform.c ---- linux-2.6.32.11/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_platform.c linux-2.6.32.14/drivers/ata/pata_platform.c +--- linux-2.6.32.14/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -20998,9 +21368,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pata_qdi.c ---- linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_qdi.c linux-2.6.32.14/drivers/ata/pata_qdi.c +--- linux-2.6.32.14/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -21019,9 +21389,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pa .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/ata/pata_radisys.c ---- linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_radisys.c linux-2.6.32.14/drivers/ata/pata_radisys.c +--- linux-2.6.32.14/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -21031,9 +21401,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/ata/pata_rb532_cf.c ---- linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_rb532_cf.c linux-2.6.32.14/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32.14/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -21043,9 +21413,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/drivers/ata/pata_rdc.c ---- linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_rdc.c linux-2.6.32.14/drivers/ata/pata_rdc.c +--- linux-2.6.32.14/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -21055,9 +21425,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/drivers/ata/pa .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata/pata_rz1000.c ---- linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_rz1000.c linux-2.6.32.14/drivers/ata/pata_rz1000.c +--- linux-2.6.32.14/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -21067,9 +21437,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/drivers/ata/pata_sc1200.c ---- linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_sc1200.c linux-2.6.32.14/drivers/ata/pata_sc1200.c +--- linux-2.6.32.14/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21079,9 +21449,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.32.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pata_scc.c ---- linux-2.6.32.11/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_scc.c linux-2.6.32.14/drivers/ata/pata_scc.c +--- linux-2.6.32.14/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21091,9 +21461,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pata_sch.c ---- linux-2.6.32.11/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_sch.c linux-2.6.32.14/drivers/ata/pata_sch.c +--- linux-2.6.32.14/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21103,9 +21473,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/drivers/ata/pata_serverworks.c ---- linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_serverworks.c linux-2.6.32.14/drivers/ata/pata_serverworks.c +--- linux-2.6.32.14/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -21124,9 +21494,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/driver .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata/pata_sil680.c ---- linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_sil680.c linux-2.6.32.14/drivers/ata/pata_sil680.c +--- linux-2.6.32.14/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21136,9 +21506,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/drivers/ata/pata_sis.c ---- linux-2.6.32.11/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_sis.c linux-2.6.32.14/drivers/ata/pata_sis.c +--- linux-2.6.32.14/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21194,9 +21564,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/drivers/ata/pa .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.32.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/ata/pata_sl82c105.c ---- linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_sl82c105.c linux-2.6.32.14/drivers/ata/pata_sl82c105.c +--- linux-2.6.32.14/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21206,9 +21576,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/a .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/ata/pata_triflex.c ---- linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_triflex.c linux-2.6.32.14/drivers/ata/pata_triflex.c +--- linux-2.6.32.14/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -21218,9 +21588,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pata_via.c ---- linux-2.6.32.11/drivers/ata/pata_via.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_via.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_via.c linux-2.6.32.14/drivers/ata/pata_via.c +--- linux-2.6.32.14/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21239,9 +21609,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pa .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/ata/pata_winbond.c ---- linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pata_winbond.c linux-2.6.32.14/drivers/ata/pata_winbond.c +--- linux-2.6.32.14/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -21251,9 +21621,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pdc_adma.c ---- linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/pdc_adma.c linux-2.6.32.14/drivers/ata/pdc_adma.c +--- linux-2.6.32.14/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -21263,9 +21633,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pd .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sata_fsl.c ---- linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_fsl.c linux-2.6.32.14/drivers/ata/sata_fsl.c +--- linux-2.6.32.14/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21275,9 +21645,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/ata/sata_inic162x.c ---- linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_inic162x.c linux-2.6.32.14/drivers/ata/sata_inic162x.c +--- linux-2.6.32.14/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -21287,9 +21657,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/a .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sata_mv.c ---- linux-2.6.32.11/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_mv.c linux-2.6.32.14/drivers/ata/sata_mv.c +--- linux-2.6.32.14/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -21317,9 +21687,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sat .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.32.11/drivers/ata/sata_nv.c linux-2.6.32.11/drivers/ata/sata_nv.c ---- linux-2.6.32.11/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_nv.c linux-2.6.32.14/drivers/ata/sata_nv.c +--- linux-2.6.32.14/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. @@ -21362,9 +21732,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_nv.c linux-2.6.32.11/drivers/ata/sat .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/ata/sata_promise.c ---- linux-2.6.32.11/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_promise.c linux-2.6.32.14/drivers/ata/sata_promise.c +--- linux-2.6.32.14/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -21391,9 +21761,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/at .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/sata_qstor.c ---- linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_qstor.c linux-2.6.32.14/drivers/ata/sata_qstor.c +--- linux-2.6.32.14/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -21403,9 +21773,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/ .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/sata_sil24.c ---- linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_sil24.c linux-2.6.32.14/drivers/ata/sata_sil24.c +--- linux-2.6.32.14/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21415,9 +21785,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/ .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sata_sil.c ---- linux-2.6.32.11/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_sil.c linux-2.6.32.14/drivers/ata/sata_sil.c +--- linux-2.6.32.14/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -21427,9 +21797,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sa .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sata_sis.c ---- linux-2.6.32.11/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_sis.c linux-2.6.32.14/drivers/ata/sata_sis.c +--- linux-2.6.32.14/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21439,9 +21809,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/drivers/ata/sata_svw.c ---- linux-2.6.32.11/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_svw.c linux-2.6.32.14/drivers/ata/sata_svw.c +--- linux-2.6.32.14/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -21451,9 +21821,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, -diff -urNp linux-2.6.32.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sata_sx4.c ---- linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_sx4.c linux-2.6.32.14/drivers/ata/sata_sx4.c +--- linux-2.6.32.14/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -21463,9 +21833,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sata_uli.c ---- linux-2.6.32.11/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_uli.c linux-2.6.32.14/drivers/ata/sata_uli.c +--- linux-2.6.32.14/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -21475,9 +21845,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sata_via.c ---- linux-2.6.32.11/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_via.c linux-2.6.32.14/drivers/ata/sata_via.c +--- linux-2.6.32.14/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -21515,9 +21885,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sa .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/drivers/ata/sata_vsc.c ---- linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/ata/sata_vsc.c linux-2.6.32.14/drivers/ata/sata_vsc.c +--- linux-2.6.32.14/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -21527,9 +21897,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/drivers/ata/sa .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.32.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adummy.c ---- linux-2.6.32.11/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/adummy.c linux-2.6.32.14/drivers/atm/adummy.c +--- linux-2.6.32.14/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -21539,9 +21909,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adum return 0; } -diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/ambassador.c ---- linux-2.6.32.11/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/ambassador.c linux-2.6.32.14/drivers/atm/ambassador.c +--- linux-2.6.32.14/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -21578,9 +21948,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/ return -ENOMEM; // ? } -diff -urNp linux-2.6.32.11/drivers/atm/atmtcp.c linux-2.6.32.11/drivers/atm/atmtcp.c ---- linux-2.6.32.11/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/atmtcp.c linux-2.6.32.14/drivers/atm/atmtcp.c +--- linux-2.6.32.14/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -21630,9 +22000,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/atmtcp.c linux-2.6.32.11/drivers/atm/atmt done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.11/drivers/atm/eni.c linux-2.6.32.11/drivers/atm/eni.c ---- linux-2.6.32.11/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/eni.c linux-2.6.32.14/drivers/atm/eni.c +--- linux-2.6.32.14/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -21678,9 +22048,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/eni.c linux-2.6.32.11/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/drivers/atm/firestream.c ---- linux-2.6.32.11/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/firestream.c linux-2.6.32.14/drivers/atm/firestream.c +--- linux-2.6.32.14/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -21714,9 +22084,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/drivers/atm/ break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.32.11/drivers/atm/fore200e.c linux-2.6.32.11/drivers/atm/fore200e.c ---- linux-2.6.32.11/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/fore200e.c linux-2.6.32.14/drivers/atm/fore200e.c +--- linux-2.6.32.14/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -21773,9 +22143,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/fore200e.c linux-2.6.32.11/drivers/atm/fo fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.32.11/drivers/atm/he.c linux-2.6.32.11/drivers/atm/he.c ---- linux-2.6.32.11/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/he.c linux-2.6.32.14/drivers/atm/he.c +--- linux-2.6.32.14/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -21857,9 +22227,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/he.c linux-2.6.32.11/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.32.11/drivers/atm/horizon.c linux-2.6.32.11/drivers/atm/horizon.c ---- linux-2.6.32.11/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/horizon.c linux-2.6.32.14/drivers/atm/horizon.c +--- linux-2.6.32.14/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -21878,9 +22248,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/horizon.c linux-2.6.32.11/drivers/atm/hor // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.11/drivers/atm/idt77252.c linux-2.6.32.11/drivers/atm/idt77252.c ---- linux-2.6.32.11/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/idt77252.c linux-2.6.32.14/drivers/atm/idt77252.c +--- linux-2.6.32.14/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -22035,9 +22405,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/idt77252.c linux-2.6.32.11/drivers/atm/id return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.11/drivers/atm/iphase.c linux-2.6.32.11/drivers/atm/iphase.c ---- linux-2.6.32.11/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/iphase.c linux-2.6.32.14/drivers/atm/iphase.c +--- linux-2.6.32.14/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) status = (u_short) (buf_desc_ptr->desc_mode); if (status & (RX_CER | RX_PTE | RX_OFL)) @@ -22134,9 +22504,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/iphase.c linux-2.6.32.11/drivers/atm/ipha if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-2.6.32.11/drivers/atm/lanai.c linux-2.6.32.11/drivers/atm/lanai.c ---- linux-2.6.32.11/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/lanai.c linux-2.6.32.14/drivers/atm/lanai.c +--- linux-2.6.32.14/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -22191,9 +22561,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/lanai.c linux-2.6.32.11/drivers/atm/lanai lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.32.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nicstar.c ---- linux-2.6.32.11/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/nicstar.c linux-2.6.32.14/drivers/atm/nicstar.c +--- linux-2.6.32.14/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -22396,9 +22766,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nic } } -diff -urNp linux-2.6.32.11/drivers/atm/solos-pci.c linux-2.6.32.11/drivers/atm/solos-pci.c ---- linux-2.6.32.11/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/solos-pci.c linux-2.6.32.14/drivers/atm/solos-pci.c +--- linux-2.6.32.14/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -22417,9 +22787,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/solos-pci.c linux-2.6.32.11/drivers/atm/s solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c ---- linux-2.6.32.11/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/suni.c linux-2.6.32.14/drivers/atm/suni.c +--- linux-2.6.32.14/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -22431,9 +22801,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.11/drivers/atm/uPD98402.c linux-2.6.32.11/drivers/atm/uPD98402.c ---- linux-2.6.32.11/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/uPD98402.c linux-2.6.32.14/drivers/atm/uPD98402.c +--- linux-2.6.32.14/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -22478,9 +22848,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/uPD98402.c linux-2.6.32.11/drivers/atm/uP return 0; } -diff -urNp linux-2.6.32.11/drivers/atm/zatm.c linux-2.6.32.11/drivers/atm/zatm.c ---- linux-2.6.32.11/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/atm/zatm.c linux-2.6.32.14/drivers/atm/zatm.c +--- linux-2.6.32.14/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -22508,9 +22878,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/zatm.c linux-2.6.32.11/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c ---- linux-2.6.32.11/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/base/bus.c linux-2.6.32.14/drivers/base/bus.c +--- linux-2.6.32.14/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -22538,9 +22908,9 @@ diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/class.c ---- linux-2.6.32.11/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/base/class.c linux-2.6.32.14/drivers/base/class.c +--- linux-2.6.32.14/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -22550,9 +22920,9 @@ diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/cla .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core.c ---- linux-2.6.32.11/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/base/core.c linux-2.6.32.14/drivers/base/core.c +--- linux-2.6.32.14/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -22571,9 +22941,9 @@ diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/memory.c ---- linux-2.6.32.11/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/base/memory.c linux-2.6.32.14/drivers/base/memory.c +--- linux-2.6.32.14/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -22583,9 +22953,9 @@ diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/me .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c ---- linux-2.6.32.11/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/base/sys.c linux-2.6.32.14/drivers/base/sys.c +--- linux-2.6.32.14/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -22604,9 +22974,9 @@ diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block/pktcdvd.c ---- linux-2.6.32.11/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/block/pktcdvd.c linux-2.6.32.14/drivers/block/pktcdvd.c +--- linux-2.6.32.14/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -22616,9 +22986,9 @@ diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.32.11/drivers/char/agp/frontend.c linux-2.6.32.11/drivers/char/agp/frontend.c ---- linux-2.6.32.11/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/agp/frontend.c linux-2.6.32.14/drivers/char/agp/frontend.c +--- linux-2.6.32.14/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -22628,10 +22998,10 @@ diff -urNp linux-2.6.32.11/drivers/char/agp/frontend.c linux-2.6.32.11/drivers/c return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.11/drivers/char/agp/intel-agp.c linux-2.6.32.11/drivers/char/agp/intel-agp.c ---- linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-04-04 20:46:41.569782507 -0400 -@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc +diff -urNp linux-2.6.32.14/drivers/char/agp/intel-agp.c linux-2.6.32.14/drivers/char/agp/intel-agp.c +--- linux-2.6.32.14/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 ++++ linux-2.6.32.14/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400 +@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB), @@ -22640,9 +23010,27 @@ diff -urNp linux-2.6.32.11/drivers/char/agp/intel-agp.c linux-2.6.32.11/drivers/ }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet.c ---- linux-2.6.32.11/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hpet.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hpet.c linux-2.6.32.14/drivers/char/hpet.c +--- linux-2.6.32.14/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400 +@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in + return 0; + } + +-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int); ++static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int); + + static int + hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd, +@@ -550,7 +550,7 @@ static inline unsigned long hpet_time_di + } + + static int +-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel) ++hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel) + { + struct hpet_timer __iomem *timer; + struct hpet __iomem *hpet; @@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv }, }; @@ -22652,9 +23040,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet static int __init hpet_init(void) { -diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/hvc_beat.c ---- linux-2.6.32.11/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_beat.c linux-2.6.32.14/drivers/char/hvc_beat.c +--- linux-2.6.32.14/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -22664,9 +23052,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/ .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.11/drivers/char/hvc_console.c linux-2.6.32.11/drivers/char/hvc_console.c ---- linux-2.6.32.11/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_console.c linux-2.6.32.14/drivers/char/hvc_console.c +--- linux-2.6.32.14/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind * console interfaces but can still be used as a tty device. This has to be * static because kmalloc will not work during early console init. @@ -22694,9 +23082,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_console.c linux-2.6.32.11/drivers/ch { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.11/drivers/char/hvc_console.h linux-2.6.32.11/drivers/char/hvc_console.h ---- linux-2.6.32.11/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_console.h linux-2.6.32.14/drivers/char/hvc_console.h +--- linux-2.6.32.14/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -22720,9 +23108,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_console.h linux-2.6.32.11/drivers/ch /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); -diff -urNp linux-2.6.32.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/char/hvc_iseries.c ---- linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_iseries.c linux-2.6.32.14/drivers/char/hvc_iseries.c +--- linux-2.6.32.14/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -22732,9 +23120,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/ch .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/drivers/char/hvc_iucv.c ---- linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_iucv.c linux-2.6.32.14/drivers/char/hvc_iucv.c +--- linux-2.6.32.14/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400 @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -22744,9 +23132,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/drivers/char/ .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.32.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/hvc_rtas.c ---- linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_rtas.c linux-2.6.32.14/drivers/char/hvc_rtas.c +--- linux-2.6.32.14/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -22756,9 +23144,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/ .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs.c ---- linux-2.6.32.11/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvcs.c linux-2.6.32.14/drivers/char/hvcs.c +--- linux-2.6.32.14/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -22853,9 +23241,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/hvc_udbg.c ---- linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_udbg.c linux-2.6.32.14/drivers/char/hvc_udbg.c +--- linux-2.6.32.14/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -22865,9 +23253,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/ .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/hvc_vio.c ---- linux-2.6.32.11/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_vio.c linux-2.6.32.14/drivers/char/hvc_vio.c +--- linux-2.6.32.14/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -22877,9 +23265,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/h .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/hvc_xen.c ---- linux-2.6.32.11/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/hvc_xen.c linux-2.6.32.14/drivers/char/hvc_xen.c +--- linux-2.6.32.14/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -22889,9 +23277,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/h .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -22922,9 +23310,9 @@ diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.11/d intf->proc_dir = NULL; -diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -22955,9 +23343,9 @@ diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.11/driv new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.11/drivers/char/keyboard.c linux-2.6.32.11/drivers/char/keyboard.c ---- linux-2.6.32.11/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/keyboard.c linux-2.6.32.14/drivers/char/keyboard.c +--- linux-2.6.32.14/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -22984,9 +23372,9 @@ diff -urNp linux-2.6.32.11/drivers/char/keyboard.c linux-2.6.32.11/drivers/char/ }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.11/drivers/char/mem.c linux-2.6.32.11/drivers/char/mem.c ---- linux-2.6.32.11/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/mem.c linux-2.6.32.14/drivers/char/mem.c +--- linux-2.6.32.14/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -23077,9 +23465,9 @@ diff -urNp linux-2.6.32.11/drivers/char/mem.c linux-2.6.32.11/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.11/drivers/char/nvram.c linux-2.6.32.11/drivers/char/nvram.c ---- linux-2.6.32.11/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/nvram.c linux-2.6.32.14/drivers/char/nvram.c +--- linux-2.6.32.14/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -23092,9 +23480,9 @@ diff -urNp linux-2.6.32.11/drivers/char/nvram.c linux-2.6.32.11/drivers/char/nvr }; static int __init nvram_init(void) -diff -urNp linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -23209,9 +23597,9 @@ diff -urNp linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.11/ do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/drivers/char/pty.c ---- linux-2.6.32.11/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/pty.c linux-2.6.32.14/drivers/char/pty.c +--- linux-2.6.32.14/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -23242,9 +23630,9 @@ diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/drivers/char/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) -diff -urNp linux-2.6.32.11/drivers/char/random.c linux-2.6.32.11/drivers/char/random.c ---- linux-2.6.32.11/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/random.c linux-2.6.32.14/drivers/char/random.c +--- linux-2.6.32.14/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400 @@ -254,8 +254,13 @@ /* * Configuration information @@ -23286,9 +23674,9 @@ diff -urNp linux-2.6.32.11/drivers/char/random.c linux-2.6.32.11/drivers/char/ra static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.32.11/drivers/char/sonypi.c linux-2.6.32.11/drivers/char/sonypi.c ---- linux-2.6.32.11/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/sonypi.c linux-2.6.32.14/drivers/char/sonypi.c +--- linux-2.6.32.14/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400 @@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; @@ -23319,9 +23707,9 @@ diff -urNp linux-2.6.32.11/drivers/char/sonypi.c linux-2.6.32.11/drivers/char/so mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/char/tpm/tpm_bios.c ---- linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400 +diff -urNp linux-2.6.32.14/drivers/char/tpm/tpm_bios.c linux-2.6.32.14/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32.14/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -23362,9 +23750,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/c memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tty_io.c ---- linux-2.6.32.11/drivers/char/tty_io.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/tty_io.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/char/tty_io.c linux-2.6.32.14/drivers/char/tty_io.c +--- linux-2.6.32.14/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 ++++ linux-2.6.32.14/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -23423,7 +23811,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt ssize_t redirected_tty_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { -@@ -1865,7 +1858,7 @@ static int tty_open(struct inode *inode, +@@ -1867,7 +1860,7 @@ static int tty_open(struct inode *inode, * Takes bkl. See tty_release_dev */ @@ -23432,7 +23820,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt { lock_kernel(); tty_release_dev(filp); -@@ -1873,6 +1866,8 @@ static int tty_release(struct inode *ino +@@ -1875,6 +1868,8 @@ static int tty_release(struct inode *ino return 0; } @@ -23441,7 +23829,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt /** * tty_poll - check tty status * @filp: file being polled -@@ -1885,7 +1880,7 @@ static int tty_release(struct inode *ino +@@ -1887,7 +1882,7 @@ static int tty_release(struct inode *ino * may be re-entered freely by other callers. */ @@ -23450,7 +23838,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt { struct tty_struct *tty; struct tty_ldisc *ld; -@@ -1902,7 +1897,9 @@ static unsigned int tty_poll(struct file +@@ -1904,7 +1899,9 @@ static unsigned int tty_poll(struct file return ret; } @@ -23461,7 +23849,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt { struct tty_struct *tty; unsigned long flags; -@@ -1946,6 +1943,8 @@ out: +@@ -1948,6 +1945,8 @@ out: return retval; } @@ -23470,7 +23858,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt /** * tiocsti - fake input character * @tty: tty to fake input into -@@ -2580,8 +2579,10 @@ long tty_ioctl(struct file *file, unsign +@@ -2582,8 +2581,10 @@ long tty_ioctl(struct file *file, unsign return retval; } @@ -23482,7 +23870,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; -@@ -2605,6 +2606,8 @@ static long tty_compat_ioctl(struct file +@@ -2607,6 +2608,8 @@ static long tty_compat_ioctl(struct file return retval; } @@ -23491,7 +23879,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt #endif /* -@@ -3048,11 +3051,6 @@ struct tty_struct *get_current_tty(void) +@@ -3050,11 +3053,6 @@ struct tty_struct *get_current_tty(void) } EXPORT_SYMBOL_GPL(get_current_tty); @@ -23503,9 +23891,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.32.11/drivers/char/tty_ldisc.c linux-2.6.32.11/drivers/char/tty_ldisc.c ---- linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/char/tty_ldisc.c linux-2.6.32.14/drivers/char/tty_ldisc.c +--- linux-2.6.32.14/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400 @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; @@ -23551,9 +23939,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_ldisc.c linux-2.6.32.11/drivers/char module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers/char/virtio_console.c ---- linux-2.6.32.11/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/char/virtio_console.c linux-2.6.32.14/drivers/char/virtio_console.c +--- linux-2.6.32.14/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; @@ -23562,9 +23950,9 @@ diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers static struct hv_ops virtio_cons; /* The hvc device */ -diff -urNp linux-2.6.32.11/drivers/char/vt_ioctl.c linux-2.6.32.11/drivers/char/vt_ioctl.c ---- linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/char/vt_ioctl.c linux-2.6.32.14/drivers/char/vt_ioctl.c +--- linux-2.6.32.14/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400 @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) @@ -23592,9 +23980,9 @@ diff -urNp linux-2.6.32.11/drivers/char/vt_ioctl.c linux-2.6.32.11/drivers/char/ q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpufreq/cpufreq.c ---- linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/cpufreq/cpufreq.c linux-2.6.32.14/drivers/cpufreq/cpufreq.c +--- linux-2.6.32.14/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -23604,9 +23992,9 @@ diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpu .show = show, .store = store, }; -diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuidle/sysfs.c ---- linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/cpuidle/sysfs.c linux-2.6.32.14/drivers/cpuidle/sysfs.c +--- linux-2.6.32.14/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -23625,9 +24013,18 @@ diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuid .show = cpuidle_state_show, }; -diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/ioat/dma.c ---- linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400 +@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpui + .release = cpuidle_state_sysfs_release, + }; + +-static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i) ++static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i) + { + kobject_put(&device->kobjs[i]->kobj); + wait_for_completion(&device->kobjs[i]->kobj_unregister); +diff -urNp linux-2.6.32.14/drivers/dma/ioat/dma.c linux-2.6.32.14/drivers/dma/ioat/dma.c +--- linux-2.6.32.14/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -23637,9 +24034,9 @@ diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/io .show = ioat_attr_show, }; -diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.h linux-2.6.32.11/drivers/dma/ioat/dma.h ---- linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/dma/ioat/dma.h linux-2.6.32.14/drivers/dma/ioat/dma.h +--- linux-2.6.32.14/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c unsigned long *phys_complete); void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); @@ -23649,9 +24046,9 @@ diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.h linux-2.6.32.11/drivers/dma/io extern struct ioat_sysfs_entry ioat_version_attr; extern struct ioat_sysfs_entry ioat_cap_attr; #endif /* IOATDMA_H */ -diff -urNp linux-2.6.32.11/drivers/edac/edac_core.h linux-2.6.32.11/drivers/edac/edac_core.h ---- linux-2.6.32.11/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/edac/edac_core.h linux-2.6.32.14/drivers/edac/edac_core.h +--- linux-2.6.32.14/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -23669,9 +24066,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_core.h linux-2.6.32.11/drivers/edac #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/edac/edac_device_sysfs.c linux-2.6.32.14/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.14/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -23699,9 +24096,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/driv .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -23720,9 +24117,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/ .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -23741,9 +24138,22 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers .show = edac_pci_dev_show, .store = edac_pci_dev_store }; -diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/firmware/dmi_scan.c ---- linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/firewire/core-cdev.c linux-2.6.32.14/drivers/firewire/core-cdev.c +--- linux-2.6.32.14/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400 +@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie + int ret; + + if ((request->channels == 0 && request->bandwidth == 0) || +- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL || +- request->bandwidth < 0) ++ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL) + return -EINVAL; + + r = kmalloc(sizeof(*r), GFP_KERNEL); +diff -urNp linux-2.6.32.14/drivers/firmware/dmi_scan.c linux-2.6.32.14/drivers/firmware/dmi_scan.c +--- linux-2.6.32.14/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -23756,9 +24166,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/f p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmware/edd.c ---- linux-2.6.32.11/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/firmware/edd.c linux-2.6.32.14/drivers/firmware/edd.c +--- linux-2.6.32.14/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -23768,9 +24178,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmwa .show = edd_attr_show, }; -diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/firmware/efivars.c ---- linux-2.6.32.11/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400 +diff -urNp linux-2.6.32.14/drivers/firmware/efivars.c linux-2.6.32.14/drivers/firmware/efivars.c +--- linux-2.6.32.14/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -23780,9 +24190,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/fi .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/firmware/iscsi_ibft.c linux-2.6.32.14/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.14/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -23792,9 +24202,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers .show = ibft_show_attribute, }; -diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/firmware/memmap.c ---- linux-2.6.32.11/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/firmware/memmap.c linux-2.6.32.14/drivers/firmware/memmap.c +--- linux-2.6.32.14/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -23804,9 +24214,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/fir .show = memmap_attr_show, }; -diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/drivers/gpu/drm/drm_drv.c ---- linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_drv.c linux-2.6.32.14/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32.14/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -23816,9 +24226,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/drivers/gpu ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gpu/drm/drm_fops.c ---- linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_fops.c linux-2.6.32.14/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32.14/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -23840,7 +24250,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp spin_unlock(&dev->count_lock); retcode = drm_setup(dev); goto out; -@@ -433,7 +433,7 @@ int drm_release(struct inode *inode, str +@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, str lock_kernel(); @@ -23849,7 +24259,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp if (dev->driver->preclose) dev->driver->preclose(dev, file_priv); -@@ -445,7 +445,7 @@ int drm_release(struct inode *inode, str +@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, str DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", task_pid_nr(current), (long)old_encode_dev(file_priv->minor->device), @@ -23858,7 +24268,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp /* if the master has gone away we can't do anything with the lock */ if (file_priv->minor->master) -@@ -522,9 +522,9 @@ int drm_release(struct inode *inode, str +@@ -524,9 +524,9 @@ int drm_release(struct inode *inode, str * End inline drm_release */ @@ -23870,9 +24280,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value = (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); @@ -23882,9 +24292,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.11/drivers/g stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_lock.c linux-2.6.32.11/drivers/gpu/drm/drm_lock.c ---- linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_lock.c linux-2.6.32.14/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32.14/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; @@ -23903,9 +24313,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_lock.c linux-2.6.32.11/drivers/gp /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -23928,9 +24338,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.11/drive sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -23940,9 +24350,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.11/dri .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -23952,9 +24362,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.11/dri .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -23987,9 +24397,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h linux-2.6.32.11/drivers/gp +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -23999,9 +24409,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.11/drive .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -24011,9 +24421,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.11/dri .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -24023,9 +24433,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.11/dri .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400 @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -24035,9 +24445,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.11/drive .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -24055,9 +24465,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.11/d if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400 @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o } } @@ -24082,9 +24492,21 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); -diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400 +@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl + + if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { + error = freq - current_freq; +- error = error < 0 ? 0xffffffff : error; ++ error = (int32_t)error < 0 ? 0xffffffff : error; + } else + error = abs(current_freq - freq); + vco_diff = abs(vco - best_vco); +diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400 @@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -24094,9 +24516,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.11 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -24148,9 +24570,18 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.11/d } -diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-04 20:46:41.581454607 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400 +@@ -39,7 +39,7 @@ + #include <linux/module.h> + + #define TTM_ASSERT_LOCKED(param) +-#define TTM_DEBUG(fmt, arg...) ++#define TTM_DEBUG(fmt, arg...) do {} while (0) + #define TTM_BO_HASH_ORDER 13 + + static int ttm_bo_setup_vm(struct ttm_buffer_object *bo); @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a NULL }; @@ -24160,9 +24591,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.11/drivers/ .show = &ttm_bo_global_show }; -diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -24183,9 +24614,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.11/drive /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -24243,9 +24674,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.11/driv ref->release(ref); item->object = NULL; } -diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c ---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -24255,21 +24686,21 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.11/driv .show = &ttm_mem_zone_show, .store = &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.11/drivers/gpu/vga/vgaarb.c linux-2.6.32.11/drivers/gpu/vga/vgaarb.c ---- linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-04-04 20:46:41.585591308 -0400 -@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file - remaining -= 7; - pr_devel("client 0x%p called 'target'\n", priv); - /* if target is default */ -- if (!strncmp(buf, "default", 7)) -+ if (!strncmp(curr_pos, "default", 7)) - pdev = pci_dev_get(vga_default_device()); - else { - if (!vga_pci_str_to_vars(curr_pos, remaining, -diff -urNp linux-2.6.32.11/drivers/hwmon/k8temp.c linux-2.6.32.11/drivers/hwmon/k8temp.c ---- linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/hid/usbhid/hiddev.c linux-2.6.32.14/drivers/hid/usbhid/hiddev.c +--- linux-2.6.32.14/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400 +@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi + return put_user(HID_VERSION, (int __user *)arg); + + case HIDIOCAPPLICATION: +- if (arg < 0 || arg >= hid->maxapplication) ++ if (arg >= hid->maxapplication) + return -EINVAL; + + for (i = 0; i < hid->maxcollection; i++) +diff -urNp linux-2.6.32.14/drivers/hwmon/k8temp.c linux-2.6.32.14/drivers/hwmon/k8temp.c +--- linux-2.6.32.14/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -24279,9 +24710,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/k8temp.c linux-2.6.32.11/drivers/hwmon/ }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.32.11/drivers/hwmon/sis5595.c linux-2.6.32.11/drivers/hwmon/sis5595.c ---- linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/hwmon/sis5595.c linux-2.6.32.14/drivers/hwmon/sis5595.c +--- linux-2.6.32.14/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -24291,9 +24722,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/sis5595.c linux-2.6.32.11/drivers/hwmon }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.32.11/drivers/hwmon/via686a.c linux-2.6.32.11/drivers/hwmon/via686a.c ---- linux-2.6.32.11/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/hwmon/via686a.c linux-2.6.32.14/drivers/hwmon/via686a.c +--- linux-2.6.32.14/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -24303,9 +24734,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/via686a.c linux-2.6.32.11/drivers/hwmon }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.32.11/drivers/hwmon/vt8231.c linux-2.6.32.11/drivers/hwmon/vt8231.c ---- linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/hwmon/vt8231.c linux-2.6.32.14/drivers/hwmon/vt8231.c +--- linux-2.6.32.14/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -24315,9 +24746,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/vt8231.c linux-2.6.32.11/drivers/hwmon/ }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.32.11/drivers/hwmon/w83791d.c linux-2.6.32.11/drivers/hwmon/w83791d.c ---- linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/hwmon/w83791d.c linux-2.6.32.14/drivers/hwmon/w83791d.c +--- linux-2.6.32.14/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -24329,21 +24760,21 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/w83791d.c linux-2.6.32.11/drivers/hwmon static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:41:49.952923765 -0400 -+++ linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:46:41.585591308 -0400 -@@ -580,7 +580,7 @@ static struct pci_device_id i801_ids[] = - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, +diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 ++++ linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400 +@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) }, - { 0, } + { 0, 0, 0, 0, 0, 0, 0 } }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -24362,9 +24793,9 @@ diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.11/driver }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, @@ -24374,9 +24805,9 @@ diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.11/drive }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -24386,9 +24817,9 @@ diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.11/drive }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.32.11/drivers/ide/ide-cd.c linux-2.6.32.11/drivers/ide/ide-cd.c ---- linux-2.6.32.11/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/ide/ide-cd.c linux-2.6.32.14/drivers/ide/ide-cd.c +--- linux-2.6.32.14/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400 @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -24398,9 +24829,9 @@ diff -urNp linux-2.6.32.11/drivers/ide/ide-cd.c linux-2.6.32.11/drivers/ide/ide- drive->dma = 0; } } -diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/ieee1394/dv1394.c ---- linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/dv1394.c linux-2.6.32.14/drivers/ieee1394/dv1394.c +--- linux-2.6.32.14/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -24419,9 +24850,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/iee }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.32.11/drivers/ieee1394/eth1394.c linux-2.6.32.11/drivers/ieee1394/eth1394.c ---- linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/eth1394.c linux-2.6.32.14/drivers/ieee1394/eth1394.c +--- linux-2.6.32.14/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -24431,9 +24862,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/eth1394.c linux-2.6.32.11/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee1394/hosts.c ---- linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/hosts.c linux-2.6.32.14/drivers/ieee1394/hosts.c +--- linux-2.6.32.14/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -24442,9 +24873,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/ieee1394/ohci1394.c ---- linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/ohci1394.c linux-2.6.32.14/drivers/ieee1394/ohci1394.c +--- linux-2.6.32.14/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) @@ -24466,9 +24897,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/i }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.32.11/drivers/ieee1394/raw1394.c linux-2.6.32.11/drivers/ieee1394/raw1394.c ---- linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/raw1394.c linux-2.6.32.14/drivers/ieee1394/raw1394.c +--- linux-2.6.32.14/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -24478,9 +24909,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/raw1394.c linux-2.6.32.11/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.32.11/drivers/ieee1394/sbp2.c linux-2.6.32.11/drivers/ieee1394/sbp2.c ---- linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/sbp2.c linux-2.6.32.14/drivers/ieee1394/sbp2.c +--- linux-2.6.32.14/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -24499,9 +24930,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/sbp2.c linux-2.6.32.11/drivers/ieee1 { int ret; -diff -urNp linux-2.6.32.11/drivers/ieee1394/video1394.c linux-2.6.32.11/drivers/ieee1394/video1394.c ---- linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/ieee1394/video1394.c linux-2.6.32.14/drivers/ieee1394/video1394.c +--- linux-2.6.32.14/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff @@ -24511,9 +24942,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/video1394.c linux-2.6.32.11/drivers/ }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.32.11/drivers/infiniband/core/cm.c linux-2.6.32.11/drivers/infiniband/core/cm.c ---- linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/infiniband/core/cm.c linux-2.6.32.14/drivers/infiniband/core/cm.c +--- linux-2.6.32.14/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400 @@ -112,7 +112,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -24657,9 +25088,9 @@ diff -urNp linux-2.6.32.11/drivers/infiniband/core/cm.c linux-2.6.32.11/drivers/ .show = cm_show_counter }; -diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/infiniband/core/sysfs.c linux-2.6.32.14/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.14/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -24669,9 +25100,9 @@ diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drive .show = port_attr_show }; -diff -urNp linux-2.6.32.11/drivers/input/keyboard/atkbd.c linux-2.6.32.11/drivers/input/keyboard/atkbd.c ---- linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/input/keyboard/atkbd.c linux-2.6.32.14/drivers/input/keyboard/atkbd.c +--- linux-2.6.32.14/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -24681,9 +25112,9 @@ diff -urNp linux-2.6.32.11/drivers/input/keyboard/atkbd.c linux-2.6.32.11/driver }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/drivers/input/mouse/lifebook.c ---- linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400 +diff -urNp linux-2.6.32.14/drivers/input/mouse/lifebook.c linux-2.6.32.14/drivers/input/mouse/lifebook.c +--- linux-2.6.32.14/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -24693,9 +25124,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/driver }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.32.11/drivers/input/mouse/psmouse-base.c linux-2.6.32.11/drivers/input/mouse/psmouse-base.c ---- linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/input/mouse/psmouse-base.c linux-2.6.32.14/drivers/input/mouse/psmouse-base.c +--- linux-2.6.32.14/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400 @@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -24705,9 +25136,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/psmouse-base.c linux-2.6.32.11/dr }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drivers/input/mouse/synaptics.c ---- linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/input/mouse/synaptics.c linux-2.6.32.14/drivers/input/mouse/synaptics.c +--- linux-2.6.32.14/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -24736,9 +25167,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drive }; #endif -diff -urNp linux-2.6.32.11/drivers/input/mousedev.c linux-2.6.32.11/drivers/input/mousedev.c ---- linux-2.6.32.11/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/input/mousedev.c linux-2.6.32.14/drivers/input/mousedev.c +--- linux-2.6.32.14/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -24748,9 +25179,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mousedev.c linux-2.6.32.11/drivers/inpu }; static int psaux_registered; #endif -diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 ++++ linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400 @@ -172,7 +172,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -24805,9 +25236,9 @@ diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11 }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.32.11/drivers/input/serio/serio_raw.c linux-2.6.32.11/drivers/input/serio/serio_raw.c ---- linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/input/serio/serio_raw.c linux-2.6.32.14/drivers/input/serio/serio_raw.c +--- linux-2.6.32.14/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -24817,9 +25248,9 @@ diff -urNp linux-2.6.32.11/drivers/input/serio/serio_raw.c linux-2.6.32.11/drive }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/common.c linux-2.6.32.11/drivers/isdn/gigaset/common.c ---- linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/common.c linux-2.6.32.14/drivers/isdn/gigaset/common.c +--- linux-2.6.32.14/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -24829,9 +25260,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/common.c linux-2.6.32.11/drivers cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -24841,9 +25272,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h linux-2.6.32.11/driver struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/interface.c linux-2.6.32.11/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/interface.c linux-2.6.32.14/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.14/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 ++++ linux-2.6.32.14/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -24931,9 +25362,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/interface.c linux-2.6.32.11/driv dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -24952,9 +25383,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c linux-2.6.32.11/driver return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.32.11/drivers/isdn/icn/icn.c linux-2.6.32.11/drivers/isdn/icn/icn.c ---- linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/isdn/icn/icn.c linux-2.6.32.14/drivers/isdn/icn/icn.c +--- linux-2.6.32.14/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -24964,9 +25395,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/icn/icn.c linux-2.6.32.11/drivers/isdn/i return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.32.11/drivers/lguest/core.c linux-2.6.32.11/drivers/lguest/core.c ---- linux-2.6.32.11/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/lguest/core.c linux-2.6.32.14/drivers/lguest/core.c +--- linux-2.6.32.14/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400 @@ -91,9 +91,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. @@ -24985,9 +25416,9 @@ diff -urNp linux-2.6.32.11/drivers/lguest/core.c linux-2.6.32.11/drivers/lguest/ if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -25006,9 +25437,9 @@ diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.11 .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/macintosh/via-pmu.c ---- linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/macintosh/via-pmu.c linux-2.6.32.14/drivers/macintosh/via-pmu.c +--- linux-2.6.32.14/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -25018,9 +25449,9 @@ diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/m .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.32.11/drivers/md/bitmap.c linux-2.6.32.11/drivers/md/bitmap.c ---- linux-2.6.32.11/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/md/bitmap.c linux-2.6.32.14/drivers/md/bitmap.c +--- linux-2.6.32.14/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -25030,9 +25461,9 @@ diff -urNp linux-2.6.32.11/drivers/md/bitmap.c linux-2.6.32.11/drivers/md/bitmap # endif #endif -diff -urNp linux-2.6.32.11/drivers/md/dm-sysfs.c linux-2.6.32.11/drivers/md/dm-sysfs.c ---- linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/md/dm-sysfs.c linux-2.6.32.14/drivers/md/dm-sysfs.c +--- linux-2.6.32.14/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -25042,9 +25473,9 @@ diff -urNp linux-2.6.32.11/drivers/md/dm-sysfs.c linux-2.6.32.11/drivers/md/dm-s .show = dm_attr_show, }; -diff -urNp linux-2.6.32.11/drivers/md/dm-table.c linux-2.6.32.11/drivers/md/dm-table.c ---- linux-2.6.32.11/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400 +diff -urNp linux-2.6.32.14/drivers/md/dm-table.c linux-2.6.32.14/drivers/md/dm-table.c +--- linux-2.6.32.14/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -25054,10 +25485,10 @@ diff -urNp linux-2.6.32.11/drivers/md/dm-table.c linux-2.6.32.11/drivers/md/dm-t DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c ---- linux-2.6.32.11/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400 -@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko +diff -urNp linux-2.6.32.14/drivers/md/md.c linux-2.6.32.14/drivers/md/md.c +--- linux-2.6.32.14/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 ++++ linux-2.6.32.14/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400 +@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); kfree(rdev); } @@ -25066,7 +25497,7 @@ diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c .show = rdev_attr_show, .store = rdev_attr_store, }; -@@ -3878,7 +3878,7 @@ static void md_free(struct kobject *ko) +@@ -3884,7 +3884,7 @@ static void md_free(struct kobject *ko) kfree(mddev); } @@ -25075,7 +25506,7 @@ diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c .show = md_attr_show, .store = md_attr_store, }; -@@ -6004,7 +6004,7 @@ static int md_seq_show(struct seq_file * +@@ -6010,7 +6010,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); @@ -25084,7 +25515,7 @@ diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c } seq_printf(seq, "\n"); -@@ -6098,7 +6098,7 @@ static int is_mddev_idle(mddev_t *mddev, +@@ -6104,7 +6104,7 @@ static int is_mddev_idle(mddev_t *mddev, struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - @@ -25093,9 +25524,9 @@ diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.32.11/drivers/md/md.h linux-2.6.32.11/drivers/md/md.h ---- linux-2.6.32.11/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/md/md.h linux-2.6.32.14/drivers/md/md.h +--- linux-2.6.32.14/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -25105,9 +25536,9 @@ diff -urNp linux-2.6.32.11/drivers/md/md.h linux-2.6.32.11/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -25116,9 +25547,9 @@ diff -urNp linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.11/d struct file_operations *dvbdevfops; struct device *clsdev; int minor; -diff -urNp linux-2.6.32.11/drivers/media/radio/radio-cadet.c linux-2.6.32.11/drivers/media/radio/radio-cadet.c ---- linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/media/radio/radio-cadet.c linux-2.6.32.14/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.14/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f while (i < count && dev->rdsin != dev->rdsout) readbuf[i++] = dev->rdsbuf[dev->rdsout++]; @@ -25128,9 +25559,9 @@ diff -urNp linux-2.6.32.11/drivers/media/radio/radio-cadet.c linux-2.6.32.11/dri return -EFAULT; return i; } -diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -25140,9 +25571,9 @@ diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -25152,9 +25583,72 @@ diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c lin cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/message/fusion/mptdebug.h linux-2.6.32.14/drivers/message/fusion/mptdebug.h +--- linux-2.6.32.14/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400 +@@ -71,7 +71,7 @@ + CMD; \ + } + #else +-#define MPT_CHECK_LOGGING(IOC, CMD, BITS) ++#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) + #endif + + +diff -urNp linux-2.6.32.14/drivers/message/fusion/mptsas.c linux-2.6.32.14/drivers/message/fusion/mptsas.c +--- linux-2.6.32.14/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400 +@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin + return 0; + } + ++static inline void ++mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy) ++{ ++ if (phy_info->port_details) { ++ phy_info->port_details->rphy = rphy; ++ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n", ++ ioc->name, rphy)); ++ } ++ ++ if (rphy) { ++ dsaswideprintk(ioc, dev_printk(KERN_DEBUG, ++ &rphy->dev, MYIOC_s_FMT "add:", ioc->name)); ++ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n", ++ ioc->name, rphy, rphy->dev.release)); ++ } ++} ++ + /* no mutex */ + static void + mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details) +@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p + return NULL; + } + +-static inline void +-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy) +-{ +- if (phy_info->port_details) { +- phy_info->port_details->rphy = rphy; +- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n", +- ioc->name, rphy)); +- } +- +- if (rphy) { +- dsaswideprintk(ioc, dev_printk(KERN_DEBUG, +- &rphy->dev, MYIOC_s_FMT "add:", ioc->name)); +- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n", +- ioc->name, rphy, rphy->dev.release)); +- } +-} +- + static inline struct sas_port * + mptsas_get_port(struct mptsas_phyinfo *phy_info) + { +diff -urNp linux-2.6.32.14/drivers/message/i2o/i2o_proc.c linux-2.6.32.14/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.14/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -25241,9 +25735,9 @@ diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/driver return 0; } -diff -urNp linux-2.6.32.11/drivers/misc/kgdbts.c linux-2.6.32.11/drivers/misc/kgdbts.c ---- linux-2.6.32.11/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/misc/kgdbts.c linux-2.6.32.14/drivers/misc/kgdbts.c +--- linux-2.6.32.14/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -25262,9 +25756,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/kgdbts.c linux-2.6.32.11/drivers/misc/kg .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic static void update_mcs_stats(enum mcs_op op, unsigned long clks) @@ -25276,9 +25770,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.11/dri if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max = clks; } -diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -25302,9 +25796,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.11/driv max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -25488,9 +25982,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/driv } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2000.c linux-2.6.32.11/drivers/mtd/devices/doc2000.c ---- linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/mtd/devices/doc2000.c linux-2.6.32.14/drivers/mtd/devices/doc2000.c +--- linux-2.6.32.14/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt /* The ECC will not be calculated correctly if less than 512 is written */ @@ -25500,9 +25994,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2000.c linux-2.6.32.11/drivers printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers/mtd/devices/doc2001.c ---- linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/mtd/devices/doc2001.c linux-2.6.32.14/drivers/mtd/devices/doc2001.c +--- linux-2.6.32.14/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -25512,9 +26006,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/ubi/build.c ---- linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/mtd/ubi/build.c linux-2.6.32.14/drivers/mtd/ubi/build.c +--- linux-2.6.32.14/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -25554,9 +26048,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/u } /** -diff -urNp linux-2.6.32.11/drivers/net/e1000e/82571.c linux-2.6.32.11/drivers/net/e1000e/82571.c ---- linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/net/e1000e/82571.c linux-2.6.32.14/drivers/net/e1000e/82571.c +--- linux-2.6.32.14/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -25610,9 +26104,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/82571.c linux-2.6.32.11/drivers/ne .acquire_nvm = e1000_acquire_nvm_82571, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_82571, -diff -urNp linux-2.6.32.11/drivers/net/e1000e/e1000.h linux-2.6.32.11/drivers/net/e1000e/e1000.h ---- linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/net/e1000e/e1000.h linux-2.6.32.14/drivers/net/e1000e/e1000.h +--- linux-2.6.32.14/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -25626,9 +26120,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/e1000.h linux-2.6.32.11/drivers/ne }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.11/drivers/net/e1000e/es2lan.c linux-2.6.32.11/drivers/net/e1000e/es2lan.c ---- linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400 +diff -urNp linux-2.6.32.14/drivers/net/e1000e/es2lan.c linux-2.6.32.14/drivers/net/e1000e/es2lan.c +--- linux-2.6.32.14/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -25664,9 +26158,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/es2lan.c linux-2.6.32.11/drivers/n .acquire_nvm = e1000_acquire_nvm_80003es2lan, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.32.11/drivers/net/e1000e/hw.h linux-2.6.32.11/drivers/net/e1000e/hw.h ---- linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 -+++ linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/e1000e/hw.h linux-2.6.32.14/drivers/net/e1000e/hw.h +--- linux-2.6.32.14/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 ++++ linux-2.6.32.14/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400 @@ -756,34 +756,34 @@ struct e1000_mac_operations { /* Function pointers for the PHY. */ @@ -25726,9 +26220,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/hw.h linux-2.6.32.11/drivers/net/e }; struct e1000_mac_info { -diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 -+++ linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/e1000e/ich8lan.c linux-2.6.32.14/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.14/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 ++++ linux-2.6.32.14/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -25756,9 +26250,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/drivers/ .acquire_nvm = e1000_acquire_nvm_ich8lan, .read_nvm = e1000_read_nvm_ich8lan, .release_nvm = e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.32.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibmveth.c ---- linux-2.6.32.11/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/ibmveth.c linux-2.6.32.14/drivers/net/ibmveth.c +--- linux-2.6.32.14/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -25768,10 +26262,10 @@ diff -urNp linux-2.6.32.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibm .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers/net/igb/e1000_82575.c ---- linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-04-04 20:46:41.601781347 -0400 -@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct +diff -urNp linux-2.6.32.14/drivers/net/igb/e1000_82575.c linux-2.6.32.14/drivers/net/igb/e1000_82575.c +--- linux-2.6.32.14/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 ++++ linux-2.6.32.14/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400 +@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -25780,7 +26274,7 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers .reset_hw = igb_reset_hw_82575, .init_hw = igb_init_hw_82575, .check_for_link = igb_check_for_link_82575, -@@ -1409,13 +1409,13 @@ static struct e1000_mac_operations e1000 +@@ -1410,13 +1410,13 @@ static struct e1000_mac_operations e1000 .get_speed_and_duplex = igb_get_speed_and_duplex_copper, }; @@ -25796,10 +26290,10 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_hw.h linux-2.6.32.11/drivers/net/igb/e1000_hw.h ---- linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-04-04 20:46:41.601781347 -0400 -@@ -302,17 +302,17 @@ struct e1000_phy_operations { +diff -urNp linux-2.6.32.14/drivers/net/igb/e1000_hw.h linux-2.6.32.14/drivers/net/igb/e1000_hw.h +--- linux-2.6.32.14/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 ++++ linux-2.6.32.14/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400 +@@ -303,17 +303,17 @@ struct e1000_phy_operations { }; struct e1000_nvm_operations { @@ -25824,9 +26318,9 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_hw.h linux-2.6.32.11/drivers/ne }; extern const struct e1000_info e1000_82575_info; -diff -urNp linux-2.6.32.11/drivers/net/irda/vlsi_ir.c linux-2.6.32.11/drivers/net/irda/vlsi_ir.c ---- linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/irda/vlsi_ir.c linux-2.6.32.14/drivers/net/irda/vlsi_ir.c +--- linux-2.6.32.14/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -25843,9 +26337,9 @@ diff -urNp linux-2.6.32.11/drivers/net/irda/vlsi_ir.c linux-2.6.32.11/drivers/ne spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return NETDEV_TX_OK; -diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/net/iseries_veth.c ---- linux-2.6.32.11/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/iseries_veth.c linux-2.6.32.14/drivers/net/iseries_veth.c +--- linux-2.6.32.14/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -25864,9 +26358,9 @@ diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/ne .show = veth_port_attribute_show }; -diff -urNp linux-2.6.32.11/drivers/net/pcnet32.c linux-2.6.32.11/drivers/net/pcnet32.c ---- linux-2.6.32.11/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/pcnet32.c linux-2.6.32.14/drivers/net/pcnet32.c +--- linux-2.6.32.14/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -25876,9 +26370,9 @@ diff -urNp linux-2.6.32.11/drivers/net/pcnet32.c linux-2.6.32.11/drivers/net/pcn { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.32.11/drivers/net/tg3.h linux-2.6.32.11/drivers/net/tg3.h ---- linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 -+++ linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/tg3.h linux-2.6.32.14/drivers/net/tg3.h +--- linux-2.6.32.14/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 ++++ linux-2.6.32.14/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -25887,9 +26381,9 @@ diff -urNp linux-2.6.32.11/drivers/net/tg3.h linux-2.6.32.11/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.32.11/drivers/net/tulip/de4x5.c linux-2.6.32.11/drivers/net/tulip/de4x5.c ---- linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -0400 +diff -urNp linux-2.6.32.14/drivers/net/tulip/de4x5.c linux-2.6.32.14/drivers/net/tulip/de4x5.c +--- linux-2.6.32.14/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=0; i<ETH_ALEN; i++) { tmp.addr[i] = dev->dev_addr[i]; @@ -25908,9 +26402,9 @@ diff -urNp linux-2.6.32.11/drivers/net/tulip/de4x5.c linux-2.6.32.11/drivers/net return -EFAULT; break; } -diff -urNp linux-2.6.32.11/drivers/net/usb/hso.c linux-2.6.32.11/drivers/net/usb/hso.c ---- linux-2.6.32.11/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/usb/hso.c linux-2.6.32.14/drivers/net/usb/hso.c +--- linux-2.6.32.14/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -25989,9 +26483,9 @@ diff -urNp linux-2.6.32.11/drivers/net/usb/hso.c linux-2.6.32.11/drivers/net/usb result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -26001,9 +26495,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c linux-2.6.32.11/dr /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); @@ -26013,9 +26507,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c ---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -26025,9 +26519,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl1000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -26037,10 +26531,10 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. .ucode = &iwl3945_ucode, .lib = &iwl3945_lib, .hcmd = &iwl3945_hcmd, -diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-04 20:46:41.605567348 -0400 -@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400 +@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -26049,10 +26543,10 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, -diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-04 20:46:41.605567348 -0400 -@@ -1626,14 +1626,14 @@ static struct iwl_lib_ops iwl5150_lib = +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400 +@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -26069,9 +26563,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl5150_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -26081,9 +26575,23 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl6000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400 +@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri + #endif + + #else +-#define IWL_DEBUG(__priv, level, fmt, args...) +-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) ++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) ++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) + static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, + void *p, u32 len) + {} +diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400 @@ -67,7 +67,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ @@ -26093,9 +26601,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1 extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -26105,9 +26613,21 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400 +@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn + + devdbg(usbdev, "set_rts_threshold %i", rts_threshold); + +- if (rts_threshold < 0 || rts_threshold > 2347) ++ if (rts_threshold > 2347) + rts_threshold = 2347; + + tmp = cpu_to_le32(rts_threshold); +diff -urNp linux-2.6.32.14/drivers/oprofile/buffer_sync.c linux-2.6.32.14/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.14/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400 @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -26143,9 +26663,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/driver } } release_mm(mm); -diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drivers/oprofile/event_buffer.c ---- linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/oprofile/event_buffer.c linux-2.6.32.14/drivers/oprofile/event_buffer.c +--- linux-2.6.32.14/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -26155,9 +26675,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drive return; } -diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/oprofile/oprof.c ---- linux-2.6.32.11/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400 +diff -urNp linux-2.6.32.14/drivers/oprofile/oprof.c linux-2.6.32.14/drivers/oprofile/oprof.c +--- linux-2.6.32.14/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -26167,9 +26687,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/opro start_switch_worker(); } -diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers/oprofile/oprofilefs.c ---- linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/oprofile/oprofilefs.c linux-2.6.32.14/drivers/oprofile/oprofilefs.c +--- linux-2.6.32.14/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -26179,9 +26699,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/oprofile/oprofile_stats.c linux-2.6.32.14/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.14/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -26199,9 +26719,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/dri } -diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/oprofile/oprofile_stats.h linux-2.6.32.14/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.14/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -26219,9 +26739,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/dri }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/parisc/pdc_stable.c ---- linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/parisc/pdc_stable.c linux-2.6.32.14/drivers/parisc/pdc_stable.c +--- linux-2.6.32.14/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -26231,9 +26751,9 @@ diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/p .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parport/procfs.c ---- linux-2.6.32.11/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/parport/procfs.c linux-2.6.32.14/drivers/parport/procfs.c +--- linux-2.6.32.14/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -26252,9 +26772,9 @@ diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parp } #endif /* IEEE1284.3 support. */ -diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -26264,9 +26784,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/dr .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -26281,9 +26801,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.11/dr dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/hotplug/fakephp.c linux-2.6.32.14/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.14/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -26293,9 +26813,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci/intel-iommu.c ---- linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/intel-iommu.c linux-2.6.32.14/drivers/pci/intel-iommu.c +--- linux-2.6.32.14/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400 @@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de return !dma_addr; } @@ -26305,9 +26825,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ @@ -26317,9 +26837,29 @@ diff -urNp linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.11/driver }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/drivers/pci/proc.c ---- linux-2.6.32.11/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/probe.c linux-2.6.32.14/drivers/pci/probe.c +--- linux-2.6.32.14/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400 +@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( + return ret; + } + +-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev, ++static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev, + struct device_attribute *attr, + char *buf) + { + return pci_bus_show_cpuaffinity(dev, 0, attr, buf); + } + +-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev, ++static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev, + struct device_attribute *attr, + char *buf) + { +diff -urNp linux-2.6.32.14/drivers/pci/proc.c linux-2.6.32.14/drivers/pci/proc.c +--- linux-2.6.32.14/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -26337,9 +26877,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.32.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c ---- linux-2.6.32.11/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pci/slot.c linux-2.6.32.14/drivers/pci/slot.c +--- linux-2.6.32.14/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -26349,9 +26889,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.32.11/drivers/pcmcia/ti113x.h linux-2.6.32.11/drivers/pcmcia/ti113x.h ---- linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pcmcia/ti113x.h linux-2.6.32.14/drivers/pcmcia/ti113x.h +--- linux-2.6.32.14/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), @@ -26361,9 +26901,9 @@ diff -urNp linux-2.6.32.11/drivers/pcmcia/ti113x.h linux-2.6.32.11/drivers/pcmci }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.32.11/drivers/pcmcia/yenta_socket.c linux-2.6.32.11/drivers/pcmcia/yenta_socket.c ---- linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/pcmcia/yenta_socket.c linux-2.6.32.14/drivers/pcmcia/yenta_socket.c +--- linux-2.6.32.14/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -26373,9 +26913,9 @@ diff -urNp linux-2.6.32.11/drivers/pcmcia/yenta_socket.c linux-2.6.32.11/drivers }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/acer-wmi.c linux-2.6.32.14/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.14/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -26385,9 +26925,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drive .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/asus_acpi.c linux-2.6.32.14/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.14/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -26397,9 +26937,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/driv .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/asus-laptop.c linux-2.6.32.11/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/asus-laptop.c linux-2.6.32.14/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -26409,9 +26949,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/asus-laptop.c linux-2.6.32.11/dr .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/compal-laptop.c linux-2.6.32.14/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -26421,9 +26961,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/ .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/dell-laptop.c linux-2.6.32.14/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -26433,10 +26973,10 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/dr .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-04-04 20:46:41.612789562 -0400 -@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device +diff -urNp linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400 +@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); static int update_bl_status(struct backlight_device *bd); @@ -26445,9 +26985,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.11/d .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -26457,9 +26997,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11 .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/msi-laptop.c linux-2.6.32.14/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -26469,9 +27009,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/dri .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -26481,9 +27021,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. .get_brightness = bl_get, .update_status = bl_set_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/sony-laptop.c linux-2.6.32.14/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.14/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -26493,11 +27033,11 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/dr .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-04-04 20:46:41.612789562 -0400 -@@ -6083,7 +6083,7 @@ static int brightness_get(struct backlig - return status & TP_EC_BACKLIGHT_LVLMSK; +diff -urNp linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400 +@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha + BACKLIGHT_UPDATE_HOTKEY); } -static struct backlight_ops ibm_backlight_data = { @@ -26505,9 +27045,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.11/ .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -26517,9 +27057,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/d .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -26576,9 +27116,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drive + + pax_close_kernel(); } -diff -urNp linux-2.6.32.11/drivers/pnp/quirks.c linux-2.6.32.11/drivers/pnp/quirks.c ---- linux-2.6.32.11/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/pnp/quirks.c linux-2.6.32.14/drivers/pnp/quirks.c +--- linux-2.6.32.14/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -26588,9 +27128,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/quirks.c linux-2.6.32.11/drivers/pnp/quir }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/resource.c ---- linux-2.6.32.11/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/pnp/resource.c linux-2.6.32.14/drivers/pnp/resource.c +--- linux-2.6.32.14/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -26609,9 +27149,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/re return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/s390/cio/qdio_perf.c linux-2.6.32.14/drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.14/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -26687,9 +27227,9 @@ diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/ seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.h linux-2.6.32.11/drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400 +diff -urNp linux-2.6.32.14/drivers/s390/cio/qdio_perf.h linux-2.6.32.14/drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.14/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400 @@ -13,46 +13,46 @@ struct qdio_perf_stats { @@ -26762,9 +27302,9 @@ diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.h linux-2.6.32.11/drivers/ } int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/drivers/scsi/ipr.c ---- linux-2.6.32.11/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/scsi/ipr.c linux-2.6.32.14/drivers/scsi/ipr.c +--- linux-2.6.32.14/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -26774,9 +27314,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/drivers/scsi/ipr.c .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, -diff -urNp linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -26898,9 +27438,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/ fc_frame_free(fp); } -diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 ++++ linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -26910,9 +27450,21 @@ diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.11/drivers/scsi/scsi_logging.h linux-2.6.32.11/drivers/scsi/scsi_logging.h ---- linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h +--- linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400 +@@ -79,7 +79,7 @@ + CMD; \ + } + #else +-#define MPT_CHECK_LOGGING(IOC, CMD, BITS) ++#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) + #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ + + +diff -urNp linux-2.6.32.14/drivers/scsi/scsi_logging.h linux-2.6.32.14/drivers/scsi/scsi_logging.h +--- linux-2.6.32.14/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -26922,9 +27474,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/scsi_logging.h linux-2.6.32.11/drivers/s #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c ---- linux-2.6.32.11/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/scsi/sg.c linux-2.6.32.14/drivers/scsi/sg.c +--- linux-2.6.32.14/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -26943,9 +27495,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.11/drivers/serial/8250_pci.c linux-2.6.32.11/drivers/serial/8250_pci.c ---- linux-2.6.32.11/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/serial/8250_pci.c linux-2.6.32.14/drivers/serial/8250_pci.c +--- linux-2.6.32.14/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, @@ -26955,9 +27507,9 @@ diff -urNp linux-2.6.32.11/drivers/serial/8250_pci.c linux-2.6.32.11/drivers/ser }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.32.11/drivers/serial/kgdboc.c linux-2.6.32.11/drivers/serial/kgdboc.c ---- linux-2.6.32.11/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/serial/kgdboc.c linux-2.6.32.14/drivers/serial/kgdboc.c +--- linux-2.6.32.14/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -26976,9 +27528,9 @@ diff -urNp linux-2.6.32.11/drivers/serial/kgdboc.c linux-2.6.32.11/drivers/seria .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/drivers/staging/android/binder.c ---- linux-2.6.32.11/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/android/binder.c linux-2.6.32.14/drivers/staging/android/binder.c +--- linux-2.6.32.14/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -26988,9 +27540,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/driv .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -27009,9 +27561,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -27021,9 +27573,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/ .close = comedi_unmap, }; -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -27033,9 +27585,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 .owner = THIS_MODULE, .open = adsp_open, .unlocked_ioctl = adsp_ioctl, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -27045,9 +27597,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400 @@ -833,7 +833,7 @@ done: return rc; } @@ -27057,9 +27609,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 .owner = THIS_MODULE, .open = audamrnb_open, .release = audamrnb_release, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -27069,9 +27621,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 .owner = THIS_MODULE, .open = audevrc_open, .release = audevrc_release, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -27090,9 +27642,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1 .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400 @@ -941,7 +941,7 @@ done: return rc; } @@ -27102,9 +27654,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -27123,9 +27675,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. .owner = THIS_MODULE, .open = audpp_open, .unlocked_ioctl = audpp_ioctl, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400 @@ -816,7 +816,7 @@ err: return rc; } @@ -27135,9 +27687,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 .owner = THIS_MODULE, .open = audqcelp_open, .release = audqcelp_release, -diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400 @@ -242,7 +242,7 @@ err: return rc; } @@ -27147,9 +27699,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/dri .owner = THIS_MODULE, .open = snd_open, .release = snd_release, -diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c ---- linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -27159,9 +27711,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.11/d .owner = THIS_MODULE, .read = qmi_read, .write = qmi_write, -diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c ---- linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -27180,9 +27732,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c linu .owner = THIS_MODULE, .open = rpcrouter_open, .release = rpcrouter_release, -diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/staging/dst/dcore.c ---- linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dst/dcore.c linux-2.6.32.14/drivers/staging/dst/dcore.c +--- linux-2.6.32.14/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -27201,9 +27753,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/s snprintf(n->name, sizeof(n->name), "%s", ctl->name); err = dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.11/drivers/staging/dst/trans.c linux-2.6.32.11/drivers/staging/dst/trans.c ---- linux-2.6.32.11/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/dst/trans.c linux-2.6.32.14/drivers/staging/dst/trans.c +--- linux-2.6.32.14/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; t->retries = 0; @@ -27213,9 +27765,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dst/trans.c linux-2.6.32.11/drivers/s t->enc = bio_data_dir(bio); dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); -diff -urNp linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -27225,9 +27777,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/ .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; @@ -27237,9 +27789,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.11/drive .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, -diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers/staging/panel/panel.c ---- linux-2.6.32.11/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/panel/panel.c linux-2.6.32.14/drivers/staging/panel/panel.c +--- linux-2.6.32.14/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -27258,9 +27810,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drivers/staging/phison/phison.c ---- linux-2.6.32.11/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/phison/phison.c linux-2.6.32.14/drivers/staging/phison/phison.c +--- linux-2.6.32.14/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -27270,9 +27822,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drive .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/staging/poch/poch.c ---- linux-2.6.32.11/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/poch/poch.c linux-2.6.32.14/drivers/staging/poch/poch.c +--- linux-2.6.32.14/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -27282,9 +27834,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/s .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/inode.c linux-2.6.32.11/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/inode.c linux-2.6.32.14/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.14/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -27294,9 +27846,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/inode.c linux-2.6.32.11/driv psb->trans_max_pages = 100; -diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -27306,9 +27858,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c linux-2.6.32.11/dri mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -27318,9 +27870,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h linux-2.6.32.11/driv unsigned long mcache_timeout; unsigned int idx; -diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/sep/sep_driver.c linux-2.6.32.14/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.14/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -27330,9 +27882,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/driv .owner = THIS_MODULE, .ioctl = sep_ioctl, .poll = sep_poll, -diff -urNp linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * static int __init vme_user_probe(struct device *, int, int); static int __exit vme_user_remove(struct device *, int, int); @@ -27342,9 +27894,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1 .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c ---- linux-2.6.32.11/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/uio/uio.c linux-2.6.32.14/drivers/uio/uio.c +--- linux-2.6.32.14/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400 @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -27363,9 +27915,9 @@ diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c .show = portio_type_show, }; -diff -urNp linux-2.6.32.11/drivers/usb/atm/usbatm.c linux-2.6.32.11/drivers/usb/atm/usbatm.c ---- linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/atm/usbatm.c linux-2.6.32.14/drivers/usb/atm/usbatm.c +--- linux-2.6.32.14/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -27445,10 +27997,10 @@ diff -urNp linux-2.6.32.11/drivers/usb/atm/usbatm.c linux-2.6.32.11/drivers/usb/ if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.11/drivers/usb/class/cdc-acm.c linux-2.6.32.11/drivers/usb/class/cdc-acm.c ---- linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-04-04 20:46:41.625742858 -0400 -@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = +diff -urNp linux-2.6.32.14/drivers/usb/class/cdc-acm.c linux-2.6.32.14/drivers/usb/class/cdc-acm.c +--- linux-2.6.32.14/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 ++++ linux-2.6.32.14/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400 +@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */ @@ -27457,9 +28009,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/class/cdc-acm.c linux-2.6.32.11/drivers/u }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.32.11/drivers/usb/class/usblp.c linux-2.6.32.11/drivers/usb/class/usblp.c ---- linux-2.6.32.11/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/class/usblp.c linux-2.6.32.14/drivers/usb/class/usblp.c +--- linux-2.6.32.14/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ @@ -27478,9 +28030,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/class/usblp.c linux-2.6.32.11/drivers/usb }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.c linux-2.6.32.11/drivers/usb/core/hcd.c ---- linux-2.6.32.11/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/core/hcd.c linux-2.6.32.14/drivers/usb/core/hcd.c +--- linux-2.6.32.14/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -27499,9 +28051,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.c linux-2.6.32.11/drivers/usb/co { if (mon_ops) -diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/core/hcd.h ---- linux-2.6.32.11/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/core/hcd.h linux-2.6.32.14/drivers/usb/core/hcd.h +--- linux-2.6.32.14/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -27529,9 +28081,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/co void usb_mon_deregister(void); #else -diff -urNp linux-2.6.32.11/drivers/usb/core/hub.c linux-2.6.32.11/drivers/usb/core/hub.c ---- linux-2.6.32.11/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/core/hub.c linux-2.6.32.14/drivers/usb/core/hub.c +--- linux-2.6.32.14/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400 @@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -27541,9 +28093,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hub.c linux-2.6.32.11/drivers/usb/co }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.32.11/drivers/usb/core/message.c linux-2.6.32.11/drivers/usb/core/message.c ---- linux-2.6.32.11/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/core/message.c linux-2.6.32.14/drivers/usb/core/message.c +--- linux-2.6.32.14/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -27555,9 +28107,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/message.c linux-2.6.32.11/drivers/us if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.11/drivers/usb/host/ehci-pci.c linux-2.6.32.11/drivers/usb/host/ehci-pci.c ---- linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/host/ehci-pci.c linux-2.6.32.14/drivers/usb/host/ehci-pci.c +--- linux-2.6.32.14/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400 @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), .driver_data = (unsigned long) &ehci_pci_hc_driver, @@ -27567,9 +28119,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/host/ehci-pci.c linux-2.6.32.11/drivers/u }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.32.11/drivers/usb/host/uhci-hcd.c linux-2.6.32.11/drivers/usb/host/uhci-hcd.c ---- linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/host/uhci-hcd.c linux-2.6.32.14/drivers/usb/host/uhci-hcd.c +--- linux-2.6.32.14/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -27579,9 +28131,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/host/uhci-hcd.c linux-2.6.32.11/drivers/u }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/misc/appledisplay.c linux-2.6.32.14/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.14/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -27591,9 +28143,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drive .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/usb/mon/mon_main.c linux-2.6.32.11/drivers/usb/mon/mon_main.c ---- linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/mon/mon_main.c linux-2.6.32.14/drivers/usb/mon/mon_main.c +--- linux-2.6.32.14/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -27603,9 +28155,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/mon/mon_main.c linux-2.6.32.11/drivers/us .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.32.11/drivers/usb/storage/debug.h linux-2.6.32.11/drivers/usb/storage/debug.h ---- linux-2.6.32.11/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/storage/debug.h linux-2.6.32.14/drivers/usb/storage/debug.h +--- linux-2.6.32.14/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -27619,9 +28171,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/storage/debug.h linux-2.6.32.11/drivers/u #endif #endif -diff -urNp linux-2.6.32.11/drivers/usb/storage/usb.c linux-2.6.32.11/drivers/usb/storage/usb.c ---- linux-2.6.32.11/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/storage/usb.c linux-2.6.32.14/drivers/usb/storage/usb.c +--- linux-2.6.32.14/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -27631,9 +28183,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/storage/usb.c linux-2.6.32.11/drivers/usb }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.32.11/drivers/usb/storage/usual-tables.c linux-2.6.32.11/drivers/usb/storage/usual-tables.c ---- linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/usb/storage/usual-tables.c linux-2.6.32.14/drivers/usb/storage/usual-tables.c +--- linux-2.6.32.14/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -27643,9 +28195,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/storage/usual-tables.c linux-2.6.32.11/dr }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.32.11/drivers/uwb/wlp/messages.c linux-2.6.32.11/drivers/uwb/wlp/messages.c ---- linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/uwb/wlp/messages.c linux-2.6.32.14/drivers/uwb/wlp/messages.c +--- linux-2.6.32.14/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -27655,9 +28207,9 @@ diff -urNp linux-2.6.32.11/drivers/uwb/wlp/messages.c linux-2.6.32.11/drivers/uw enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.32.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/wlp/sysfs.c ---- linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/uwb/wlp/sysfs.c linux-2.6.32.14/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32.14/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -27668,9 +28220,9 @@ diff -urNp linux-2.6.32.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/w .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/video/atmel_lcdfb.c ---- linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/video/atmel_lcdfb.c linux-2.6.32.14/drivers/video/atmel_lcdfb.c +--- linux-2.6.32.14/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -27680,9 +28232,9 @@ diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/v .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/video/aty/aty128fb.c ---- linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/video/aty/aty128fb.c linux-2.6.32.14/drivers/video/aty/aty128fb.c +--- linux-2.6.32.14/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -27692,9 +28244,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/ .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/video/aty/atyfb_base.c linux-2.6.32.14/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.14/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -27704,9 +28256,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/driver .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/video/aty/radeon_backlight.c linux-2.6.32.14/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.14/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -27716,9 +28268,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/ .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -27728,9 +28280,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/ .update_status = adp5520_bl_update_status, .get_brightness = adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/adx_bl.c linux-2.6.32.14/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.14/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -27740,9 +28292,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/driv .options = 0, .update_status = adx_backlight_update_status, .get_brightness = adx_backlight_get_brightness, -diff -urNp linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -27752,9 +28304,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1 .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/drivers/video/backlight/backlight.c ---- linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/backlight.c linux-2.6.32.14/drivers/video/backlight/backlight.c +--- linux-2.6.32.14/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -27764,9 +28316,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/d { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -27776,9 +28328,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c linux-2.6.32.11/d .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -27788,9 +28340,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/dr .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/da903x_bl.c linux-2.6.32.14/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.14/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -27800,9 +28352,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/d .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/generic_bl.c linux-2.6.32.11/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/generic_bl.c linux-2.6.32.14/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.14/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -27812,9 +28364,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/generic_bl.c linux-2.6.32.11/ .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/hp680_bl.c linux-2.6.32.14/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.14/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -27824,9 +28376,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/dr .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -93,7 +93,7 @@ out: return ret; } @@ -27836,9 +28388,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c linux-2.6.32. .get_brightness = jornada_bl_get_brightness, .update_status = jornada_bl_update_status, .options = BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -27848,9 +28400,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/d .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/locomolcd.c linux-2.6.32.14/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.14/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -27860,9 +28412,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/d .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -27872,9 +28424,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. }; /* Module parameters. */ -diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/omap1_bl.c linux-2.6.32.14/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.14/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -27884,9 +28436,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/dr .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/progear_bl.c linux-2.6.32.14/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.14/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -27896,9 +28448,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/ .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/pwm_bl.c linux-2.6.32.14/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.14/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -27908,9 +28460,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/driv .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/tosa_bl.c linux-2.6.32.14/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.14/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -27920,9 +28472,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/dri .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -27932,9 +28484,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/d .options = BL_CORE_SUSPENDRESUME, .update_status = wm831x_backlight_update_status, .get_brightness = wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/bf54x-lq043fb.c linux-2.6.32.14/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.14/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -27944,9 +28496,9 @@ diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -27956,9 +28508,22 @@ diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/driv .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/fbmem.c ---- linux-2.6.32.11/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/fbcmap.c linux-2.6.32.14/drivers/video/fbcmap.c +--- linux-2.6.32.14/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400 +@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user + rc = -ENODEV; + goto out; + } +- if (cmap->start < 0 || (!info->fbops->fb_setcolreg && +- !info->fbops->fb_setcmap)) { ++ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) { + rc = -EINVAL; + goto out1; + } +diff -urNp linux-2.6.32.14/drivers/video/fbmem.c linux-2.6.32.14/drivers/video/fbmem.c +--- linux-2.6.32.14/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -27986,9 +28551,9 @@ diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/f return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.11/drivers/video/fbmon.c linux-2.6.32.11/drivers/video/fbmon.c ---- linux-2.6.32.11/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/fbmon.c linux-2.6.32.14/drivers/video/fbmon.c +--- linux-2.6.32.14/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -27998,9 +28563,9 @@ diff -urNp linux-2.6.32.11/drivers/video/fbmon.c linux-2.6.32.11/drivers/video/f #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drivers/video/i810/i810_accel.c ---- linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/i810/i810_accel.c linux-2.6.32.14/drivers/video/i810/i810_accel.c +--- linux-2.6.32.14/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -28009,9 +28574,9 @@ diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drive i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.32.11/drivers/video/i810/i810_main.c linux-2.6.32.11/drivers/video/i810/i810_main.c ---- linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400 +diff -urNp linux-2.6.32.14/drivers/video/i810/i810_main.c linux-2.6.32.14/drivers/video/i810/i810_main.c +--- linux-2.6.32.14/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, @@ -28021,9 +28586,9 @@ diff -urNp linux-2.6.32.11/drivers/video/i810/i810_main.c linux-2.6.32.11/driver }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.32.11/drivers/video/modedb.c linux-2.6.32.11/drivers/video/modedb.c ---- linux-2.6.32.11/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/drivers/video/modedb.c linux-2.6.32.14/drivers/video/modedb.c +--- linux-2.6.32.14/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -28324,9 +28889,9 @@ diff -urNp linux-2.6.32.11/drivers/video/modedb.c linux-2.6.32.11/drivers/video/ }, }; -diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -28336,9 +28901,9 @@ diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/d .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/video/riva/fbdev.c ---- linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/drivers/video/riva/fbdev.c linux-2.6.32.14/drivers/video/riva/fbdev.c +--- linux-2.6.32.14/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -28348,9 +28913,9 @@ diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/vi .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.32.11/drivers/video/uvesafb.c linux-2.6.32.11/drivers/video/uvesafb.c ---- linux-2.6.32.11/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/drivers/video/uvesafb.c linux-2.6.32.14/drivers/video/uvesafb.c +--- linux-2.6.32.14/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -28426,9 +28991,9 @@ diff -urNp linux-2.6.32.11/drivers/video/uvesafb.c linux-2.6.32.11/drivers/video } framebuffer_release(info); -diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/vesafb.c ---- linux-2.6.32.11/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/drivers/video/vesafb.c linux-2.6.32.14/drivers/video/vesafb.c +--- linux-2.6.32.14/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400 @@ -9,6 +9,7 @@ */ @@ -28532,9 +29097,9 @@ diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/ if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/xen/sys-hypervisor.c ---- linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/drivers/xen/sys-hypervisor.c linux-2.6.32.14/drivers/xen/sys-hypervisor.c +--- linux-2.6.32.14/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -28544,9 +29109,9 @@ diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/ .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.32.11/fs/9p/vfs_inode.c linux-2.6.32.11/fs/9p/vfs_inode.c ---- linux-2.6.32.11/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/9p/vfs_inode.c linux-2.6.32.14/fs/9p/vfs_inode.c +--- linux-2.6.32.14/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -28556,9 +29121,9 @@ diff -urNp linux-2.6.32.11/fs/9p/vfs_inode.c linux-2.6.32.11/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.32.11/fs/aio.c linux-2.6.32.11/fs/aio.c ---- linux-2.6.32.11/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/aio.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/aio.c linux-2.6.32.14/fs/aio.c +--- linux-2.6.32.14/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/aio.c 2010-05-28 21:27:15.995209124 -0400 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -28568,9 +29133,9 @@ diff -urNp linux-2.6.32.11/fs/aio.c linux-2.6.32.11/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.32.11/fs/attr.c linux-2.6.32.11/fs/attr.c ---- linux-2.6.32.11/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/attr.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/attr.c linux-2.6.32.14/fs/attr.c +--- linux-2.6.32.14/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/attr.c 2010-05-28 21:27:15.995209124 -0400 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -28579,9 +29144,9 @@ diff -urNp linux-2.6.32.11/fs/attr.c linux-2.6.32.11/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.32.11/fs/autofs/root.c linux-2.6.32.11/fs/autofs/root.c ---- linux-2.6.32.11/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/autofs/root.c linux-2.6.32.14/fs/autofs/root.c +--- linux-2.6.32.14/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -28592,9 +29157,9 @@ diff -urNp linux-2.6.32.11/fs/autofs/root.c linux-2.6.32.11/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symlink.c ---- linux-2.6.32.11/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/autofs4/symlink.c linux-2.6.32.14/fs/autofs4/symlink.c +--- linux-2.6.32.14/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -28604,9 +29169,9 @@ diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symli return NULL; } -diff -urNp linux-2.6.32.11/fs/befs/linuxvfs.c linux-2.6.32.11/fs/befs/linuxvfs.c ---- linux-2.6.32.11/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/befs/linuxvfs.c linux-2.6.32.14/fs/befs/linuxvfs.c +--- linux-2.6.32.14/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -28616,9 +29181,9 @@ diff -urNp linux-2.6.32.11/fs/befs/linuxvfs.c linux-2.6.32.11/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.11/fs/binfmt_aout.c linux-2.6.32.11/fs/binfmt_aout.c ---- linux-2.6.32.11/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400 +diff -urNp linux-2.6.32.14/fs/binfmt_aout.c linux-2.6.32.14/fs/binfmt_aout.c +--- linux-2.6.32.14/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -28686,9 +29251,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_aout.c linux-2.6.32.11/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.32.11/fs/binfmt_elf.c linux-2.6.32.11/fs/binfmt_elf.c ---- linux-2.6.32.11/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400 +diff -urNp linux-2.6.32.14/fs/binfmt_elf.c linux-2.6.32.14/fs/binfmt_elf.c +--- linux-2.6.32.14/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -29324,9 +29889,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_elf.c linux-2.6.32.11/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.11/fs/binfmt_flat.c linux-2.6.32.11/fs/binfmt_flat.c ---- linux-2.6.32.11/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/binfmt_flat.c linux-2.6.32.14/fs/binfmt_flat.c +--- linux-2.6.32.14/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -29359,9 +29924,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_flat.c linux-2.6.32.11/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.32.11/fs/binfmt_misc.c linux-2.6.32.11/fs/binfmt_misc.c ---- linux-2.6.32.11/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/binfmt_misc.c linux-2.6.32.14/fs/binfmt_misc.c +--- linux-2.6.32.14/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, @@ -29371,9 +29936,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_misc.c linux-2.6.32.11/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c ---- linux-2.6.32.11/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/bio.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/bio.c linux-2.6.32.14/fs/bio.c +--- linux-2.6.32.14/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/bio.c 2010-05-28 21:27:16.018905555 -0400 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -29392,9 +29957,21 @@ diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.32.11/fs/btrfs/ctree.c linux-2.6.32.11/fs/btrfs/ctree.c ---- linux-2.6.32.11/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/block_dev.c linux-2.6.32.14/fs/block_dev.c +--- linux-2.6.32.14/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 ++++ linux-2.6.32.14/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400 +@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, + else if (bdev->bd_contains == bdev) + res = 0; /* is a whole device which isn't held */ + +- else if (bdev->bd_contains->bd_holder == bd_claim) ++ else if (bdev->bd_contains->bd_holder == (void *)bd_claim) + res = 0; /* is a partition of a device that is being partitioned */ + else if (bdev->bd_contains->bd_holder != NULL) + res = -EBUSY; /* is a partition of a held device */ +diff -urNp linux-2.6.32.14/fs/btrfs/ctree.c linux-2.6.32.14/fs/btrfs/ctree.c +--- linux-2.6.32.14/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400 @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran ret = 0; @@ -29403,9 +29980,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/ctree.c linux-2.6.32.11/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.32.11/fs/btrfs/disk-io.c linux-2.6.32.11/fs/btrfs/disk-io.c ---- linux-2.6.32.11/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/btrfs/disk-io.c linux-2.6.32.14/fs/btrfs/disk-io.c +--- linux-2.6.32.14/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -29424,9 +30001,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/disk-io.c linux-2.6.32.11/fs/btrfs/disk-io.c .write_cache_pages_lock_hook = btree_lock_page_hook, .readpage_end_io_hook = btree_readpage_end_io_hook, .submit_bio_hook = btree_submit_bio_hook, -diff -urNp linux-2.6.32.11/fs/btrfs/extent_io.h linux-2.6.32.11/fs/btrfs/extent_io.h ---- linux-2.6.32.11/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/btrfs/extent_io.h linux-2.6.32.14/fs/btrfs/extent_io.h +--- linux-2.6.32.14/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -29487,9 +30064,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/extent_io.h linux-2.6.32.11/fs/btrfs/extent_ }; struct extent_state { -diff -urNp linux-2.6.32.11/fs/btrfs/free-space-cache.c linux-2.6.32.11/fs/btrfs/free-space-cache.c ---- linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/btrfs/free-space-cache.c linux-2.6.32.14/fs/btrfs/free-space-cache.c +--- linux-2.6.32.14/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { @@ -29508,9 +30085,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/free-space-cache.c linux-2.6.32.11/fs/btrfs/ if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.11/fs/btrfs/inode.c linux-2.6.32.11/fs/btrfs/inode.c ---- linux-2.6.32.11/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/btrfs/inode.c linux-2.6.32.14/fs/btrfs/inode.c +--- linux-2.6.32.14/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400 @@ -63,7 +63,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -29529,9 +30106,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/inode.c linux-2.6.32.11/fs/btrfs/inode.c .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook, -diff -urNp linux-2.6.32.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c ---- linux-2.6.32.11/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/btrfs/sysfs.c linux-2.6.32.14/fs/btrfs/sysfs.c +--- linux-2.6.32.14/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -29547,9 +30124,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.11/fs/buffer.c linux-2.6.32.11/fs/buffer.c ---- linux-2.6.32.11/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/buffer.c linux-2.6.32.14/fs/buffer.c +--- linux-2.6.32.14/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -29558,9 +30135,58 @@ diff -urNp linux-2.6.32.11/fs/buffer.c linux-2.6.32.11/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -diff -urNp linux-2.6.32.11/fs/cachefiles/rdwr.c linux-2.6.32.11/fs/cachefiles/rdwr.c ---- linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400 +diff -urNp linux-2.6.32.14/fs/cachefiles/bind.c linux-2.6.32.14/fs/cachefiles/bind.c +--- linux-2.6.32.14/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400 +@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef + args); + + /* start by checking things over */ +- ASSERT(cache->fstop_percent >= 0 && +- cache->fstop_percent < cache->fcull_percent && ++ ASSERT(cache->fstop_percent < cache->fcull_percent && + cache->fcull_percent < cache->frun_percent && + cache->frun_percent < 100); + +- ASSERT(cache->bstop_percent >= 0 && +- cache->bstop_percent < cache->bcull_percent && ++ ASSERT(cache->bstop_percent < cache->bcull_percent && + cache->bcull_percent < cache->brun_percent && + cache->brun_percent < 100); + +diff -urNp linux-2.6.32.14/fs/cachefiles/daemon.c linux-2.6.32.14/fs/cachefiles/daemon.c +--- linux-2.6.32.14/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400 +@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s + if (test_bit(CACHEFILES_DEAD, &cache->flags)) + return -EIO; + +- if (datalen < 0 || datalen > PAGE_SIZE - 1) ++ if (datalen > PAGE_SIZE - 1) + return -EOPNOTSUPP; + + /* drag the command string into the kernel so we can parse it */ +@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc + if (args[0] != '%' || args[1] != '\0') + return -EINVAL; + +- if (fstop < 0 || fstop >= cache->fcull_percent) ++ if (fstop >= cache->fcull_percent) + return cachefiles_daemon_range_error(cache, args); + + cache->fstop_percent = fstop; +@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc + if (args[0] != '%' || args[1] != '\0') + return -EINVAL; + +- if (bstop < 0 || bstop >= cache->bcull_percent) ++ if (bstop >= cache->bcull_percent) + return cachefiles_daemon_range_error(cache, args); + + cache->bstop_percent = bstop; +diff -urNp linux-2.6.32.14/fs/cachefiles/rdwr.c linux-2.6.32.14/fs/cachefiles/rdwr.c +--- linux-2.6.32.14/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -29570,9 +30196,9 @@ diff -urNp linux-2.6.32.11/fs/cachefiles/rdwr.c linux-2.6.32.11/fs/cachefiles/rd set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.32.11/fs/cifs/cifs_uniupr.h linux-2.6.32.11/fs/cifs/cifs_uniupr.h ---- linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/cifs/cifs_uniupr.h linux-2.6.32.14/fs/cifs/cifs_uniupr.h +--- linux-2.6.32.14/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -29582,9 +30208,9 @@ diff -urNp linux-2.6.32.11/fs/cifs/cifs_uniupr.h linux-2.6.32.11/fs/cifs/cifs_un }; #endif -diff -urNp linux-2.6.32.11/fs/cifs/link.c linux-2.6.32.11/fs/cifs/link.c ---- linux-2.6.32.11/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/cifs/link.c linux-2.6.32.14/fs/cifs/link.c +--- linux-2.6.32.14/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -29594,9 +30220,9 @@ diff -urNp linux-2.6.32.11/fs/cifs/link.c linux-2.6.32.11/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.11/fs/compat_binfmt_elf.c linux-2.6.32.11/fs/compat_binfmt_elf.c ---- linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/compat_binfmt_elf.c linux-2.6.32.14/fs/compat_binfmt_elf.c +--- linux-2.6.32.14/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -29610,9 +30236,9 @@ diff -urNp linux-2.6.32.11/fs/compat_binfmt_elf.c linux-2.6.32.11/fs/compat_binf #define elf_addr_t Elf32_Addr /* -diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c ---- linux-2.6.32.11/fs/compat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/compat.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/compat.c linux-2.6.32.14/fs/compat.c +--- linux-2.6.32.14/fs/compat.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.14/fs/compat.c 2010-05-28 21:27:16.095276039 -0400 @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -29695,9 +30321,9 @@ diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c + fput(old_exec_file); +#endif - current->stack_start = current->mm->start_stack; - -@@ -1543,6 +1585,14 @@ int compat_do_execve(char * filename, + /* execve succeeded */ + current->fs->in_exec = 0; +@@ -1541,6 +1583,14 @@ int compat_do_execve(char * filename, put_files_struct(displaced); return retval; @@ -29712,9 +30338,9 @@ diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c ---- linux-2.6.32.11/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/compat_ioctl.c linux-2.6.32.14/fs/compat_ioctl.c +--- linux-2.6.32.14/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400 @@ -1827,15 +1827,15 @@ struct ioctl_trans { }; @@ -29734,9 +30360,9 @@ diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.32.11/fs/debugfs/inode.c linux-2.6.32.11/fs/debugfs/inode.c ---- linux-2.6.32.11/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/debugfs/inode.c linux-2.6.32.14/fs/debugfs/inode.c +--- linux-2.6.32.14/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -29746,9 +30372,9 @@ diff -urNp linux-2.6.32.11/fs/debugfs/inode.c linux-2.6.32.11/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c ---- linux-2.6.32.11/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/dlm/lockspace.c linux-2.6.32.14/fs/dlm/lockspace.c +--- linux-2.6.32.14/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -29758,10 +30384,10 @@ diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode.c ---- linux-2.6.32.11/fs/ecryptfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ecryptfs/inode.c 2010-04-04 20:46:41.645781188 -0400 -@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, +diff -urNp linux-2.6.32.14/fs/ecryptfs/inode.c linux-2.6.32.14/fs/ecryptfs/inode.c +--- linux-2.6.32.14/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 ++++ linux-2.6.32.14/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400 +@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); rc = lower_dentry->d_inode->i_op->readlink(lower_dentry, @@ -29769,8 +30395,8 @@ diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode + (__force char __user *)lower_buf, lower_bufsiz); set_fs(old_fs); - if (rc >= 0) { -@@ -720,7 +720,7 @@ static void *ecryptfs_follow_link(struct + if (rc < 0) +@@ -701,7 +701,7 @@ static void *ecryptfs_follow_link(struct } old_fs = get_fs(); set_fs(get_ds()); @@ -29779,9 +30405,9 @@ diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c ---- linux-2.6.32.11/fs/exec.c 2010-04-04 20:41:50.037938751 -0400 -+++ linux-2.6.32.11/fs/exec.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/exec.c linux-2.6.32.14/fs/exec.c +--- linux-2.6.32.14/fs/exec.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.14/fs/exec.c 2010-05-28 21:27:16.119217721 -0400 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> @@ -30039,9 +30665,9 @@ diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c + fput(old_exec_file); +#endif - current->stack_start = current->mm->start_stack; - -@@ -1390,6 +1471,14 @@ int do_execve(char * filename, + /* execve succeeded */ + current->fs->in_exec = 0; +@@ -1388,6 +1469,14 @@ int do_execve(char * filename, put_files_struct(displaced); return retval; @@ -30056,7 +30682,7 @@ diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c out: if (bprm->mm) mmput (bprm->mm); -@@ -1553,6 +1642,169 @@ out: +@@ -1551,6 +1640,169 @@ out: return ispipe; } @@ -30226,7 +30852,7 @@ diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c static int zap_process(struct task_struct *start) { struct task_struct *t; -@@ -1755,17 +2007,17 @@ static void wait_for_dump_helpers(struct +@@ -1753,17 +2005,17 @@ static void wait_for_dump_helpers(struct pipe = file->f_path.dentry->d_inode->i_pipe; pipe_lock(pipe); @@ -30249,7 +30875,7 @@ diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c pipe_unlock(pipe); } -@@ -1836,6 +2088,10 @@ void do_coredump(long signr, int exit_co +@@ -1834,6 +2086,10 @@ void do_coredump(long signr, int exit_co */ clear_thread_flag(TIF_SIGPENDING); @@ -30260,9 +30886,9 @@ diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.32.11/fs/ext2/balloc.c linux-2.6.32.11/fs/ext2/balloc.c ---- linux-2.6.32.11/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/ext2/balloc.c linux-2.6.32.14/fs/ext2/balloc.c +--- linux-2.6.32.14/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -30272,9 +30898,23 @@ diff -urNp linux-2.6.32.11/fs/ext2/balloc.c linux-2.6.32.11/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.11/fs/ext3/balloc.c linux-2.6.32.11/fs/ext3/balloc.c ---- linux-2.6.32.11/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400 +diff -urNp linux-2.6.32.14/fs/ext2/xattr.c linux-2.6.32.14/fs/ext2/xattr.c +--- linux-2.6.32.14/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400 +@@ -85,8 +85,8 @@ + printk("\n"); \ + } while (0) + #else +-# define ea_idebug(f...) +-# define ea_bdebug(f...) ++# define ea_idebug(inode, f...) do {} while (0) ++# define ea_bdebug(bh, f...) do {} while (0) + #endif + + static int ext2_xattr_set2(struct inode *, struct buffer_head *, +diff -urNp linux-2.6.32.14/fs/ext3/balloc.c linux-2.6.32.14/fs/ext3/balloc.c +--- linux-2.6.32.14/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -30284,9 +30924,9 @@ diff -urNp linux-2.6.32.11/fs/ext3/balloc.c linux-2.6.32.11/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.11/fs/ext3/namei.c linux-2.6.32.11/fs/ext3/namei.c ---- linux-2.6.32.11/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext3/namei.c linux-2.6.32.14/fs/ext3/namei.c +--- linux-2.6.32.14/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -30296,9 +30936,9 @@ diff -urNp linux-2.6.32.11/fs/ext3/namei.c linux-2.6.32.11/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.11/fs/ext3/xattr.c linux-2.6.32.11/fs/ext3/xattr.c ---- linux-2.6.32.11/fs/ext3/xattr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext3/xattr.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext3/xattr.c linux-2.6.32.14/fs/ext3/xattr.c +--- linux-2.6.32.14/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 ++++ linux-2.6.32.14/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -30310,9 +30950,9 @@ diff -urNp linux-2.6.32.11/fs/ext3/xattr.c linux-2.6.32.11/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.11/fs/ext4/balloc.c linux-2.6.32.11/fs/ext4/balloc.c ---- linux-2.6.32.11/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext4/balloc.c linux-2.6.32.14/fs/ext4/balloc.c +--- linux-2.6.32.14/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400 @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -30322,9 +30962,9 @@ diff -urNp linux-2.6.32.11/fs/ext4/balloc.c linux-2.6.32.11/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.11/fs/ext4/ioctl.c linux-2.6.32.11/fs/ext4/ioctl.c ---- linux-2.6.32.11/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext4/ioctl.c linux-2.6.32.14/fs/ext4/ioctl.c +--- linux-2.6.32.14/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400 @@ -221,6 +221,9 @@ setversion_out: struct file *donor_filp; int err; @@ -30335,9 +30975,9 @@ diff -urNp linux-2.6.32.11/fs/ext4/ioctl.c linux-2.6.32.11/fs/ext4/ioctl.c if (!(filp->f_mode & FMODE_READ) || !(filp->f_mode & FMODE_WRITE)) return -EBADF; -diff -urNp linux-2.6.32.11/fs/ext4/namei.c linux-2.6.32.11/fs/ext4/namei.c ---- linux-2.6.32.11/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext4/namei.c linux-2.6.32.14/fs/ext4/namei.c +--- linux-2.6.32.14/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -30347,9 +30987,9 @@ diff -urNp linux-2.6.32.11/fs/ext4/namei.c linux-2.6.32.11/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c ---- linux-2.6.32.11/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext4/super.c linux-2.6.32.14/fs/ext4/super.c +--- linux-2.6.32.14/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400 @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje } @@ -30359,9 +30999,23 @@ diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.32.11/fs/fcntl.c linux-2.6.32.11/fs/fcntl.c ---- linux-2.6.32.11/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/ext4/xattr.c linux-2.6.32.14/fs/ext4/xattr.c +--- linux-2.6.32.14/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400 +@@ -82,8 +82,8 @@ + printk("\n"); \ + } while (0) + #else +-# define ea_idebug(f...) +-# define ea_bdebug(f...) ++# define ea_idebug(inode, f...) do {} while (0) ++# define ea_bdebug(bh, f...) do {} while (0) + #endif + + static void ext4_xattr_cache_insert(struct buffer_head *); +diff -urNp linux-2.6.32.14/fs/fcntl.c linux-2.6.32.14/fs/fcntl.c +--- linux-2.6.32.14/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400 @@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: @@ -30380,9 +31034,9 @@ diff -urNp linux-2.6.32.11/fs/fcntl.c linux-2.6.32.11/fs/fcntl.c rcu_read_unlock(); return ret; } -diff -urNp linux-2.6.32.11/fs/fifo.c linux-2.6.32.11/fs/fifo.c ---- linux-2.6.32.11/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fifo.c linux-2.6.32.14/fs/fifo.c +--- linux-2.6.32.14/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -30453,9 +31107,9 @@ diff -urNp linux-2.6.32.11/fs/fifo.c linux-2.6.32.11/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.32.11/fs/file.c linux-2.6.32.11/fs/file.c ---- linux-2.6.32.11/fs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/file.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/file.c linux-2.6.32.14/fs/file.c +--- linux-2.6.32.14/fs/file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/file.c 2010-05-28 21:27:16.158915754 -0400 @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -30473,9 +31127,9 @@ diff -urNp linux-2.6.32.11/fs/file.c linux-2.6.32.11/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.32.11/fs/fs_struct.c linux-2.6.32.11/fs/fs_struct.c ---- linux-2.6.32.11/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fs_struct.c linux-2.6.32.14/fs/fs_struct.c +--- linux-2.6.32.14/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400 @@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo struct task_struct *g, *p; struct fs_struct *fs; @@ -30580,9 +31234,9 @@ diff -urNp linux-2.6.32.11/fs/fs_struct.c linux-2.6.32.11/fs/fs_struct.c task_unlock(current); if (kill) -diff -urNp linux-2.6.32.11/fs/fuse/control.c linux-2.6.32.11/fs/fuse/control.c ---- linux-2.6.32.11/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fuse/control.c linux-2.6.32.14/fs/fuse/control.c +--- linux-2.6.32.14/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -30592,9 +31246,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/control.c linux-2.6.32.11/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/fs/fuse/cuse.c ---- linux-2.6.32.11/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fuse/cuse.c linux-2.6.32.14/fs/fuse/cuse.c +--- linux-2.6.32.14/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -30629,9 +31283,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.32.11/fs/fuse/dev.c linux-2.6.32.11/fs/fuse/dev.c ---- linux-2.6.32.11/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fuse/dev.c linux-2.6.32.14/fs/fuse/dev.c +--- linux-2.6.32.14/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * the 'sent' flag. @@ -30737,9 +31391,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/dev.c linux-2.6.32.11/fs/fuse/dev.c const struct file_operations fuse_dev_operations = { .owner = THIS_MODULE, -diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c ---- linux-2.6.32.11/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fuse/dir.c linux-2.6.32.14/fs/fuse/dir.c +--- linux-2.6.32.14/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -30749,9 +31403,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.11/fs/fuse/fuse_i.h linux-2.6.32.11/fs/fuse/fuse_i.h ---- linux-2.6.32.11/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/fuse/fuse_i.h linux-2.6.32.14/fs/fuse/fuse_i.h +--- linux-2.6.32.14/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400 @@ -521,6 +521,16 @@ extern const struct file_operations fuse extern const struct dentry_operations fuse_dentry_operations; @@ -30769,9 +31423,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/fuse_i.h linux-2.6.32.11/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c ---- linux-2.6.32.11/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400 +diff -urNp linux-2.6.32.14/fs/gfs2/sys.c linux-2.6.32.14/fs/gfs2/sys.c +--- linux-2.6.32.14/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -30790,9 +31444,9 @@ diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.32.11/fs/hfs/inode.c linux-2.6.32.11/fs/hfs/inode.c ---- linux-2.6.32.11/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/hfs/inode.c linux-2.6.32.14/fs/hfs/inode.c +--- linux-2.6.32.14/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -30811,9 +31465,9 @@ diff -urNp linux-2.6.32.11/fs/hfs/inode.c linux-2.6.32.11/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c ---- linux-2.6.32.11/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/hfsplus/inode.c linux-2.6.32.14/fs/hfsplus/inode.c +--- linux-2.6.32.14/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -30850,9 +31504,9 @@ diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.32.11/fs/hugetlbfs/inode.c linux-2.6.32.11/fs/hugetlbfs/inode.c ---- linux-2.6.32.11/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/hugetlbfs/inode.c 2010-04-06 22:13:08.677504702 -0400 +diff -urNp linux-2.6.32.14/fs/hugetlbfs/inode.c linux-2.6.32.14/fs/hugetlbfs/inode.c +--- linux-2.6.32.14/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -30862,9 +31516,9 @@ diff -urNp linux-2.6.32.11/fs/hugetlbfs/inode.c linux-2.6.32.11/fs/hugetlbfs/ino static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c ---- linux-2.6.32.11/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/ioctl.c linux-2.6.32.14/fs/ioctl.c +--- linux-2.6.32.14/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -30892,9 +31546,9 @@ diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.32.11/fs/jffs2/debug.h linux-2.6.32.11/fs/jffs2/debug.h ---- linux-2.6.32.11/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/jffs2/debug.h linux-2.6.32.14/fs/jffs2/debug.h +--- linux-2.6.32.14/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -30996,9 +31650,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/debug.h linux-2.6.32.11/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.32.11/fs/jffs2/erase.c linux-2.6.32.11/fs/jffs2/erase.c ---- linux-2.6.32.11/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/jffs2/erase.c linux-2.6.32.14/fs/jffs2/erase.c +--- linux-2.6.32.14/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -31009,9 +31663,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/erase.c linux-2.6.32.11/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.11/fs/jffs2/summary.h linux-2.6.32.11/fs/jffs2/summary.h ---- linux-2.6.32.11/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/jffs2/summary.h linux-2.6.32.14/fs/jffs2/summary.h +--- linux-2.6.32.14/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -31040,9 +31694,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/summary.h linux-2.6.32.11/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.32.11/fs/jffs2/wbuf.c linux-2.6.32.11/fs/jffs2/wbuf.c ---- linux-2.6.32.11/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/jffs2/wbuf.c linux-2.6.32.14/fs/jffs2/wbuf.c +--- linux-2.6.32.14/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -31053,9 +31707,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/wbuf.c linux-2.6.32.11/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.32.11/fs/lockd/svc.c linux-2.6.32.11/fs/lockd/svc.c ---- linux-2.6.32.11/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/lockd/svc.c linux-2.6.32.14/fs/lockd/svc.c +--- linux-2.6.32.14/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -31065,9 +31719,9 @@ diff -urNp linux-2.6.32.11/fs/lockd/svc.c linux-2.6.32.11/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c ---- linux-2.6.32.11/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/locks.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/locks.c linux-2.6.32.14/fs/locks.c +--- linux-2.6.32.14/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/locks.c 2010-05-28 21:27:16.191151426 -0400 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -31089,9 +31743,9 @@ diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.32.11/fs/namei.c linux-2.6.32.11/fs/namei.c ---- linux-2.6.32.11/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/namei.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/namei.c linux-2.6.32.14/fs/namei.c +--- linux-2.6.32.14/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/namei.c 2010-05-28 21:27:16.199231859 -0400 @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); @@ -31418,9 +32072,9 @@ diff -urNp linux-2.6.32.11/fs/namei.c linux-2.6.32.11/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.32.11/fs/namespace.c linux-2.6.32.11/fs/namespace.c ---- linux-2.6.32.11/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/namespace.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/namespace.c linux-2.6.32.14/fs/namespace.c +--- linux-2.6.32.14/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -31481,9 +32135,9 @@ diff -urNp linux-2.6.32.11/fs/namespace.c linux-2.6.32.11/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c ---- linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 -+++ linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/nfs/inode.c linux-2.6.32.14/fs/nfs/inode.c +--- linux-2.6.32.14/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 ++++ linux-2.6.32.14/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -31504,9 +32158,9 @@ diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c ---- linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/nfs/nfs4proc.c linux-2.6.32.14/fs/nfs/nfs4proc.c +--- linux-2.6.32.14/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 ++++ linux-2.6.32.14/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -31525,7 +32179,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c struct nfs_server *server = NFS_SERVER(state->inode); int err; do { -@@ -1491,7 +1491,7 @@ static int _nfs4_open_expired(struct nfs +@@ -1493,7 +1493,7 @@ static int _nfs4_open_expired(struct nfs static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -31534,7 +32188,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { -@@ -1591,7 +1591,7 @@ out_err: +@@ -1593,7 +1593,7 @@ out_err: static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) { @@ -31543,7 +32197,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c struct nfs4_state *res; int status; -@@ -1682,7 +1682,7 @@ static int nfs4_do_setattr(struct inode +@@ -1684,7 +1684,7 @@ static int nfs4_do_setattr(struct inode struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(inode); @@ -31552,7 +32206,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2048,7 +2048,7 @@ static int _nfs4_server_capabilities(str +@@ -2050,7 +2050,7 @@ static int _nfs4_server_capabilities(str int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) { @@ -31561,7 +32215,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2082,7 +2082,7 @@ static int _nfs4_lookup_root(struct nfs_ +@@ -2084,7 +2084,7 @@ static int _nfs4_lookup_root(struct nfs_ static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *info) { @@ -31570,7 +32224,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2171,7 +2171,7 @@ static int _nfs4_proc_getattr(struct nfs +@@ -2173,7 +2173,7 @@ static int _nfs4_proc_getattr(struct nfs static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -31579,7 +32233,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2259,7 +2259,7 @@ static int nfs4_proc_lookupfh(struct nfs +@@ -2261,7 +2261,7 @@ static int nfs4_proc_lookupfh(struct nfs struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -31588,7 +32242,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); -@@ -2288,7 +2288,7 @@ static int _nfs4_proc_lookup(struct inod +@@ -2290,7 +2290,7 @@ static int _nfs4_proc_lookup(struct inod static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -31597,7 +32251,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2352,7 +2352,7 @@ static int _nfs4_proc_access(struct inod +@@ -2354,7 +2354,7 @@ static int _nfs4_proc_access(struct inod static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) { @@ -31606,7 +32260,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2408,7 +2408,7 @@ static int _nfs4_proc_readlink(struct in +@@ -2410,7 +2410,7 @@ static int _nfs4_proc_readlink(struct in static int nfs4_proc_readlink(struct inode *inode, struct page *page, unsigned int pgbase, unsigned int pglen) { @@ -31615,7 +32269,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2506,7 +2506,7 @@ static int _nfs4_proc_remove(struct inod +@@ -2508,7 +2508,7 @@ static int _nfs4_proc_remove(struct inod static int nfs4_proc_remove(struct inode *dir, struct qstr *name) { @@ -31624,7 +32278,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2580,7 +2580,7 @@ static int _nfs4_proc_rename(struct inod +@@ -2582,7 +2582,7 @@ static int _nfs4_proc_rename(struct inod static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, struct inode *new_dir, struct qstr *new_name) { @@ -31633,7 +32287,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(old_dir), -@@ -2627,7 +2627,7 @@ static int _nfs4_proc_link(struct inode +@@ -2629,7 +2629,7 @@ static int _nfs4_proc_link(struct inode static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) { @@ -31642,7 +32296,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2719,7 +2719,7 @@ out: +@@ -2721,7 +2721,7 @@ out: static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, unsigned int len, struct iattr *sattr) { @@ -31651,7 +32305,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2750,7 +2750,7 @@ out: +@@ -2752,7 +2752,7 @@ out: static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) { @@ -31660,7 +32314,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2799,7 +2799,7 @@ static int _nfs4_proc_readdir(struct den +@@ -2801,7 +2801,7 @@ static int _nfs4_proc_readdir(struct den static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, u64 cookie, struct page *page, unsigned int count, int plus) { @@ -31669,7 +32323,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), -@@ -2847,7 +2847,7 @@ out: +@@ -2849,7 +2849,7 @@ out: static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, dev_t rdev) { @@ -31678,7 +32332,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2879,7 +2879,7 @@ static int _nfs4_proc_statfs(struct nfs_ +@@ -2881,7 +2881,7 @@ static int _nfs4_proc_statfs(struct nfs_ static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) { @@ -31687,7 +32341,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2910,7 +2910,7 @@ static int _nfs4_do_fsinfo(struct nfs_se +@@ -2912,7 +2912,7 @@ static int _nfs4_do_fsinfo(struct nfs_se static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) { @@ -31696,7 +32350,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { -@@ -2956,7 +2956,7 @@ static int _nfs4_proc_pathconf(struct nf +@@ -2958,7 +2958,7 @@ static int _nfs4_proc_pathconf(struct nf static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_pathconf *pathconf) { @@ -31705,7 +32359,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { -@@ -3255,7 +3255,7 @@ out_free: +@@ -3257,7 +3257,7 @@ out_free: static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) { @@ -31714,7 +32368,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c ssize_t ret; do { ret = __nfs4_get_acl_uncached(inode, buf, buflen); -@@ -3311,7 +3311,7 @@ static int __nfs4_proc_set_acl(struct in +@@ -3313,7 +3313,7 @@ static int __nfs4_proc_set_acl(struct in static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) { @@ -31723,7 +32377,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -3576,7 +3576,7 @@ out: +@@ -3578,7 +3578,7 @@ out: int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) { struct nfs_server *server = NFS_SERVER(inode); @@ -31732,7 +32386,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); -@@ -3649,7 +3649,7 @@ out: +@@ -3651,7 +3651,7 @@ out: static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -31741,7 +32395,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { -@@ -4042,7 +4042,7 @@ static int _nfs4_do_setlk(struct nfs4_st +@@ -4044,7 +4044,7 @@ static int _nfs4_do_setlk(struct nfs4_st static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -31750,7 +32404,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { -@@ -4060,7 +4060,7 @@ static int nfs4_lock_reclaim(struct nfs4 +@@ -4062,7 +4062,7 @@ static int nfs4_lock_reclaim(struct nfs4 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -31759,7 +32413,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, request); -@@ -4118,7 +4118,7 @@ out: +@@ -4120,7 +4120,7 @@ out: static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -31768,7 +32422,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; do { -@@ -4178,7 +4178,7 @@ nfs4_proc_lock(struct file *filp, int cm +@@ -4180,7 +4180,7 @@ nfs4_proc_lock(struct file *filp, int cm int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -31777,9 +32431,9 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c ---- linux-2.6.32.11/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400 +diff -urNp linux-2.6.32.14/fs/nfsd/lockd.c linux-2.6.32.14/fs/nfsd/lockd.c +--- linux-2.6.32.14/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -31789,9 +32443,9 @@ diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.11/fs/nfsd/vfs.c linux-2.6.32.11/fs/nfsd/vfs.c ---- linux-2.6.32.11/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/nfsd/vfs.c linux-2.6.32.14/fs/nfsd/vfs.c +--- linux-2.6.32.14/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -31819,9 +32473,9 @@ diff -urNp linux-2.6.32.11/fs/nfsd/vfs.c linux-2.6.32.11/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.32.11/fs/nls/nls_base.c linux-2.6.32.11/fs/nls/nls_base.c ---- linux-2.6.32.11/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/nls/nls_base.c linux-2.6.32.14/fs/nls/nls_base.c +--- linux-2.6.32.14/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, @@ -31831,9 +32485,9 @@ diff -urNp linux-2.6.32.11/fs/nls/nls_base.c linux-2.6.32.11/fs/nls/nls_base.c }; #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/fs/ntfs/file.c ---- linux-2.6.32.11/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/ntfs/file.c linux-2.6.32.14/fs/ntfs/file.c +--- linux-2.6.32.14/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -31843,9 +32497,9 @@ diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.32.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/cluster/masklog.c ---- linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/ocfs2/cluster/masklog.c linux-2.6.32.14/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32.14/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -31855,9 +32509,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/c .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/localalloc.c ---- linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/ocfs2/localalloc.c linux-2.6.32.14/fs/ocfs2/localalloc.c +--- linux-2.6.32.14/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -31867,9 +32521,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/locala status = 0; bail: -diff -urNp linux-2.6.32.11/fs/ocfs2/ocfs2.h linux-2.6.32.11/fs/ocfs2/ocfs2.h ---- linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/ocfs2/ocfs2.h linux-2.6.32.14/fs/ocfs2/ocfs2.h +--- linux-2.6.32.14/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400 @@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -31887,10 +32541,10 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/ocfs2.h linux-2.6.32.11/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc.c ---- linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-04-04 20:46:41.657782339 -0400 -@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s +diff -urNp linux-2.6.32.14/fs/ocfs2/suballoc.c linux-2.6.32.14/fs/ocfs2/suballoc.c +--- linux-2.6.32.14/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 ++++ linux-2.6.32.14/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400 +@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; } @@ -31899,7 +32553,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc /* You should never ask for this much metadata */ BUG_ON(bits_wanted > -@@ -1651,7 +1651,7 @@ int ocfs2_claim_metadata(struct ocfs2_su +@@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_su mlog_errno(status); goto bail; } @@ -31908,7 +32562,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc *blkno_start = bg_blkno + (u64) *suballoc_bit_start; ac->ac_bits_given += (*num_bits); -@@ -1725,7 +1725,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s +@@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s mlog_errno(status); goto bail; } @@ -31917,7 +32571,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc BUG_ON(num_bits != 1); -@@ -1827,7 +1827,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ +@@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ cluster_start, num_clusters); if (!status) @@ -31926,7 +32580,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc } else { if (min_clusters > (osb->bitmap_cpg - 1)) { /* The only paths asking for contiguousness -@@ -1855,7 +1855,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ +@@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode, bg_blkno, bg_bit_off); @@ -31935,9 +32589,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc } } if (status < 0) { -diff -urNp linux-2.6.32.11/fs/ocfs2/super.c linux-2.6.32.11/fs/ocfs2/super.c ---- linux-2.6.32.11/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/ocfs2/super.c linux-2.6.32.14/fs/ocfs2/super.c +--- linux-2.6.32.14/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -31972,9 +32626,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/super.c linux-2.6.32.11/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c ---- linux-2.6.32.11/fs/open.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/open.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/open.c linux-2.6.32.14/fs/open.c +--- linux-2.6.32.14/fs/open.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/open.c 2010-05-28 21:27:16.247317121 -0400 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -32148,9 +32802,9 @@ diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.32.11/fs/pipe.c linux-2.6.32.11/fs/pipe.c ---- linux-2.6.32.11/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400 +diff -urNp linux-2.6.32.14/fs/pipe.c linux-2.6.32.14/fs/pipe.c +--- linux-2.6.32.14/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -32274,12 +32928,12 @@ diff -urNp linux-2.6.32.11/fs/pipe.c linux-2.6.32.11/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c ---- linux-2.6.32.11/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400 -@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct +diff -urNp linux-2.6.32.14/fs/proc/array.c linux-2.6.32.14/fs/proc/array.c +--- linux-2.6.32.14/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.14/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400 +@@ -321,6 +321,21 @@ static inline void task_context_switch_c + p->nivcsw); } - #endif /* CONFIG_MMU */ +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) +static inline void task_pax(struct seq_file *m, struct task_struct *p) @@ -32299,10 +32953,10 @@ diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -430,9 +445,20 @@ int proc_pid_status(struct seq_file *m, +@@ -340,9 +355,20 @@ int proc_pid_status(struct seq_file *m, + task_show_regs(m, task); #endif task_context_switch_counts(m, task); - task_show_stack_usage(m, task); + +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) + task_pax(m, task); @@ -32320,7 +32974,7 @@ diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task, int whole) { -@@ -529,6 +555,19 @@ static int do_task_stat(struct seq_file +@@ -439,6 +465,19 @@ static int do_task_stat(struct seq_file gtime = task_gtime(task); } @@ -32340,23 +32994,23 @@ diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c /* scale priority and nice values from timeslices to -20..20 */ /* to make it look like a "normal" Unix priority/nice value */ priority = task_prio(task); -@@ -569,9 +608,15 @@ static int do_task_stat(struct seq_file +@@ -479,9 +518,15 @@ static int do_task_stat(struct seq_file vsize, mm ? get_mm_rss(mm) : 0, rsslim, +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0), + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0), -+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? task->stack_start : 0), ++ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0), +#else mm ? mm->start_code : 0, mm ? mm->end_code : 0, - (permitted && mm) ? task->stack_start : 0, + (permitted && mm) ? mm->start_stack : 0, +#endif esp, eip, /* The signal information here is obsolete. -@@ -624,3 +669,10 @@ int proc_pid_statm(struct seq_file *m, s +@@ -534,3 +579,10 @@ int proc_pid_statm(struct seq_file *m, s return 0; } @@ -32367,9 +33021,9 @@ diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); +} +#endif -diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c ---- linux-2.6.32.11/fs/proc/base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/base.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/base.c linux-2.6.32.14/fs/proc/base.c +--- linux-2.6.32.14/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 ++++ linux-2.6.32.14/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -32449,7 +33103,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c #define MAX_STACK_TRACE_DEPTH 64 -@@ -521,7 +557,7 @@ static int proc_pid_limits(struct task_s +@@ -522,7 +558,7 @@ static int proc_pid_limits(struct task_s return count; } @@ -32458,7 +33112,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c static int proc_pid_syscall(struct task_struct *task, char *buffer) { long nr; -@@ -935,6 +971,9 @@ static ssize_t environ_read(struct file +@@ -936,6 +972,9 @@ static ssize_t environ_read(struct file if (!task) goto out_no_task; @@ -32468,7 +33122,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c if (!ptrace_may_access(task, PTRACE_MODE_READ)) goto out; -@@ -1455,7 +1494,11 @@ static struct inode *proc_pid_make_inode +@@ -1456,7 +1495,11 @@ static struct inode *proc_pid_make_inode rcu_read_lock(); cred = __task_cred(task); inode->i_uid = cred->euid; @@ -32480,7 +33134,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c rcu_read_unlock(); } security_task_to_inode(task, inode); -@@ -1473,6 +1516,9 @@ static int pid_getattr(struct vfsmount * +@@ -1474,6 +1517,9 @@ static int pid_getattr(struct vfsmount * struct inode *inode = dentry->d_inode; struct task_struct *task; const struct cred *cred; @@ -32490,7 +33144,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c generic_fillattr(inode, stat); -@@ -1480,12 +1526,34 @@ static int pid_getattr(struct vfsmount * +@@ -1481,12 +1527,34 @@ static int pid_getattr(struct vfsmount * stat->uid = 0; stat->gid = 0; task = pid_task(proc_pid(inode), PIDTYPE_PID); @@ -32526,7 +33180,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c } } rcu_read_unlock(); -@@ -1517,11 +1585,20 @@ static int pid_revalidate(struct dentry +@@ -1518,11 +1586,20 @@ static int pid_revalidate(struct dentry if (task) { if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -32547,7 +33201,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid = 0; -@@ -1642,7 +1719,8 @@ static int proc_fd_info(struct inode *in +@@ -1643,7 +1720,8 @@ static int proc_fd_info(struct inode *in int fd = proc_fd(inode); if (task) { @@ -32557,7 +33211,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -1894,12 +1972,22 @@ static const struct file_operations proc +@@ -1895,12 +1973,22 @@ static const struct file_operations proc static int proc_fd_permission(struct inode *inode, int mask) { int rv; @@ -32582,7 +33236,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c return rv; } -@@ -2008,6 +2096,9 @@ static struct dentry *proc_pident_lookup +@@ -2009,6 +2097,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -32592,7 +33246,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. -@@ -2052,6 +2143,9 @@ static int proc_pident_readdir(struct fi +@@ -2053,6 +2144,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; @@ -32602,7 +33256,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2319,7 +2413,7 @@ static void *proc_self_follow_link(struc +@@ -2320,7 +2414,7 @@ static void *proc_self_follow_link(struc static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -32611,7 +33265,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2432,6 +2526,9 @@ static struct dentry *proc_base_lookup(s +@@ -2433,6 +2527,9 @@ static struct dentry *proc_base_lookup(s if (p > last) goto out; @@ -32621,7 +33275,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c error = proc_base_instantiate(dir, dentry, task, p); out: -@@ -2518,7 +2615,7 @@ static const struct pid_entry tgid_base_ +@@ -2519,7 +2616,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -32630,7 +33284,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2546,7 +2643,7 @@ static const struct pid_entry tgid_base_ +@@ -2547,7 +2644,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #endif @@ -32639,7 +33293,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2576,6 +2673,9 @@ static const struct pid_entry tgid_base_ +@@ -2577,6 +2674,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -32649,7 +33303,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2700,7 +2800,14 @@ static struct dentry *proc_pid_instantia +@@ -2701,7 +2801,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -32664,7 +33318,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2742,7 +2849,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -2743,7 +2850,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; @@ -32676,7 +33330,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2807,6 +2918,11 @@ int proc_pid_readdir(struct file * filp, +@@ -2808,6 +2919,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); @@ -32688,7 +33342,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -2825,8 +2941,27 @@ int proc_pid_readdir(struct file * filp, +@@ -2826,8 +2942,27 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -32717,7 +33371,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -2852,7 +2987,7 @@ static const struct pid_entry tid_base_s +@@ -2853,7 +2988,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -32726,7 +33380,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2879,7 +3014,7 @@ static const struct pid_entry tid_base_s +@@ -2880,7 +3015,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #endif @@ -32735,9 +33389,9 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.11/fs/proc/cmdline.c linux-2.6.32.11/fs/proc/cmdline.c ---- linux-2.6.32.11/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/cmdline.c linux-2.6.32.14/fs/proc/cmdline.c +--- linux-2.6.32.14/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -32750,9 +33404,9 @@ diff -urNp linux-2.6.32.11/fs/proc/cmdline.c linux-2.6.32.11/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.11/fs/proc/devices.c linux-2.6.32.11/fs/proc/devices.c ---- linux-2.6.32.11/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/devices.c linux-2.6.32.14/fs/proc/devices.c +--- linux-2.6.32.14/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -32765,9 +33419,9 @@ diff -urNp linux-2.6.32.11/fs/proc/devices.c linux-2.6.32.11/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.11/fs/proc/inode.c linux-2.6.32.11/fs/proc/inode.c ---- linux-2.6.32.11/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/inode.c linux-2.6.32.14/fs/proc/inode.c +--- linux-2.6.32.14/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -32780,9 +33434,9 @@ diff -urNp linux-2.6.32.11/fs/proc/inode.c linux-2.6.32.11/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.32.11/fs/proc/internal.h linux-2.6.32.11/fs/proc/internal.h ---- linux-2.6.32.11/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/internal.h linux-2.6.32.14/fs/proc/internal.h +--- linux-2.6.32.14/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -32793,9 +33447,9 @@ diff -urNp linux-2.6.32.11/fs/proc/internal.h linux-2.6.32.11/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.32.11/fs/proc/Kconfig linux-2.6.32.11/fs/proc/Kconfig ---- linux-2.6.32.11/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/Kconfig linux-2.6.32.14/fs/proc/Kconfig +--- linux-2.6.32.14/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -32823,9 +33477,9 @@ diff -urNp linux-2.6.32.11/fs/proc/Kconfig linux-2.6.32.11/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.32.11/fs/proc/kcore.c linux-2.6.32.11/fs/proc/kcore.c ---- linux-2.6.32.11/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/kcore.c linux-2.6.32.14/fs/proc/kcore.c +--- linux-2.6.32.14/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400 @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use static int open_kcore(struct inode *inode, struct file *filp) @@ -32836,9 +33490,9 @@ diff -urNp linux-2.6.32.11/fs/proc/kcore.c linux-2.6.32.11/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.11/fs/proc/meminfo.c linux-2.6.32.11/fs/proc/meminfo.c ---- linux-2.6.32.11/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/meminfo.c linux-2.6.32.14/fs/proc/meminfo.c +--- linux-2.6.32.14/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -32848,9 +33502,9 @@ diff -urNp linux-2.6.32.11/fs/proc/meminfo.c linux-2.6.32.11/fs/proc/meminfo.c #endif ); -diff -urNp linux-2.6.32.11/fs/proc/nommu.c linux-2.6.32.11/fs/proc/nommu.c ---- linux-2.6.32.11/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/nommu.c linux-2.6.32.14/fs/proc/nommu.c +--- linux-2.6.32.14/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -32860,9 +33514,9 @@ diff -urNp linux-2.6.32.11/fs/proc/nommu.c linux-2.6.32.11/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.11/fs/proc/proc_net.c linux-2.6.32.11/fs/proc/proc_net.c ---- linux-2.6.32.11/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/proc_net.c linux-2.6.32.14/fs/proc/proc_net.c +--- linux-2.6.32.14/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -32881,9 +33535,9 @@ diff -urNp linux-2.6.32.11/fs/proc/proc_net.c linux-2.6.32.11/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.11/fs/proc/proc_sysctl.c linux-2.6.32.11/fs/proc/proc_sysctl.c ---- linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/proc_sysctl.c linux-2.6.32.14/fs/proc/proc_sysctl.c +--- linux-2.6.32.14/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -32923,9 +33577,9 @@ diff -urNp linux-2.6.32.11/fs/proc/proc_sysctl.c linux-2.6.32.11/fs/proc/proc_sy generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.32.11/fs/proc/root.c linux-2.6.32.11/fs/proc/root.c ---- linux-2.6.32.11/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/root.c linux-2.6.32.14/fs/proc/root.c +--- linux-2.6.32.14/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -32942,9 +33596,9 @@ diff -urNp linux-2.6.32.11/fs/proc/root.c linux-2.6.32.11/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c ---- linux-2.6.32.11/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/task_mmu.c linux-2.6.32.14/fs/proc/task_mmu.c +--- linux-2.6.32.14/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400 ++++ linux-2.6.32.14/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -33031,9 +33685,9 @@ diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c + (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack)) { name = "[stack]"; - } else { - unsigned long stack_start; -@@ -403,9 +429,16 @@ static int show_smap(struct seq_file *m, + } + } else { +@@ -384,9 +410,16 @@ static int show_smap(struct seq_file *m, }; memset(&mss, 0, sizeof mss); @@ -33053,7 +33707,7 @@ diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c show_map_vma(m, vma); -@@ -421,7 +454,11 @@ static int show_smap(struct seq_file *m, +@@ -402,7 +435,11 @@ static int show_smap(struct seq_file *m, "Swap: %8lu kB\n" "KernelPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n", @@ -33065,9 +33719,9 @@ diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.32.11/fs/proc/task_nommu.c linux-2.6.32.11/fs/proc/task_nommu.c ---- linux-2.6.32.11/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/proc/task_nommu.c linux-2.6.32.14/fs/proc/task_nommu.c +--- linux-2.6.32.14/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -33086,9 +33740,9 @@ diff -urNp linux-2.6.32.11/fs/proc/task_nommu.c linux-2.6.32.11/fs/proc/task_nom } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.11/fs/readdir.c linux-2.6.32.11/fs/readdir.c ---- linux-2.6.32.11/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/readdir.c linux-2.6.32.14/fs/readdir.c +--- linux-2.6.32.14/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -33178,9 +33832,9 @@ diff -urNp linux-2.6.32.11/fs/readdir.c linux-2.6.32.11/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/fs/reiserfs/do_balan.c ---- linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/reiserfs/do_balan.c linux-2.6.32.14/fs/reiserfs/do_balan.c +--- linux-2.6.32.14/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -33190,9 +33844,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/fs/reiserfs/do do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/item_ops.c ---- linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/reiserfs/item_ops.c linux-2.6.32.14/fs/reiserfs/item_ops.c +--- linux-2.6.32.14/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -33247,9 +33901,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/it &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.11/fs/reiserfs/procfs.c linux-2.6.32.11/fs/reiserfs/procfs.c ---- linux-2.6.32.11/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/reiserfs/procfs.c linux-2.6.32.14/fs/reiserfs/procfs.c +--- linux-2.6.32.14/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -33259,9 +33913,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/procfs.c linux-2.6.32.11/fs/reiserfs/proc SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.32.11/fs/select.c linux-2.6.32.11/fs/select.c ---- linux-2.6.32.11/fs/select.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/select.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/select.c linux-2.6.32.14/fs/select.c +--- linux-2.6.32.14/fs/select.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/select.c 2010-05-28 21:27:16.263231213 -0400 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -33278,9 +33932,9 @@ diff -urNp linux-2.6.32.11/fs/select.c linux-2.6.32.11/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c ---- linux-2.6.32.11/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/seq_file.c linux-2.6.32.14/fs/seq_file.c +--- linux-2.6.32.14/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -33321,9 +33975,9 @@ diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.32.11/fs/smbfs/symlink.c linux-2.6.32.11/fs/smbfs/symlink.c ---- linux-2.6.32.11/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/smbfs/symlink.c linux-2.6.32.14/fs/smbfs/symlink.c +--- linux-2.6.32.14/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -33333,9 +33987,9 @@ diff -urNp linux-2.6.32.11/fs/smbfs/symlink.c linux-2.6.32.11/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c ---- linux-2.6.32.11/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/splice.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/splice.c linux-2.6.32.14/fs/splice.c +--- linux-2.6.32.14/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/splice.c 2010-05-28 21:27:16.267126788 -0400 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -33474,9 +34128,9 @@ diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.32.11/fs/sysfs/file.c linux-2.6.32.11/fs/sysfs/file.c ---- linux-2.6.32.11/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/sysfs/file.c linux-2.6.32.14/fs/sysfs/file.c +--- linux-2.6.32.14/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -33513,9 +34167,9 @@ diff -urNp linux-2.6.32.11/fs/sysfs/file.c linux-2.6.32.11/fs/sysfs/file.c int error = -EACCES; char *p; -diff -urNp linux-2.6.32.11/fs/sysfs/symlink.c linux-2.6.32.11/fs/sysfs/symlink.c ---- linux-2.6.32.11/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -0400 +diff -urNp linux-2.6.32.14/fs/sysfs/symlink.c linux-2.6.32.14/fs/sysfs/symlink.c +--- linux-2.6.32.14/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -33525,9 +34179,9 @@ diff -urNp linux-2.6.32.11/fs/sysfs/symlink.c linux-2.6.32.11/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.11/fs/udf/balloc.c linux-2.6.32.11/fs/udf/balloc.c ---- linux-2.6.32.11/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400 +diff -urNp linux-2.6.32.14/fs/udf/balloc.c linux-2.6.32.14/fs/udf/balloc.c +--- linux-2.6.32.14/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -33550,9 +34204,35 @@ diff -urNp linux-2.6.32.11/fs/udf/balloc.c linux-2.6.32.11/fs/udf/balloc.c udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.32.11/fs/utimes.c linux-2.6.32.11/fs/utimes.c ---- linux-2.6.32.11/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400 +diff -urNp linux-2.6.32.14/fs/udf/misc.c linux-2.6.32.14/fs/udf/misc.c +--- linux-2.6.32.14/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400 +@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat + iinfo->i_lenEAttr += size; + return (struct genericFormat *)&ea[offset]; + } +- if (loc & 0x02) +- ; ++ if (loc & 0x02) { ++ } + + return NULL; + } +diff -urNp linux-2.6.32.14/fs/udf/udfdecl.h linux-2.6.32.14/fs/udf/udfdecl.h +--- linux-2.6.32.14/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400 +@@ -26,7 +26,7 @@ do { \ + printk(f, ##a); \ + } while (0) + #else +-#define udf_debug(f, a...) /**/ ++#define udf_debug(f, a...) do {} while (0) + #endif + + #define udf_info(f, a...) \ +diff -urNp linux-2.6.32.14/fs/utimes.c linux-2.6.32.14/fs/utimes.c +--- linux-2.6.32.14/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -33574,9 +34254,9 @@ diff -urNp linux-2.6.32.11/fs/utimes.c linux-2.6.32.11/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400 +diff -urNp linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400 @@ -134,7 +134,7 @@ xfs_find_handle( } @@ -33586,9 +34266,9 @@ diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.11/fs/xfs/l copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-04-04 20:46:41.665784997 -0400 +diff -urNp linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 ++++ linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -33598,9 +34278,9 @@ diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.11/fs/xfs/li if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.11/fs/xfs/xfs_bmap.c linux-2.6.32.11/fs/xfs/xfs_bmap.c ---- linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400 +diff -urNp linux-2.6.32.14/fs/xfs/xfs_bmap.c linux-2.6.32.14/fs/xfs/xfs_bmap.c +--- linux-2.6.32.14/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -33610,9 +34290,9 @@ diff -urNp linux-2.6.32.11/fs/xfs/xfs_bmap.c linux-2.6.32.11/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.11/grsecurity/gracl_alloc.c linux-2.6.32.11/grsecurity/gracl_alloc.c ---- linux-2.6.32.11/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_alloc.c linux-2.6.32.14/grsecurity/gracl_alloc.c +--- linux-2.6.32.14/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -33719,10 +34399,10 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_alloc.c linux-2.6.32.11/grsecurity/g + else + return 1; +} -diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c ---- linux-2.6.32.11/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl.c 2010-04-06 22:16:21.600343588 -0400 -@@ -0,0 +1,3924 @@ +diff -urNp linux-2.6.32.14/grsecurity/gracl.c linux-2.6.32.14/grsecurity/gracl.c +--- linux-2.6.32.14/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl.c 2010-05-28 21:27:16.327077893 -0400 +@@ -0,0 +1,3897 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/sched.h> @@ -33862,37 +34542,10 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c +static int +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb) +{ -+ int i; -+ unsigned long *l1; -+ unsigned long *l2; -+ unsigned char *c1; -+ unsigned char *c2; -+ int num_longs; -+ + if (likely(lena != lenb)) + return 0; + -+ l1 = (unsigned long *)a; -+ l2 = (unsigned long *)b; -+ -+ num_longs = lena / sizeof(unsigned long); -+ -+ for (i = num_longs; i--; l1++, l2++) { -+ if (unlikely(*l1 != *l2)) -+ return 0; -+ } -+ -+ c1 = (unsigned char *) l1; -+ c2 = (unsigned char *) l2; -+ -+ i = lena - (num_longs * sizeof(unsigned long)); -+ -+ for (; i--; c1++, c2++) { -+ if (unlikely(*c1 != *c2)) -+ return 0; -+ } -+ -+ return 1; ++ return !memcmp(a, b, lena); +} + +static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt, @@ -37647,9 +38300,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.11/grsecurity/gracl_cap.c linux-2.6.32.11/grsecurity/gracl_cap.c ---- linux-2.6.32.11/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_cap.c linux-2.6.32.14/grsecurity/gracl_cap.c +--- linux-2.6.32.14/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_cap.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,131 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -37782,9 +38435,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_cap.c linux-2.6.32.11/grsecurity/gra + return 0; +} + -diff -urNp linux-2.6.32.11/grsecurity/gracl_fs.c linux-2.6.32.11/grsecurity/gracl_fs.c ---- linux-2.6.32.11/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_fs.c linux-2.6.32.14/grsecurity/gracl_fs.c +--- linux-2.6.32.14/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38210,9 +38863,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_fs.c linux-2.6.32.11/grsecurity/grac + + return 0; +} -diff -urNp linux-2.6.32.11/grsecurity/gracl_ip.c linux-2.6.32.11/grsecurity/gracl_ip.c ---- linux-2.6.32.11/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_ip.c linux-2.6.32.14/grsecurity/gracl_ip.c +--- linux-2.6.32.14/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -38553,9 +39206,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_ip.c linux-2.6.32.11/grsecurity/grac + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.32.11/grsecurity/gracl_learn.c linux-2.6.32.11/grsecurity/gracl_learn.c ---- linux-2.6.32.11/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_learn.c linux-2.6.32.14/grsecurity/gracl_learn.c +--- linux-2.6.32.14/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -38768,9 +39421,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_learn.c linux-2.6.32.11/grsecurity/g + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.32.11/grsecurity/gracl_res.c linux-2.6.32.11/grsecurity/gracl_res.c ---- linux-2.6.32.11/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_res.c linux-2.6.32.14/grsecurity/gracl_res.c +--- linux-2.6.32.14/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38837,9 +39490,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_res.c linux-2.6.32.11/grsecurity/gra + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.11/grsecurity/gracl_segv.c linux-2.6.32.11/grsecurity/gracl_segv.c ---- linux-2.6.32.11/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_segv.c linux-2.6.32.14/grsecurity/gracl_segv.c +--- linux-2.6.32.14/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -39151,9 +39804,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_segv.c linux-2.6.32.11/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.11/grsecurity/gracl_shm.c linux-2.6.32.11/grsecurity/gracl_shm.c ---- linux-2.6.32.11/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/gracl_shm.c linux-2.6.32.14/grsecurity/gracl_shm.c +--- linux-2.6.32.14/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/gracl_shm.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,37 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -39192,9 +39845,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_shm.c linux-2.6.32.11/grsecurity/gra + + return 1; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_chdir.c linux-2.6.32.11/grsecurity/grsec_chdir.c ---- linux-2.6.32.11/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_chdir.c linux-2.6.32.14/grsecurity/grsec_chdir.c +--- linux-2.6.32.14/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39215,9 +39868,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_chdir.c linux-2.6.32.11/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_chroot.c linux-2.6.32.11/grsecurity/grsec_chroot.c ---- linux-2.6.32.11/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_chroot.c linux-2.6.32.14/grsecurity/grsec_chroot.c +--- linux-2.6.32.14/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_chroot.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,348 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39567,9 +40220,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_chroot.c linux-2.6.32.11/grsecurity/ +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.32.11/grsecurity/grsec_disabled.c linux-2.6.32.11/grsecurity/grsec_disabled.c ---- linux-2.6.32.11/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_disabled.c linux-2.6.32.14/grsecurity/grsec_disabled.c +--- linux-2.6.32.14/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,426 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39997,9 +40650,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_disabled.c linux-2.6.32.11/grsecurit +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.11/grsecurity/grsec_exec.c linux-2.6.32.11/grsecurity/grsec_exec.c ---- linux-2.6.32.11/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_exec.c linux-2.6.32.14/grsecurity/grsec_exec.c +--- linux-2.6.32.14/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40090,9 +40743,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_exec.c linux-2.6.32.11/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_fifo.c linux-2.6.32.11/grsecurity/grsec_fifo.c ---- linux-2.6.32.11/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_fifo.c linux-2.6.32.14/grsecurity/grsec_fifo.c +--- linux-2.6.32.14/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40118,9 +40771,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_fifo.c linux-2.6.32.11/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_fork.c linux-2.6.32.11/grsecurity/grsec_fork.c ---- linux-2.6.32.11/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_fork.c linux-2.6.32.14/grsecurity/grsec_fork.c +--- linux-2.6.32.14/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40137,9 +40790,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_fork.c linux-2.6.32.11/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_init.c linux-2.6.32.11/grsecurity/grsec_init.c ---- linux-2.6.32.11/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_init.c linux-2.6.32.14/grsecurity/grsec_init.c +--- linux-2.6.32.14/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_init.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,241 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40382,9 +41035,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_init.c linux-2.6.32.11/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_link.c linux-2.6.32.11/grsecurity/grsec_link.c ---- linux-2.6.32.11/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_link.c linux-2.6.32.14/grsecurity/grsec_link.c +--- linux-2.6.32.14/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40429,9 +41082,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_link.c linux-2.6.32.11/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_log.c linux-2.6.32.11/grsecurity/grsec_log.c ---- linux-2.6.32.11/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_log.c linux-2.6.32.14/grsecurity/grsec_log.c +--- linux-2.6.32.14/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,296 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40729,9 +41382,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_log.c linux-2.6.32.11/grsecurity/grs + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_mem.c linux-2.6.32.11/grsecurity/grsec_mem.c ---- linux-2.6.32.11/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_mem.c linux-2.6.32.14/grsecurity/grsec_mem.c +--- linux-2.6.32.14/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40818,9 +41471,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_mem.c linux-2.6.32.11/grsecurity/grs + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_mount.c linux-2.6.32.11/grsecurity/grsec_mount.c ---- linux-2.6.32.11/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_mount.c linux-2.6.32.14/grsecurity/grsec_mount.c +--- linux-2.6.32.14/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40884,9 +41537,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_mount.c linux-2.6.32.11/grsecurity/g +#endif + return 0; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_ptrace.c linux-2.6.32.11/grsecurity/grsec_ptrace.c ---- linux-2.6.32.11/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_ptrace.c linux-2.6.32.14/grsecurity/grsec_ptrace.c +--- linux-2.6.32.14/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40902,9 +41555,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_ptrace.c linux-2.6.32.11/grsecurity/ +#endif + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_sig.c linux-2.6.32.11/grsecurity/grsec_sig.c ---- linux-2.6.32.11/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_sig.c linux-2.6.32.14/grsecurity/grsec_sig.c +--- linux-2.6.32.14/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40971,9 +41624,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_sig.c linux-2.6.32.11/grsecurity/grs + return; +} + -diff -urNp linux-2.6.32.11/grsecurity/grsec_sock.c linux-2.6.32.11/grsecurity/grsec_sock.c ---- linux-2.6.32.11/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_sock.c linux-2.6.32.14/grsecurity/grsec_sock.c +--- linux-2.6.32.14/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,271 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -41246,9 +41899,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_sock.c linux-2.6.32.11/grsecurity/gr + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_sysctl.c linux-2.6.32.11/grsecurity/grsec_sysctl.c ---- linux-2.6.32.11/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_sysctl.c linux-2.6.32.14/grsecurity/grsec_sysctl.c +--- linux-2.6.32.14/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_sysctl.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,447 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41697,9 +42350,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_sysctl.c linux-2.6.32.11/grsecurity/ + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.11/grsecurity/grsec_textrel.c linux-2.6.32.11/grsecurity/grsec_textrel.c ---- linux-2.6.32.11/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_textrel.c linux-2.6.32.14/grsecurity/grsec_textrel.c +--- linux-2.6.32.14/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41717,9 +42370,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_textrel.c linux-2.6.32.11/grsecurity +#endif + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_time.c linux-2.6.32.11/grsecurity/grsec_time.c ---- linux-2.6.32.11/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_time.c linux-2.6.32.14/grsecurity/grsec_time.c +--- linux-2.6.32.14/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41734,9 +42387,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_time.c linux-2.6.32.11/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.11/grsecurity/grsec_tpe.c linux-2.6.32.11/grsecurity/grsec_tpe.c ---- linux-2.6.32.11/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsec_tpe.c linux-2.6.32.14/grsecurity/grsec_tpe.c +--- linux-2.6.32.14/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41776,9 +42429,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_tpe.c linux-2.6.32.11/grsecurity/grs +#endif + return 1; +} -diff -urNp linux-2.6.32.11/grsecurity/grsum.c linux-2.6.32.11/grsecurity/grsum.c ---- linux-2.6.32.11/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/grsum.c linux-2.6.32.14/grsecurity/grsum.c +--- linux-2.6.32.14/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/grsum.c 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,59 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -41839,9 +42492,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsum.c linux-2.6.32.11/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig ---- linux-2.6.32.11/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/Kconfig linux-2.6.32.14/grsecurity/Kconfig +--- linux-2.6.32.14/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/Kconfig 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,965 @@ +# +# grecurity configuration @@ -42808,9 +43461,9 @@ diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.32.11/grsecurity/Makefile linux-2.6.32.11/grsecurity/Makefile ---- linux-2.6.32.11/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/grsecurity/Makefile linux-2.6.32.14/grsecurity/Makefile +--- linux-2.6.32.14/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -42841,9 +43494,23 @@ diff -urNp linux-2.6.32.11/grsecurity/Makefile linux-2.6.32.11/grsecurity/Makefi + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/acpi/acpi_drivers.h ---- linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/include/acpi/acoutput.h linux-2.6.32.14/include/acpi/acoutput.h +--- linux-2.6.32.14/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400 +@@ -264,8 +264,8 @@ + * leaving no executable debug code! + */ + #define ACPI_FUNCTION_NAME(a) +-#define ACPI_DEBUG_PRINT(pl) +-#define ACPI_DEBUG_PRINT_RAW(pl) ++#define ACPI_DEBUG_PRINT(pl) do {} while (0) ++#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0) + + #endif /* ACPI_DEBUG_OUTPUT */ + +diff -urNp linux-2.6.32.14/include/acpi/acpi_drivers.h linux-2.6.32.14/include/acpi/acpi_drivers.h +--- linux-2.6.32.14/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -42873,9 +43540,9 @@ diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/a void *context) { return -ENODEV; -diff -urNp linux-2.6.32.11/include/asm-generic/atomic-long.h linux-2.6.32.11/include/asm-generic/atomic-long.h ---- linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/atomic-long.h linux-2.6.32.14/include/asm-generic/atomic-long.h +--- linux-2.6.32.14/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -43096,9 +43763,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/atomic-long.h linux-2.6.32.11/inc +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.32.11/include/asm-generic/dma-mapping-common.h linux-2.6.32.11/include/asm-generic/dma-mapping-common.h ---- linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/dma-mapping-common.h linux-2.6.32.14/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32.14/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -43207,9 +43874,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/dma-mapping-common.h linux-2.6.32 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.32.11/include/asm-generic/futex.h linux-2.6.32.11/include/asm-generic/futex.h ---- linux-2.6.32.11/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/futex.h linux-2.6.32.14/include/asm-generic/futex.h +--- linux-2.6.32.14/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -43228,9 +43895,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/futex.h linux-2.6.32.11/include/a { return -ENOSYS; } -diff -urNp linux-2.6.32.11/include/asm-generic/int-l64.h linux-2.6.32.11/include/asm-generic/int-l64.h ---- linux-2.6.32.11/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/int-l64.h linux-2.6.32.14/include/asm-generic/int-l64.h +--- linux-2.6.32.14/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -43240,9 +43907,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/int-l64.h linux-2.6.32.11/include #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.11/include/asm-generic/int-ll64.h linux-2.6.32.11/include/asm-generic/int-ll64.h ---- linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/int-ll64.h linux-2.6.32.14/include/asm-generic/int-ll64.h +--- linux-2.6.32.14/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -43252,9 +43919,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/int-ll64.h linux-2.6.32.11/includ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.11/include/asm-generic/kmap_types.h linux-2.6.32.11/include/asm-generic/kmap_types.h ---- linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/kmap_types.h linux-2.6.32.14/include/asm-generic/kmap_types.h +--- linux-2.6.32.14/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -43265,9 +43932,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/kmap_types.h linux-2.6.32.11/incl }; #undef KMAP_D -diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include/asm-generic/pgtable.h ---- linux-2.6.32.11/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/pgtable.h linux-2.6.32.14/include/asm-generic/pgtable.h +--- linux-2.6.32.14/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -43283,9 +43950,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.11/include/asm-generic/vmlinux.lds.h linux-2.6.32.11/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/asm-generic/vmlinux.lds.h linux-2.6.32.14/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.14/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -43324,19 +43991,19 @@ diff -urNp linux-2.6.32.11/include/asm-generic/vmlinux.lds.h linux-2.6.32.11/inc /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/drm_pciids.h ---- linux-2.6.32.11/include/drm/drm_pciids.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/drm/drm_pciids.h 2010-04-04 20:46:41.673688119 -0400 -@@ -375,7 +375,7 @@ - {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ +diff -urNp linux-2.6.32.14/include/drm/drm_pciids.h linux-2.6.32.14/include/drm/drm_pciids.h +--- linux-2.6.32.14/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 ++++ linux-2.6.32.14/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400 +@@ -377,7 +377,7 @@ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} #define r128_PCI_IDS \ {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -415,14 +415,14 @@ +@@ -417,14 +417,14 @@ {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -43353,7 +44020,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define mach64_PCI_IDS \ {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -445,7 +445,7 @@ +@@ -447,7 +447,7 @@ {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -43362,7 +44029,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define sisdrv_PCI_IDS \ {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -456,7 +456,7 @@ +@@ -458,7 +458,7 @@ {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ @@ -43371,7 +44038,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define tdfx_PCI_IDS \ {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -465,7 +465,7 @@ +@@ -467,7 +467,7 @@ {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -43380,7 +44047,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define viadrv_PCI_IDS \ {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -477,14 +477,14 @@ +@@ -479,14 +479,14 @@ {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ @@ -43397,7 +44064,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define i830_PCI_IDS \ {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -492,11 +492,11 @@ +@@ -494,11 +494,11 @@ {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -43411,7 +44078,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define savage_PCI_IDS \ {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ -@@ -522,10 +522,10 @@ +@@ -524,10 +524,10 @@ {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ @@ -43424,15 +44091,15 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/ #define i915_PCI_IDS \ {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ -@@ -558,4 +558,4 @@ +@@ -560,4 +560,4 @@ {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h ---- linux-2.6.32.11/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/drm/drmP.h linux-2.6.32.14/include/drm/drmP.h +--- linux-2.6.32.14/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400 @@ -814,7 +814,7 @@ struct drm_driver { void (*vgaarb_irq)(struct drm_device *dev, bool state); @@ -43460,9 +44127,9 @@ diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a.out.h ---- linux-2.6.32.11/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/a.out.h linux-2.6.32.14/include/linux/a.out.h +--- linux-2.6.32.14/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -43478,9 +44145,9 @@ diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/atmdev.h ---- linux-2.6.32.11/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/atmdev.h linux-2.6.32.14/include/linux/atmdev.h +--- linux-2.6.32.14/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -43490,9 +44157,9 @@ diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/ __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/include/linux/backlight.h ---- linux-2.6.32.11/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/backlight.h linux-2.6.32.14/include/linux/backlight.h +--- linux-2.6.32.14/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -43534,9 +44201,9 @@ diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/include/lin extern void backlight_device_unregister(struct backlight_device *bd); extern void backlight_force_update(struct backlight_device *bd, enum backlight_update_reason reason); -diff -urNp linux-2.6.32.11/include/linux/binfmts.h linux-2.6.32.11/include/linux/binfmts.h ---- linux-2.6.32.11/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/binfmts.h linux-2.6.32.14/include/linux/binfmts.h +--- linux-2.6.32.14/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -43545,9 +44212,9 @@ diff -urNp linux-2.6.32.11/include/linux/binfmts.h linux-2.6.32.11/include/linux unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/blkdev.h ---- linux-2.6.32.11/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/blkdev.h linux-2.6.32.14/include/linux/blkdev.h +--- linux-2.6.32.14/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400 @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ @@ -43579,9 +44246,9 @@ diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/ }; extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, -diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/cache.h ---- linux-2.6.32.11/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/cache.h linux-2.6.32.14/include/linux/cache.h +--- linux-2.6.32.14/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -43593,9 +44260,9 @@ diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/c #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/linux/capability.h ---- linux-2.6.32.11/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/capability.h linux-2.6.32.14/include/linux/capability.h +--- linux-2.6.32.14/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -43604,9 +44271,9 @@ diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/li /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.11/include/linux/compiler-gcc4.h linux-2.6.32.11/include/linux/compiler-gcc4.h ---- linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/compiler-gcc4.h linux-2.6.32.14/include/linux/compiler-gcc4.h +--- linux-2.6.32.14/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -43616,9 +44283,9 @@ diff -urNp linux-2.6.32.11/include/linux/compiler-gcc4.h linux-2.6.32.11/include +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linux/compiler.h ---- linux-2.6.32.11/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/compiler.h linux-2.6.32.14/include/linux/compiler.h +--- linux-2.6.32.14/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -43642,9 +44309,9 @@ diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linu /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -diff -urNp linux-2.6.32.11/include/linux/decompress/mm.h linux-2.6.32.11/include/linux/decompress/mm.h ---- linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 -+++ linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/decompress/mm.h linux-2.6.32.14/include/linux/decompress/mm.h +--- linux-2.6.32.14/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 ++++ linux-2.6.32.14/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -43654,9 +44321,9 @@ diff -urNp linux-2.6.32.11/include/linux/decompress/mm.h linux-2.6.32.11/include #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/linux/dma-mapping.h ---- linux-2.6.32.11/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/dma-mapping.h linux-2.6.32.14/include/linux/dma-mapping.h +--- linux-2.6.32.14/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400 @@ -16,50 +16,50 @@ enum dma_data_direction { }; @@ -43723,9 +44390,9 @@ diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/l }; #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst.h ---- linux-2.6.32.11/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/dst.h linux-2.6.32.14/include/linux/dst.h +--- linux-2.6.32.14/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -43735,9 +44402,9 @@ diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf.h ---- linux-2.6.32.11/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400 +diff -urNp linux-2.6.32.14/include/linux/elf.h linux-2.6.32.14/include/linux/elf.h +--- linux-2.6.32.14/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -43810,9 +44477,9 @@ diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf #endif -diff -urNp linux-2.6.32.11/include/linux/fs.h linux-2.6.32.11/include/linux/fs.h ---- linux-2.6.32.11/include/linux/fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/fs.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/fs.h linux-2.6.32.14/include/linux/fs.h +--- linux-2.6.32.14/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 ++++ linux-2.6.32.14/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)4096) @@ -43974,9 +44641,9 @@ diff -urNp linux-2.6.32.11/include/linux/fs.h linux-2.6.32.11/include/linux/fs.h }; /* -diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/linux/fs_struct.h ---- linux-2.6.32.11/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/fs_struct.h linux-2.6.32.14/include/linux/fs_struct.h +--- linux-2.6.32.14/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -43986,9 +44653,9 @@ diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/lin rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.11/include/linux/genhd.h linux-2.6.32.11/include/linux/genhd.h ---- linux-2.6.32.11/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/genhd.h linux-2.6.32.14/include/linux/genhd.h +--- linux-2.6.32.14/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -43998,9 +44665,9 @@ diff -urNp linux-2.6.32.11/include/linux/genhd.h linux-2.6.32.11/include/linux/g struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.11/include/linux/gracl.h linux-2.6.32.11/include/linux/gracl.h ---- linux-2.6.32.11/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/gracl.h linux-2.6.32.14/include/linux/gracl.h +--- linux-2.6.32.14/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/include/linux/gracl.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,309 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -44311,9 +44978,9 @@ diff -urNp linux-2.6.32.11/include/linux/gracl.h linux-2.6.32.11/include/linux/g + +#endif + -diff -urNp linux-2.6.32.11/include/linux/gralloc.h linux-2.6.32.11/include/linux/gralloc.h ---- linux-2.6.32.11/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/gralloc.h linux-2.6.32.14/include/linux/gralloc.h +--- linux-2.6.32.14/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -44324,9 +44991,9 @@ diff -urNp linux-2.6.32.11/include/linux/gralloc.h linux-2.6.32.11/include/linux +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.11/include/linux/grdefs.h linux-2.6.32.11/include/linux/grdefs.h ---- linux-2.6.32.11/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/grdefs.h linux-2.6.32.14/include/linux/grdefs.h +--- linux-2.6.32.14/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -44464,9 +45131,9 @@ diff -urNp linux-2.6.32.11/include/linux/grdefs.h linux-2.6.32.11/include/linux/ +}; + +#endif -diff -urNp linux-2.6.32.11/include/linux/grinternal.h linux-2.6.32.11/include/linux/grinternal.h ---- linux-2.6.32.11/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/grinternal.h linux-2.6.32.14/include/linux/grinternal.h +--- linux-2.6.32.14/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/include/linux/grinternal.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,215 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -44683,9 +45350,9 @@ diff -urNp linux-2.6.32.11/include/linux/grinternal.h linux-2.6.32.11/include/li +#endif + +#endif -diff -urNp linux-2.6.32.11/include/linux/grmsg.h linux-2.6.32.11/include/linux/grmsg.h ---- linux-2.6.32.11/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/grmsg.h linux-2.6.32.14/include/linux/grmsg.h +--- linux-2.6.32.14/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/include/linux/grmsg.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,107 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" @@ -44794,9 +45461,9 @@ diff -urNp linux-2.6.32.11/include/linux/grmsg.h linux-2.6.32.11/include/linux/g +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " -diff -urNp linux-2.6.32.11/include/linux/grsecurity.h linux-2.6.32.11/include/linux/grsecurity.h ---- linux-2.6.32.11/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/grsecurity.h linux-2.6.32.14/include/linux/grsecurity.h +--- linux-2.6.32.14/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/include/linux/grsecurity.h 2010-05-28 21:27:16.355225759 -0400 @@ -0,0 +1,199 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -44997,9 +45664,9 @@ diff -urNp linux-2.6.32.11/include/linux/grsecurity.h linux-2.6.32.11/include/li +#endif + +#endif -diff -urNp linux-2.6.32.11/include/linux/hdpu_features.h linux-2.6.32.11/include/linux/hdpu_features.h ---- linux-2.6.32.11/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/hdpu_features.h linux-2.6.32.14/include/linux/hdpu_features.h +--- linux-2.6.32.14/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -45009,9 +45676,9 @@ diff -urNp linux-2.6.32.11/include/linux/hdpu_features.h linux-2.6.32.11/include unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/include/linux/highmem.h ---- linux-2.6.32.11/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/highmem.h linux-2.6.32.14/include/linux/highmem.h +--- linux-2.6.32.14/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -45031,9 +45698,9 @@ diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/include/linux static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.11/include/linux/init_task.h linux-2.6.32.11/include/linux/init_task.h ---- linux-2.6.32.11/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/init_task.h linux-2.6.32.14/include/linux/init_task.h +--- linux-2.6.32.14/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400 @@ -115,6 +115,13 @@ extern struct cred init_cred; # define INIT_PERF_EVENTS(tsk) #endif @@ -45056,9 +45723,9 @@ diff -urNp linux-2.6.32.11/include/linux/init_task.h linux-2.6.32.11/include/lin } -diff -urNp linux-2.6.32.11/include/linux/interrupt.h linux-2.6.32.11/include/linux/interrupt.h ---- linux-2.6.32.11/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/interrupt.h linux-2.6.32.14/include/linux/interrupt.h +--- linux-2.6.32.14/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400 @@ -357,7 +357,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -45083,9 +45750,9 @@ diff -urNp linux-2.6.32.11/include/linux/interrupt.h linux-2.6.32.11/include/lin extern void softirq_init(void); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr); -diff -urNp linux-2.6.32.11/include/linux/jbd2.h linux-2.6.32.11/include/linux/jbd2.h ---- linux-2.6.32.11/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/jbd2.h linux-2.6.32.14/include/linux/jbd2.h +--- linux-2.6.32.14/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -45095,9 +45762,9 @@ diff -urNp linux-2.6.32.11/include/linux/jbd2.h linux-2.6.32.11/include/linux/jb #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.11/include/linux/jbd.h linux-2.6.32.11/include/linux/jbd.h ---- linux-2.6.32.11/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/jbd.h linux-2.6.32.14/include/linux/jbd.h +--- linux-2.6.32.14/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -45107,9 +45774,9 @@ diff -urNp linux-2.6.32.11/include/linux/jbd.h linux-2.6.32.11/include/linux/jbd #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linux/kallsyms.h ---- linux-2.6.32.11/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/kallsyms.h linux-2.6.32.14/include/linux/kallsyms.h +--- linux-2.6.32.14/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400 @@ -15,7 +15,8 @@ struct module; @@ -45130,9 +45797,9 @@ diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linu /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.11/include/linux/kgdb.h linux-2.6.32.11/include/linux/kgdb.h ---- linux-2.6.32.11/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/kgdb.h linux-2.6.32.14/include/linux/kgdb.h +--- linux-2.6.32.14/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400 @@ -251,20 +251,20 @@ struct kgdb_arch { */ struct kgdb_io { @@ -45163,9 +45830,9 @@ diff -urNp linux-2.6.32.11/include/linux/kgdb.h linux-2.6.32.11/include/linux/kg extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.32.11/include/linux/kobject.h linux-2.6.32.11/include/linux/kobject.h ---- linux-2.6.32.11/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/kobject.h linux-2.6.32.14/include/linux/kobject.h +--- linux-2.6.32.14/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -45214,10 +45881,10 @@ diff -urNp linux-2.6.32.11/include/linux/kobject.h linux-2.6.32.11/include/linux struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linux/kvm_host.h ---- linux-2.6.32.11/include/linux/kvm_host.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/kvm_host.h 2010-04-04 20:46:41.677383221 -0400 -@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc +diff -urNp linux-2.6.32.14/include/linux/kvm_host.h linux-2.6.32.14/include/linux/kvm_host.h +--- linux-2.6.32.14/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 ++++ linux-2.6.32.14/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400 +@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -45226,7 +45893,7 @@ diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linu struct module *module); void kvm_exit(void); -@@ -311,7 +311,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( +@@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( struct kvm_guest_debug *dbg); int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); @@ -45235,9 +45902,9 @@ diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linu void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.11/include/linux/libata.h linux-2.6.32.11/include/linux/libata.h ---- linux-2.6.32.11/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400 +diff -urNp linux-2.6.32.14/include/linux/libata.h linux-2.6.32.14/include/linux/libata.h +--- linux-2.6.32.14/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -45303,9 +45970,9 @@ diff -urNp linux-2.6.32.11/include/linux/libata.h linux-2.6.32.11/include/linux/ extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); -diff -urNp linux-2.6.32.11/include/linux/lockd/bind.h linux-2.6.32.11/include/linux/lockd/bind.h ---- linux-2.6.32.11/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/lockd/bind.h linux-2.6.32.14/include/linux/lockd/bind.h +--- linux-2.6.32.14/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -45323,9 +45990,9 @@ diff -urNp linux-2.6.32.11/include/linux/lockd/bind.h linux-2.6.32.11/include/li /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.11/include/linux/mm.h linux-2.6.32.11/include/linux/mm.h ---- linux-2.6.32.11/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h +--- linux-2.6.32.14/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/mm.h 2010-05-28 21:27:16.391248013 -0400 @@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ @@ -45388,9 +46055,9 @@ diff -urNp linux-2.6.32.11/include/linux/mm.h linux-2.6.32.11/include/linux/mm.h #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.11/include/linux/mm_types.h linux-2.6.32.11/include/linux/mm_types.h ---- linux-2.6.32.11/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/mm_types.h linux-2.6.32.14/include/linux/mm_types.h +--- linux-2.6.32.14/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -45425,9 +46092,9 @@ diff -urNp linux-2.6.32.11/include/linux/mm_types.h linux-2.6.32.11/include/linu }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.11/include/linux/mmu_notifier.h linux-2.6.32.11/include/linux/mmu_notifier.h ---- linux-2.6.32.11/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/mmu_notifier.h linux-2.6.32.14/include/linux/mmu_notifier.h +--- linux-2.6.32.14/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -45444,9 +46111,9 @@ diff -urNp linux-2.6.32.11/include/linux/mmu_notifier.h linux-2.6.32.11/include/ }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/include/linux/mod_devicetable.h ---- linux-2.6.32.11/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/mod_devicetable.h linux-2.6.32.14/include/linux/mod_devicetable.h +--- linux-2.6.32.14/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -45465,9 +46132,9 @@ diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/inclu struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/module.h ---- linux-2.6.32.11/include/linux/module.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/module.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/module.h linux-2.6.32.14/include/linux/module.h +--- linux-2.6.32.14/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400 @@ -287,16 +287,16 @@ struct module int (*init)(void); @@ -45540,9 +46207,9 @@ diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/ } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.11/include/linux/moduleloader.h linux-2.6.32.11/include/linux/moduleloader.h ---- linux-2.6.32.11/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/moduleloader.h linux-2.6.32.14/include/linux/moduleloader.h +--- linux-2.6.32.14/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -45565,9 +46232,9 @@ diff -urNp linux-2.6.32.11/include/linux/moduleloader.h linux-2.6.32.11/include/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.32.11/include/linux/namei.h linux-2.6.32.11/include/linux/namei.h ---- linux-2.6.32.11/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/namei.h linux-2.6.32.14/include/linux/namei.h +--- linux-2.6.32.14/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -45592,9 +46259,9 @@ diff -urNp linux-2.6.32.11/include/linux/namei.h linux-2.6.32.11/include/linux/n { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.11/include/linux/nodemask.h linux-2.6.32.11/include/linux/nodemask.h ---- linux-2.6.32.11/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/nodemask.h linux-2.6.32.14/include/linux/nodemask.h +--- linux-2.6.32.14/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -45611,9 +46278,9 @@ diff -urNp linux-2.6.32.11/include/linux/nodemask.h linux-2.6.32.11/include/linu }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.11/include/linux/oprofile.h linux-2.6.32.11/include/linux/oprofile.h ---- linux-2.6.32.11/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/oprofile.h linux-2.6.32.14/include/linux/oprofile.h +--- linux-2.6.32.14/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -45626,9 +46293,9 @@ diff -urNp linux-2.6.32.11/include/linux/oprofile.h linux-2.6.32.11/include/linu /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.32.11/include/linux/pipe_fs_i.h linux-2.6.32.11/include/linux/pipe_fs_i.h ---- linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/pipe_fs_i.h linux-2.6.32.14/include/linux/pipe_fs_i.h +--- linux-2.6.32.14/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -45642,23 +46309,23 @@ diff -urNp linux-2.6.32.11/include/linux/pipe_fs_i.h linux-2.6.32.11/include/lin unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.11/include/linux/poison.h linux-2.6.32.11/include/linux/poison.h ---- linux-2.6.32.11/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400 -@@ -7,8 +7,8 @@ +diff -urNp linux-2.6.32.14/include/linux/poison.h linux-2.6.32.14/include/linux/poison.h +--- linux-2.6.32.14/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 ++++ linux-2.6.32.14/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400 +@@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. */ --#define LIST_POISON1 ((void *) 0x00100100) --#define LIST_POISON2 ((void *) 0x00200200) +-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA) +-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA) +#define LIST_POISON1 ((void *) (long)0xFFFFFF01) +#define LIST_POISON2 ((void *) (long)0xFFFFFF02) /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/include/linux/proc_fs.h ---- linux-2.6.32.11/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/proc_fs.h linux-2.6.32.14/include/linux/proc_fs.h +--- linux-2.6.32.14/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -45679,9 +46346,9 @@ diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/include/linux static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.32.11/include/linux/random.h linux-2.6.32.11/include/linux/random.h ---- linux-2.6.32.11/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/random.h linux-2.6.32.14/include/linux/random.h +--- linux-2.6.32.14/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -45694,9 +46361,9 @@ diff -urNp linux-2.6.32.11/include/linux/random.h linux-2.6.32.11/include/linux/ #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/include/linux/reiserfs_fs.h ---- linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/reiserfs_fs.h linux-2.6.32.14/include/linux/reiserfs_fs.h +--- linux-2.6.32.14/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -45743,9 +46410,9 @@ diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/include/l #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) -diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs_sb.h linux-2.6.32.11/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/reiserfs_fs_sb.h linux-2.6.32.14/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.14/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -45755,9 +46422,9 @@ diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs_sb.h linux-2.6.32.11/includ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/sched.h ---- linux-2.6.32.11/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/sched.h linux-2.6.32.14/include/linux/sched.h +--- linux-2.6.32.14/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -45865,8 +46532,8 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored adress in ret_stack */ int curr_ret_stack; -@@ -1544,6 +1569,52 @@ struct task_struct { - unsigned long stack_start; +@@ -1543,6 +1568,52 @@ struct task_struct { + #endif /* CONFIG_TRACING */ }; +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */ @@ -45918,7 +46585,7 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) -@@ -2143,7 +2214,7 @@ extern void __cleanup_sighand(struct sig +@@ -2142,7 +2213,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -45927,7 +46594,7 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2245,6 +2316,33 @@ static inline void task_unlock(struct ta +@@ -2244,6 +2315,33 @@ static inline void task_unlock(struct ta spin_unlock(&p->alloc_lock); } @@ -45961,7 +46628,7 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long *flags); -@@ -2256,8 +2354,8 @@ static inline void unlock_task_sighand(s +@@ -2255,8 +2353,8 @@ static inline void unlock_task_sighand(s #ifndef __HAVE_THREAD_FUNCTIONS @@ -45972,7 +46639,7 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -@@ -2272,13 +2370,31 @@ static inline unsigned long *end_of_stac +@@ -2271,13 +2369,31 @@ static inline unsigned long *end_of_stac #endif @@ -46006,9 +46673,9 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.11/include/linux/screen_info.h linux-2.6.32.11/include/linux/screen_info.h ---- linux-2.6.32.11/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/screen_info.h linux-2.6.32.14/include/linux/screen_info.h +--- linux-2.6.32.14/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -46019,9 +46686,9 @@ diff -urNp linux-2.6.32.11/include/linux/screen_info.h linux-2.6.32.11/include/l } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.11/include/linux/security.h linux-2.6.32.11/include/linux/security.h ---- linux-2.6.32.11/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/security.h linux-2.6.32.14/include/linux/security.h +--- linux-2.6.32.14/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -46030,9 +46697,9 @@ diff -urNp linux-2.6.32.11/include/linux/security.h linux-2.6.32.11/include/linu #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.11/include/linux/shm.h linux-2.6.32.11/include/linux/shm.h ---- linux-2.6.32.11/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400 +diff -urNp linux-2.6.32.14/include/linux/shm.h linux-2.6.32.14/include/linux/shm.h +--- linux-2.6.32.14/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -46044,9 +46711,9 @@ diff -urNp linux-2.6.32.11/include/linux/shm.h linux-2.6.32.11/include/linux/shm }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.11/include/linux/slab.h linux-2.6.32.11/include/linux/slab.h ---- linux-2.6.32.11/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400 +diff -urNp linux-2.6.32.14/include/linux/slab.h linux-2.6.32.14/include/linux/slab.h +--- linux-2.6.32.14/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400 @@ -11,6 +11,7 @@ #include <linux/gfp.h> @@ -46118,9 +46785,9 @@ diff -urNp linux-2.6.32.11/include/linux/slab.h linux-2.6.32.11/include/linux/sl +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.11/include/linux/slub_def.h linux-2.6.32.11/include/linux/slub_def.h ---- linux-2.6.32.11/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/slub_def.h linux-2.6.32.14/include/linux/slub_def.h +--- linux-2.6.32.14/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -46130,9 +46797,9 @@ diff -urNp linux-2.6.32.11/include/linux/slub_def.h linux-2.6.32.11/include/linu void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/sonet.h ---- linux-2.6.32.11/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/sonet.h linux-2.6.32.14/include/linux/sonet.h +--- linux-2.6.32.14/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -46142,9 +46809,9 @@ diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/s __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/include/linux/suspend.h ---- linux-2.6.32.11/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/suspend.h linux-2.6.32.14/include/linux/suspend.h +--- linux-2.6.32.14/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -46233,9 +46900,9 @@ diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/include/linux static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.32.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/sysctl.h ---- linux-2.6.32.11/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/sysctl.h linux-2.6.32.14/include/linux/sysctl.h +--- linux-2.6.32.14/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -46249,9 +46916,9 @@ diff -urNp linux-2.6.32.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/ /* CTL_VM names: */ enum -diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/sysfs.h ---- linux-2.6.32.11/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/sysfs.h linux-2.6.32.14/include/linux/sysfs.h +--- linux-2.6.32.14/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -46263,9 +46930,9 @@ diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/s }; struct sysfs_dirent; -diff -urNp linux-2.6.32.11/include/linux/thread_info.h linux-2.6.32.11/include/linux/thread_info.h ---- linux-2.6.32.11/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/thread_info.h linux-2.6.32.14/include/linux/thread_info.h +--- linux-2.6.32.14/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -46275,9 +46942,9 @@ diff -urNp linux-2.6.32.11/include/linux/thread_info.h linux-2.6.32.11/include/l u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.11/include/linux/tty.h linux-2.6.32.11/include/linux/tty.h ---- linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/tty.h linux-2.6.32.14/include/linux/tty.h +--- linux-2.6.32.14/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 ++++ linux-2.6.32.14/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400 @@ -13,6 +13,7 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> @@ -46313,9 +46980,9 @@ diff -urNp linux-2.6.32.11/include/linux/tty.h linux-2.6.32.11/include/linux/tty /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.11/include/linux/tty_ldisc.h linux-2.6.32.11/include/linux/tty_ldisc.h ---- linux-2.6.32.11/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/tty_ldisc.h linux-2.6.32.14/include/linux/tty_ldisc.h +--- linux-2.6.32.14/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -46325,9 +46992,9 @@ diff -urNp linux-2.6.32.11/include/linux/tty_ldisc.h linux-2.6.32.11/include/lin }; struct tty_ldisc { -diff -urNp linux-2.6.32.11/include/linux/types.h linux-2.6.32.11/include/linux/types.h ---- linux-2.6.32.11/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/types.h linux-2.6.32.14/include/linux/types.h +--- linux-2.6.32.14/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -46355,9 +47022,9 @@ diff -urNp linux-2.6.32.11/include/linux/types.h linux-2.6.32.11/include/linux/t #endif struct ustat { -diff -urNp linux-2.6.32.11/include/linux/uaccess.h linux-2.6.32.11/include/linux/uaccess.h ---- linux-2.6.32.11/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/uaccess.h linux-2.6.32.14/include/linux/uaccess.h +--- linux-2.6.32.14/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -46389,15 +47056,15 @@ diff -urNp linux-2.6.32.11/include/linux/uaccess.h linux-2.6.32.11/include/linux +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.11/include/linux/vmalloc.h linux-2.6.32.11/include/linux/vmalloc.h ---- linux-2.6.32.11/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/linux/vmalloc.h linux-2.6.32.14/include/linux/vmalloc.h +--- linux-2.6.32.14/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ + -+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) +#define VM_KERNEXEC 0x00000020 /* allocate from executable kernel memory range */ +#endif + @@ -46486,9 +47153,9 @@ diff -urNp linux-2.6.32.11/include/linux/vmalloc.h linux-2.6.32.11/include/linux +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.11/include/net/irda/ircomm_tty.h linux-2.6.32.11/include/net/irda/ircomm_tty.h ---- linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/net/irda/ircomm_tty.h linux-2.6.32.14/include/net/irda/ircomm_tty.h +--- linux-2.6.32.14/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ @@ -46500,9 +47167,9 @@ diff -urNp linux-2.6.32.11/include/net/irda/ircomm_tty.h linux-2.6.32.11/include /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/neighbour.h ---- linux-2.6.32.11/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/net/neighbour.h linux-2.6.32.14/include/net/neighbour.h +--- linux-2.6.32.14/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -46522,9 +47189,9 @@ diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/n }; struct pneigh_entry -diff -urNp linux-2.6.32.11/include/net/sctp/sctp.h linux-2.6.32.11/include/net/sctp/sctp.h ---- linux-2.6.32.11/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/net/sctp/sctp.h linux-2.6.32.14/include/net/sctp/sctp.h +--- linux-2.6.32.14/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -46536,9 +47203,9 @@ diff -urNp linux-2.6.32.11/include/net/sctp/sctp.h linux-2.6.32.11/include/net/s #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.11/include/net/tcp.h linux-2.6.32.11/include/net/tcp.h ---- linux-2.6.32.11/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/net/tcp.h linux-2.6.32.14/include/net/tcp.h +--- linux-2.6.32.14/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400 @@ -1420,6 +1420,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -46547,9 +47214,9 @@ diff -urNp linux-2.6.32.11/include/net/tcp.h linux-2.6.32.11/include/net/tcp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.11/include/net/udp.h linux-2.6.32.11/include/net/udp.h ---- linux-2.6.32.11/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/net/udp.h linux-2.6.32.14/include/net/udp.h +--- linux-2.6.32.14/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -46558,9 +47225,9 @@ diff -urNp linux-2.6.32.11/include/net/udp.h linux-2.6.32.11/include/net/udp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/sound/ac97_codec.h ---- linux-2.6.32.11/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/sound/ac97_codec.h linux-2.6.32.14/include/sound/ac97_codec.h +--- linux-2.6.32.14/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -46593,9 +47260,9 @@ diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/so void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.11/include/trace/events/irq.h linux-2.6.32.11/include/trace/events/irq.h ---- linux-2.6.32.11/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/trace/events/irq.h linux-2.6.32.14/include/trace/events/irq.h +--- linux-2.6.32.14/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400 @@ -34,7 +34,7 @@ */ TRACE_EVENT(irq_handler_entry, @@ -46632,9 +47299,9 @@ diff -urNp linux-2.6.32.11/include/trace/events/irq.h linux-2.6.32.11/include/tr TP_ARGS(h, vec), -diff -urNp linux-2.6.32.11/include/video/uvesafb.h linux-2.6.32.11/include/video/uvesafb.h ---- linux-2.6.32.11/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/include/video/uvesafb.h linux-2.6.32.14/include/video/uvesafb.h +--- linux-2.6.32.14/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -46643,9 +47310,9 @@ diff -urNp linux-2.6.32.11/include/video/uvesafb.h linux-2.6.32.11/include/video void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.11/init/do_mounts.c linux-2.6.32.11/init/do_mounts.c ---- linux-2.6.32.11/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/do_mounts.c 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/init/do_mounts.c linux-2.6.32.14/init/do_mounts.c +--- linux-2.6.32.14/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -46691,9 +47358,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts.c linux-2.6.32.11/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } -diff -urNp linux-2.6.32.11/init/do_mounts.h linux-2.6.32.11/init/do_mounts.h ---- linux-2.6.32.11/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/init/do_mounts.h linux-2.6.32.14/init/do_mounts.h +--- linux-2.6.32.14/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -46713,9 +47380,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts.h linux-2.6.32.11/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.11/init/do_mounts_initrd.c linux-2.6.32.11/init/do_mounts_initrd.c ---- linux-2.6.32.11/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -0400 +diff -urNp linux-2.6.32.14/init/do_mounts_initrd.c linux-2.6.32.14/init/do_mounts_initrd.c +--- linux-2.6.32.14/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); sys_close(0);sys_close(1);sys_close(2); @@ -46799,9 +47466,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts_initrd.c linux-2.6.32.11/init/do_mount + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.11/init/do_mounts_md.c linux-2.6.32.11/init/do_mounts_md.c ---- linux-2.6.32.11/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/init/do_mounts_md.c linux-2.6.32.14/init/do_mounts_md.c +--- linux-2.6.32.14/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -46829,9 +47496,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts_md.c linux-2.6.32.11/init/do_mounts_md if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c ---- linux-2.6.32.11/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/init/initramfs.c linux-2.6.32.14/init/initramfs.c +--- linux-2.6.32.14/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 ++++ linux-2.6.32.14/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -46940,9 +47607,9 @@ diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig ---- linux-2.6.32.11/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/Kconfig 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/init/Kconfig linux-2.6.32.14/init/Kconfig +--- linux-2.6.32.14/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/init/Kconfig 2010-05-29 16:35:52.581909467 -0400 @@ -1026,7 +1026,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -46952,21 +47619,9 @@ diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -@@ -1116,9 +1116,9 @@ config HAVE_GENERIC_DMA_COHERENT - - config SLABINFO - bool -- depends on PROC_FS -+ depends on PROC_FS && !GRKERNSEC_PROC_ADD - depends on SLAB || SLUB_DEBUG -- default y -+ default n - - config RT_MUTEXES - boolean -diff -urNp linux-2.6.32.11/init/main.c linux-2.6.32.11/init/main.c ---- linux-2.6.32.11/init/main.c 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.11/init/main.c 2010-04-04 20:58:33.225084964 -0400 +diff -urNp linux-2.6.32.14/init/main.c linux-2.6.32.14/init/main.c +--- linux-2.6.32.14/init/main.c 2010-04-04 20:41:50.060586306 -0400 ++++ linux-2.6.32.14/init/main.c 2010-05-28 21:27:16.427051097 -0400 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -47111,9 +47766,9 @@ diff -urNp linux-2.6.32.11/init/main.c linux-2.6.32.11/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.32.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c ---- linux-2.6.32.11/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/init/noinitramfs.c linux-2.6.32.14/init/noinitramfs.c +--- linux-2.6.32.14/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -47132,9 +47787,9 @@ diff -urNp linux-2.6.32.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.32.11/ipc/ipc_sysctl.c linux-2.6.32.11/ipc/ipc_sysctl.c ---- linux-2.6.32.11/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/ipc/ipc_sysctl.c linux-2.6.32.14/ipc/ipc_sysctl.c +--- linux-2.6.32.14/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -47153,9 +47808,9 @@ diff -urNp linux-2.6.32.11/ipc/ipc_sysctl.c linux-2.6.32.11/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.32.11/ipc/mqueue.c linux-2.6.32.11/ipc/mqueue.c ---- linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 -+++ linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/ipc/mqueue.c linux-2.6.32.14/ipc/mqueue.c +--- linux-2.6.32.14/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 ++++ linux-2.6.32.14/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -47164,9 +47819,9 @@ diff -urNp linux-2.6.32.11/ipc/mqueue.c linux-2.6.32.11/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.32.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c ---- linux-2.6.32.11/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/ipc/shm.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/ipc/shm.c linux-2.6.32.14/ipc/shm.c +--- linux-2.6.32.14/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -47219,9 +47874,9 @@ diff -urNp linux-2.6.32.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.32.11/kernel/acct.c linux-2.6.32.11/kernel/acct.c ---- linux-2.6.32.11/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/acct.c linux-2.6.32.14/kernel/acct.c +--- linux-2.6.32.14/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -47231,9 +47886,9 @@ diff -urNp linux-2.6.32.11/kernel/acct.c linux-2.6.32.11/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.32.11/kernel/capability.c linux-2.6.32.11/kernel/capability.c ---- linux-2.6.32.11/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/capability.c linux-2.6.32.14/kernel/capability.c +--- linux-2.6.32.14/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -47257,9 +47912,9 @@ diff -urNp linux-2.6.32.11/kernel/capability.c linux-2.6.32.11/kernel/capability + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c ---- linux-2.6.32.11/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/configs.c linux-2.6.32.14/kernel/configs.c +--- linux-2.6.32.14/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -47280,9 +47935,9 @@ diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.32.11/kernel/cpu.c linux-2.6.32.11/kernel/cpu.c ---- linux-2.6.32.11/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/cpu.c linux-2.6.32.14/kernel/cpu.c +--- linux-2.6.32.14/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -47292,9 +47947,9 @@ diff -urNp linux-2.6.32.11/kernel/cpu.c linux-2.6.32.11/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.32.11/kernel/cred.c linux-2.6.32.11/kernel/cred.c ---- linux-2.6.32.11/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/cred.c linux-2.6.32.14/kernel/cred.c +--- linux-2.6.32.14/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 ++++ linux-2.6.32.14/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400 @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -47304,9 +47959,9 @@ diff -urNp linux-2.6.32.11/kernel/cred.c linux-2.6.32.11/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.32.11/kernel/exit.c linux-2.6.32.11/kernel/exit.c ---- linux-2.6.32.11/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/exit.c linux-2.6.32.14/kernel/exit.c +--- linux-2.6.32.14/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #include "cred-internals.h" @@ -47396,9 +48051,9 @@ diff -urNp linux-2.6.32.11/kernel/exit.c linux-2.6.32.11/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c ---- linux-2.6.32.11/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/fork.c linux-2.6.32.14/kernel/fork.c +--- linux-2.6.32.14/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -47495,7 +48150,7 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c init_sigpending(&p->pending); p->utime = cputime_zero; -@@ -1179,6 +1212,8 @@ static struct task_struct *copy_process( +@@ -1177,6 +1210,8 @@ static struct task_struct *copy_process( goto bad_fork_free_pid; } @@ -47504,7 +48159,7 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; /* * Clear TID on mm_release()? -@@ -1344,6 +1379,8 @@ bad_fork_cleanup_count: +@@ -1342,6 +1377,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -47513,7 +48168,7 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c return ERR_PTR(retval); } -@@ -1437,6 +1474,8 @@ long do_fork(unsigned long clone_flags, +@@ -1435,6 +1472,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -47522,7 +48177,7 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1569,7 +1608,7 @@ static int unshare_fs(unsigned long unsh +@@ -1567,7 +1606,7 @@ static int unshare_fs(unsigned long unsh return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -47531,7 +48186,7 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c return 0; *new_fsp = copy_fs_struct(fs); -@@ -1689,14 +1728,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, +@@ -1687,14 +1726,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, task_lock(current); if (new_fs) { @@ -47551,9 +48206,9 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c } if (new_mm) { -diff -urNp linux-2.6.32.11/kernel/futex.c linux-2.6.32.11/kernel/futex.c ---- linux-2.6.32.11/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400 +diff -urNp linux-2.6.32.14/kernel/futex.c linux-2.6.32.14/kernel/futex.c +--- linux-2.6.32.14/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -47621,9 +48276,9 @@ diff -urNp linux-2.6.32.11/kernel/futex.c linux-2.6.32.11/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.32.11/kernel/futex_compat.c linux-2.6.32.11/kernel/futex_compat.c ---- linux-2.6.32.11/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/futex_compat.c linux-2.6.32.14/kernel/futex_compat.c +--- linux-2.6.32.14/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -47661,9 +48316,9 @@ diff -urNp linux-2.6.32.11/kernel/futex_compat.c linux-2.6.32.11/kernel/futex_co head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c ---- linux-2.6.32.11/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/gcov/base.c linux-2.6.32.14/kernel/gcov/base.c +--- linux-2.6.32.14/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -47685,9 +48340,9 @@ diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c ---- linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 -+++ linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/hrtimer.c linux-2.6.32.14/kernel/hrtimer.c +--- linux-2.6.32.14/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 ++++ linux-2.6.32.14/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400 @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -47697,9 +48352,9 @@ diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.32.11/kernel/kallsyms.c linux-2.6.32.11/kernel/kallsyms.c ---- linux-2.6.32.11/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/kallsyms.c 2010-04-06 22:21:53.692294722 -0400 +diff -urNp linux-2.6.32.14/kernel/kallsyms.c linux-2.6.32.14/kernel/kallsyms.c +--- linux-2.6.32.14/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -47776,9 +48431,9 @@ diff -urNp linux-2.6.32.11/kernel/kallsyms.c linux-2.6.32.11/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.11/kernel/kgdb.c linux-2.6.32.11/kernel/kgdb.c ---- linux-2.6.32.11/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/kgdb.c linux-2.6.32.14/kernel/kgdb.c +--- linux-2.6.32.14/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -47806,9 +48461,9 @@ diff -urNp linux-2.6.32.11/kernel/kgdb.c linux-2.6.32.11/kernel/kgdb.c { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c ---- linux-2.6.32.11/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/kmod.c linux-2.6.32.14/kernel/kmod.c +--- linux-2.6.32.14/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -47828,9 +48483,9 @@ diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -diff -urNp linux-2.6.32.11/kernel/kprobes.c linux-2.6.32.11/kernel/kprobes.c ---- linux-2.6.32.11/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/kprobes.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/kprobes.c linux-2.6.32.14/kernel/kprobes.c +--- linux-2.6.32.14/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -47849,9 +48504,27 @@ diff -urNp linux-2.6.32.11/kernel/kprobes.c linux-2.6.32.11/kernel/kprobes.c kfree(kip); } return 1; -diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c ---- linux-2.6.32.11/kernel/lockdep.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/lockdep.c 2010-04-04 20:46:41.693491350 -0400 +@@ -1189,7 +1189,7 @@ static int __init init_kprobes(void) + { + int i, err = 0; + unsigned long offset = 0, size = 0; +- char *modname, namebuf[128]; ++ char *modname, namebuf[KSYM_NAME_LEN]; + const char *symbol_name; + void *addr; + struct kprobe_blackpoint *kb; +@@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(st + const char *sym = NULL; + unsigned int i = *(loff_t *) v; + unsigned long offset = 0; +- char *modname, namebuf[128]; ++ char *modname, namebuf[KSYM_NAME_LEN]; + + head = &kprobe_table[i]; + preempt_disable(); +diff -urNp linux-2.6.32.14/kernel/lockdep.c linux-2.6.32.14/kernel/lockdep.c +--- linux-2.6.32.14/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400 ++++ linux-2.6.32.14/kernel/lockdep.c 2010-05-28 21:27:16.439128347 -0400 @@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -47866,9 +48539,9 @@ diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c @@ -592,8 +596,7 @@ static int static_obj(void *obj) */ for_each_possible_cpu(i) { - start = (unsigned long) &__per_cpu_start + per_cpu_offset(i); -- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM -- + per_cpu_offset(i); + start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i); +- end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i) +- + PERCPU_ENOUGH_ROOM; + end = start + PERCPU_ENOUGH_ROOM; if ((addr >= start) && (addr < end)) @@ -47881,9 +48554,21 @@ diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c ---- linux-2.6.32.11/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/module.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/lockdep_proc.c linux-2.6.32.14/kernel/lockdep_proc.c +--- linux-2.6.32.14/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400 +@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v + + static void print_name(struct seq_file *m, struct lock_class *class) + { +- char str[128]; ++ char str[KSYM_NAME_LEN]; + const char *name = class->name; + + if (!name) { +diff -urNp linux-2.6.32.14/kernel/module.c linux-2.6.32.14/kernel/module.c +--- linux-2.6.32.14/kernel/module.c 2010-04-29 17:49:38.586002480 -0400 ++++ linux-2.6.32.14/kernel/module.c 2010-05-28 21:27:16.439128347 -0400 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); @@ -48423,9 +49108,9 @@ diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.32.11/kernel/panic.c linux-2.6.32.11/kernel/panic.c ---- linux-2.6.32.11/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/panic.c linux-2.6.32.14/kernel/panic.c +--- linux-2.6.32.14/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400 @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) @@ -48436,9 +49121,9 @@ diff -urNp linux-2.6.32.11/kernel/panic.c linux-2.6.32.11/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c ---- linux-2.6.32.11/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/params.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/params.c linux-2.6.32.14/kernel/params.c +--- linux-2.6.32.14/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/params.c 2010-05-28 21:27:16.442904432 -0400 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -48457,9 +49142,9 @@ diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.32.11/kernel/pid.c linux-2.6.32.11/kernel/pid.c ---- linux-2.6.32.11/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400 +diff -urNp linux-2.6.32.14/kernel/pid.c linux-2.6.32.14/kernel/pid.c +--- linux-2.6.32.14/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -48493,9 +49178,9 @@ diff -urNp linux-2.6.32.11/kernel/pid.c linux-2.6.32.11/kernel/pid.c } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.32.11/kernel/posix-cpu-timers.c linux-2.6.32.11/kernel/posix-cpu-timers.c ---- linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/posix-cpu-timers.c linux-2.6.32.14/kernel/posix-cpu-timers.c +--- linux-2.6.32.14/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -48520,9 +49205,9 @@ diff -urNp linux-2.6.32.11/kernel/posix-cpu-timers.c linux-2.6.32.11/kernel/posi if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { /* * At the soft limit, send a SIGXCPU every second. -diff -urNp linux-2.6.32.11/kernel/power/hibernate.c linux-2.6.32.11/kernel/power/hibernate.c ---- linux-2.6.32.11/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/power/hibernate.c linux-2.6.32.14/kernel/power/hibernate.c +--- linux-2.6.32.14/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -48540,9 +49225,9 @@ diff -urNp linux-2.6.32.11/kernel/power/hibernate.c linux-2.6.32.11/kernel/power { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/poweroff.c ---- linux-2.6.32.11/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/power/poweroff.c linux-2.6.32.14/kernel/power/poweroff.c +--- linux-2.6.32.14/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -48552,9 +49237,9 @@ diff -urNp linux-2.6.32.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/ { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.11/kernel/power/process.c linux-2.6.32.11/kernel/power/process.c ---- linux-2.6.32.11/kernel/power/process.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/power/process.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/power/process.c linux-2.6.32.14/kernel/power/process.c +--- linux-2.6.32.14/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 ++++ linux-2.6.32.14/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -48594,9 +49279,9 @@ diff -urNp linux-2.6.32.11/kernel/power/process.c linux-2.6.32.11/kernel/power/p do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/suspend.c ---- linux-2.6.32.11/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/power/suspend.c linux-2.6.32.14/kernel/power/suspend.c +--- linux-2.6.32.14/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -48613,9 +49298,9 @@ diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/s { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.32.11/kernel/printk.c linux-2.6.32.11/kernel/printk.c ---- linux-2.6.32.11/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/printk.c linux-2.6.32.14/kernel/printk.c +--- linux-2.6.32.14/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -48628,9 +49313,9 @@ diff -urNp linux-2.6.32.11/kernel/printk.c linux-2.6.32.11/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.11/kernel/ptrace.c linux-2.6.32.11/kernel/ptrace.c ---- linux-2.6.32.11/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/ptrace.c linux-2.6.32.14/kernel/ptrace.c +--- linux-2.6.32.14/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -48712,9 +49397,9 @@ diff -urNp linux-2.6.32.11/kernel/ptrace.c linux-2.6.32.11/kernel/ptrace.c } int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) -diff -urNp linux-2.6.32.11/kernel/rcutree.c linux-2.6.32.11/kernel/rcutree.c ---- linux-2.6.32.11/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/rcutree.c linux-2.6.32.14/kernel/rcutree.c +--- linux-2.6.32.14/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -48724,9 +49409,9 @@ diff -urNp linux-2.6.32.11/kernel/rcutree.c linux-2.6.32.11/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c ---- linux-2.6.32.11/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/relay.c linux-2.6.32.14/kernel/relay.c +--- linux-2.6.32.14/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -48736,9 +49421,9 @@ diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.32.11/kernel/resource.c linux-2.6.32.11/kernel/resource.c ---- linux-2.6.32.11/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400 +diff -urNp linux-2.6.32.14/kernel/resource.c linux-2.6.32.14/kernel/resource.c +--- linux-2.6.32.14/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -48758,10 +49443,10 @@ diff -urNp linux-2.6.32.11/kernel/resource.c linux-2.6.32.11/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c ---- linux-2.6.32.11/kernel/sched.c 2010-04-04 20:41:50.068477203 -0400 -+++ linux-2.6.32.11/kernel/sched.c 2010-04-04 20:46:41.697788265 -0400 -@@ -4843,7 +4843,7 @@ out: +diff -urNp linux-2.6.32.14/kernel/sched.c linux-2.6.32.14/kernel/sched.c +--- linux-2.6.32.14/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 ++++ linux-2.6.32.14/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400 +@@ -4841,7 +4841,7 @@ out: * In CONFIG_NO_HZ case, the idle load balance owner will do the * rebalancing for all the cpus for whom scheduler ticks are stopped. */ @@ -48770,7 +49455,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c { int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); -@@ -6112,6 +6112,8 @@ int can_nice(const struct task_struct *p +@@ -6110,6 +6110,8 @@ int can_nice(const struct task_struct *p /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -48779,7 +49464,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } -@@ -6145,7 +6147,8 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -6143,7 +6145,8 @@ SYSCALL_DEFINE1(nice, int, increment) if (nice > 19) nice = 19; @@ -48789,7 +49474,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c return -EPERM; retval = security_task_setnice(current, nice); -@@ -6295,6 +6298,8 @@ recheck: +@@ -6293,6 +6296,8 @@ recheck: if (rt_policy(policy)) { unsigned long rlim_rtprio; @@ -48798,7 +49483,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c if (!lock_task_sighand(p, &flags)) return -ESRCH; rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; -@@ -7447,7 +7452,7 @@ static struct ctl_table sd_ctl_dir[] = { +@@ -7452,7 +7457,7 @@ static struct ctl_table sd_ctl_dir[] = { .procname = "sched_domain", .mode = 0555, }, @@ -48807,7 +49492,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c }; static struct ctl_table sd_ctl_root[] = { -@@ -7457,7 +7462,7 @@ static struct ctl_table sd_ctl_root[] = +@@ -7462,7 +7467,7 @@ static struct ctl_table sd_ctl_root[] = .mode = 0555, .child = sd_ctl_dir, }, @@ -48816,9 +49501,33 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c ---- linux-2.6.32.11/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/signal.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/signal.c linux-2.6.32.14/kernel/signal.c +--- linux-2.6.32.14/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400 +@@ -41,12 +41,12 @@ + + static struct kmem_cache *sigqueue_cachep; + +-static void __user *sig_handler(struct task_struct *t, int sig) ++static __sighandler_t sig_handler(struct task_struct *t, int sig) + { + return t->sighand->action[sig - 1].sa.sa_handler; + } + +-static int sig_handler_ignored(void __user *handler, int sig) ++static int sig_handler_ignored(__sighandler_t handler, int sig) + { + /* Is it explicitly or implicitly ignored? */ + return handler == SIG_IGN || +@@ -56,7 +56,7 @@ static int sig_handler_ignored(void __us + static int sig_task_ignored(struct task_struct *t, int sig, + int from_ancestor_ns) + { +- void __user *handler; ++ __sighandler_t handler; + + handler = sig_handler(t, sig); + @@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc */ user = get_uid(__task_cred(t)->user); @@ -48829,6 +49538,15 @@ diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c if (override_rlimit || atomic_read(&user->sigpending) <= t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur) +@@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct + + int unhandled_signal(struct task_struct *tsk, int sig) + { +- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler; ++ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler; + if (is_global_init(tsk)) + return 1; + if (handler != SIG_IGN && handler != SIG_DFL) @@ -625,6 +628,9 @@ static int check_kill_permission(int sig } } @@ -48871,9 +49589,9 @@ diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c return ret; } -diff -urNp linux-2.6.32.11/kernel/smp.c linux-2.6.32.11/kernel/smp.c ---- linux-2.6.32.11/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/smp.c linux-2.6.32.14/kernel/smp.c +--- linux-2.6.32.14/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400 @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -48901,9 +49619,9 @@ diff -urNp linux-2.6.32.11/kernel/smp.c linux-2.6.32.11/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.11/kernel/softirq.c linux-2.6.32.11/kernel/softirq.c ---- linux-2.6.32.11/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/softirq.c linux-2.6.32.14/kernel/softirq.c +--- linux-2.6.32.14/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -48958,9 +49676,9 @@ diff -urNp linux-2.6.32.11/kernel/softirq.c linux-2.6.32.11/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c ---- linux-2.6.32.11/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/sys.c linux-2.6.32.14/kernel/sys.c +--- linux-2.6.32.14/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -49096,9 +49814,9 @@ diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c ---- linux-2.6.32.11/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/sysctl.c linux-2.6.32.14/kernel/sysctl.c +--- linux-2.6.32.14/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -49220,9 +49938,9 @@ diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.32.11/kernel/taskstats.c linux-2.6.32.11/kernel/taskstats.c ---- linux-2.6.32.11/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/taskstats.c linux-2.6.32.14/kernel/taskstats.c +--- linux-2.6.32.14/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -49246,9 +49964,9 @@ diff -urNp linux-2.6.32.11/kernel/taskstats.c linux-2.6.32.11/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/time/tick-broadcast.c ---- linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/time/tick-broadcast.c linux-2.6.32.14/kernel/time/tick-broadcast.c +--- linux-2.6.32.14/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -49258,9 +49976,9 @@ diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/t cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c ---- linux-2.6.32.11/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/time.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/time.c linux-2.6.32.14/kernel/time.c +--- linux-2.6.32.14/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/time.c 2010-05-28 21:27:16.451020026 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -49298,9 +50016,9 @@ diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.11/kernel/timer.c linux-2.6.32.11/kernel/timer.c ---- linux-2.6.32.11/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/timer.c linux-2.6.32.14/kernel/timer.c +--- linux-2.6.32.14/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400 @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -49310,9 +50028,9 @@ diff -urNp linux-2.6.32.11/kernel/timer.c linux-2.6.32.11/kernel/timer.c { struct tvec_base *base = __get_cpu_var(tvec_bases); -diff -urNp linux-2.6.32.11/kernel/trace/ftrace.c linux-2.6.32.11/kernel/trace/ftrace.c ---- linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 -+++ linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/trace/ftrace.c linux-2.6.32.14/kernel/trace/ftrace.c +--- linux-2.6.32.14/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 ++++ linux-2.6.32.14/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400 @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, ip = rec->ip; @@ -49334,9 +50052,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/ftrace.c linux-2.6.32.11/kernel/trace/ft } /* -diff -urNp linux-2.6.32.11/kernel/trace/Kconfig linux-2.6.32.11/kernel/trace/Kconfig ---- linux-2.6.32.11/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400 +diff -urNp linux-2.6.32.14/kernel/trace/Kconfig linux-2.6.32.14/kernel/trace/Kconfig +--- linux-2.6.32.14/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400 @@ -126,6 +126,7 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" @@ -49353,9 +50071,21 @@ diff -urNp linux-2.6.32.11/kernel/trace/Kconfig linux-2.6.32.11/kernel/trace/Kco select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/trace.c ---- linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/kernel/trace/ring_buffer.c linux-2.6.32.14/kernel/trace/ring_buffer.c +--- linux-2.6.32.14/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 ++++ linux-2.6.32.14/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400 +@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st + * the reader page). But if the next page is a header page, + * its flags will be non zero. + */ +-static int inline ++static inline int + rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, + struct buffer_page *page, struct list_head *list) + { +diff -urNp linux-2.6.32.14/kernel/trace/trace.c linux-2.6.32.14/kernel/trace/trace.c +--- linux-2.6.32.14/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 ++++ linux-2.6.32.14/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400 @@ -3808,10 +3808,9 @@ static const struct file_operations trac }; #endif @@ -49380,9 +50110,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/tra static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.32.11/kernel/trace/trace_events.c linux-2.6.32.11/kernel/trace/trace_events.c ---- linux-2.6.32.11/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/kernel/trace/trace_events.c linux-2.6.32.14/kernel/trace/trace_events.c +--- linux-2.6.32.14/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -49392,9 +50122,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_events.c linux-2.6.32.11/kernel/tr struct ftrace_module_file_ops { struct list_head list; struct module *mod; -diff -urNp linux-2.6.32.11/kernel/trace/trace_output.c linux-2.6.32.11/kernel/trace/trace_output.c ---- linux-2.6.32.11/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/kernel/trace/trace_output.c linux-2.6.32.14/kernel/trace/trace_output.c +--- linux-2.6.32.14/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, return 0; p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -49404,9 +50134,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_output.c linux-2.6.32.11/kernel/tr if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/trace/trace_stack.c ---- linux-2.6.32.11/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/kernel/trace/trace_stack.c linux-2.6.32.14/kernel/trace/trace_stack.c +--- linux-2.6.32.14/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -49416,9 +50146,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/tra return; local_irq_save(flags); -diff -urNp linux-2.6.32.11/kernel/utsname_sysctl.c linux-2.6.32.11/kernel/utsname_sysctl.c ---- linux-2.6.32.11/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/kernel/utsname_sysctl.c linux-2.6.32.14/kernel/utsname_sysctl.c +--- linux-2.6.32.14/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -49437,9 +50167,9 @@ diff -urNp linux-2.6.32.11/kernel/utsname_sysctl.c linux-2.6.32.11/kernel/utsnam }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c ---- linux-2.6.32.11/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/bug.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/bug.c linux-2.6.32.14/lib/bug.c +--- linux-2.6.32.14/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/bug.c 2010-05-28 21:27:16.451020026 -0400 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -49449,9 +50179,9 @@ diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c printk(KERN_EMERG "------------[ cut here ]------------\n"); -diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c ---- linux-2.6.32.11/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/debugobjects.c linux-2.6.32.14/lib/debugobjects.c +--- linux-2.6.32.14/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -49461,9 +50191,9 @@ diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.32.11/lib/dma-debug.c linux-2.6.32.11/lib/dma-debug.c ---- linux-2.6.32.11/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/dma-debug.c linux-2.6.32.14/lib/dma-debug.c +--- linux-2.6.32.14/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400 @@ -861,7 +861,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -49473,9 +50203,9 @@ diff -urNp linux-2.6.32.11/lib/dma-debug.c linux-2.6.32.11/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-2.6.32.11/lib/idr.c linux-2.6.32.11/lib/idr.c ---- linux-2.6.32.11/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/idr.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/idr.c linux-2.6.32.14/lib/idr.c +--- linux-2.6.32.14/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/idr.c 2010-05-28 21:27:16.463242745 -0400 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; @@ -49485,9 +50215,9 @@ diff -urNp linux-2.6.32.11/lib/idr.c linux-2.6.32.11/lib/idr.c *starting_id = id; return IDR_NEED_TO_GROW; } -diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c ---- linux-2.6.32.11/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/inflate.c linux-2.6.32.14/lib/inflate.c +--- linux-2.6.32.14/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -49497,9 +50227,9 @@ diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/lib/Kconfig.debug ---- linux-2.6.32.11/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/Kconfig.debug linux-2.6.32.14/lib/Kconfig.debug +--- linux-2.6.32.14/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -49509,9 +50239,9 @@ diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.32.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c ---- linux-2.6.32.11/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/kobject.c linux-2.6.32.14/lib/kobject.c +--- linux-2.6.32.14/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -49539,9 +50269,9 @@ diff -urNp linux-2.6.32.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.11/lib/kobject_uevent.c linux-2.6.32.11/lib/kobject_uevent.c ---- linux-2.6.32.11/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/kobject_uevent.c linux-2.6.32.14/lib/kobject_uevent.c +--- linux-2.6.32.14/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -49551,9 +50281,9 @@ diff -urNp linux-2.6.32.11/lib/kobject_uevent.c linux-2.6.32.11/lib/kobject_ueve u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c ---- linux-2.6.32.11/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/parser.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/parser.c linux-2.6.32.14/lib/parser.c +--- linux-2.6.32.14/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/parser.c 2010-05-28 21:27:16.463242745 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -49563,9 +50293,9 @@ diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.11/lib/radix-tree.c linux-2.6.32.11/lib/radix-tree.c ---- linux-2.6.32.11/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/radix-tree.c linux-2.6.32.14/lib/radix-tree.c +--- linux-2.6.32.14/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -49575,9 +50305,9 @@ diff -urNp linux-2.6.32.11/lib/radix-tree.c linux-2.6.32.11/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.11/lib/random32.c linux-2.6.32.11/lib/random32.c ---- linux-2.6.32.11/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/lib/random32.c 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/lib/random32.c linux-2.6.32.14/lib/random32.c +--- linux-2.6.32.14/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/lib/random32.c 2010-05-28 21:27:16.471246042 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -49587,14 +50317,14 @@ diff -urNp linux-2.6.32.11/lib/random32.c linux-2.6.32.11/lib/random32.c } /** -diff -urNp linux-2.6.32.11/localversion-grsec linux-2.6.32.11/localversion-grsec ---- linux-2.6.32.11/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.11/localversion-grsec 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/localversion-grsec linux-2.6.32.14/localversion-grsec +--- linux-2.6.32.14/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.14/localversion-grsec 2010-05-28 21:27:16.471246042 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile ---- linux-2.6.32.11/Makefile 2010-04-04 20:41:49.914404054 -0400 -+++ linux-2.6.32.11/Makefile 2010-04-04 20:46:41.705142860 -0400 +diff -urNp linux-2.6.32.14/Makefile linux-2.6.32.14/Makefile +--- linux-2.6.32.14/Makefile 2010-05-28 20:16:44.396488303 -0400 ++++ linux-2.6.32.14/Makefile 2010-05-28 21:27:16.474989604 -0400 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -49615,9 +50345,9 @@ diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c ---- linux-2.6.32.11/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/filemap.c linux-2.6.32.14/mm/filemap.c +--- linux-2.6.32.14/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400 @@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -49635,9 +50365,9 @@ diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.11/mm/fremap.c linux-2.6.32.11/mm/fremap.c ---- linux-2.6.32.11/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/fremap.c linux-2.6.32.14/mm/fremap.c +--- linux-2.6.32.14/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -49650,9 +50380,9 @@ diff -urNp linux-2.6.32.11/mm/fremap.c linux-2.6.32.11/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c ---- linux-2.6.32.11/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/highmem.c linux-2.6.32.14/mm/highmem.c +--- linux-2.6.32.14/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -49678,10 +50408,10 @@ diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c ---- linux-2.6.32.11/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400 -@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s +diff -urNp linux-2.6.32.14/mm/hugetlb.c linux-2.6.32.14/mm/hugetlb.c +--- linux-2.6.32.14/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400 +@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -49708,7 +50438,7 @@ diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, pte_t *ptep, pte_t pte, struct page *pagecache_page) -@@ -1995,6 +2015,11 @@ retry_avoidcopy: +@@ -1996,6 +2016,11 @@ retry_avoidcopy: huge_ptep_clear_flush(vma, address, ptep); set_huge_pte_at(mm, address, ptep, make_huge_pte(vma, new_page, 1)); @@ -49720,7 +50450,7 @@ diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c /* Make the old page be freed below */ new_page = old_page; } -@@ -2124,6 +2149,10 @@ retry: +@@ -2127,6 +2152,10 @@ retry: && (vma->vm_flags & VM_SHARED))); set_huge_pte_at(mm, address, ptep, new_pte); @@ -49731,7 +50461,7 @@ diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page); -@@ -2152,6 +2181,28 @@ int hugetlb_fault(struct mm_struct *mm, +@@ -2155,6 +2184,28 @@ int hugetlb_fault(struct mm_struct *mm, static DEFINE_MUTEX(hugetlb_instantiation_mutex); struct hstate *h = hstate_vma(vma); @@ -49760,9 +50490,9 @@ diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.32.11/mm/Kconfig linux-2.6.32.11/mm/Kconfig ---- linux-2.6.32.11/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/Kconfig linux-2.6.32.14/mm/Kconfig +--- linux-2.6.32.14/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -49772,9 +50502,9 @@ diff -urNp linux-2.6.32.11/mm/Kconfig linux-2.6.32.11/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.11/mm/maccess.c linux-2.6.32.11/mm/maccess.c ---- linux-2.6.32.11/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/maccess.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/maccess.c linux-2.6.32.14/mm/maccess.c +--- linux-2.6.32.14/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. @@ -49793,9 +50523,9 @@ diff -urNp linux-2.6.32.11/mm/maccess.c linux-2.6.32.11/mm/maccess.c { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.32.11/mm/madvise.c linux-2.6.32.11/mm/madvise.c ---- linux-2.6.32.11/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/madvise.c linux-2.6.32.14/mm/madvise.c +--- linux-2.6.32.14/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -49872,9 +50602,9 @@ diff -urNp linux-2.6.32.11/mm/madvise.c linux-2.6.32.11/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.32.11/mm/memory.c linux-2.6.32.11/mm/memory.c ---- linux-2.6.32.11/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/memory.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/memory.c linux-2.6.32.14/mm/memory.c +--- linux-2.6.32.14/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/memory.c 2010-05-28 21:27:16.487251224 -0400 @@ -48,6 +48,7 @@ #include <linux/ksm.h> #include <linux/rmap.h> @@ -50279,9 +51009,9 @@ diff -urNp linux-2.6.32.11/mm/memory.c linux-2.6.32.11/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.32.11/mm/memory-failure.c linux-2.6.32.11/mm/memory-failure.c ---- linux-2.6.32.11/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/memory-failure.c linux-2.6.32.14/mm/memory-failure.c +--- linux-2.6.32.14/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -50300,9 +51030,9 @@ diff -urNp linux-2.6.32.11/mm/memory-failure.c linux-2.6.32.11/mm/memory-failure /* * We need/can do nothing about count=0 pages. -diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/mm/mempolicy.c ---- linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 -+++ linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/mempolicy.c linux-2.6.32.14/mm/mempolicy.c +--- linux-2.6.32.14/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 ++++ linux-2.6.32.14/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -50383,9 +51113,9 @@ diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.32.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c ---- linux-2.6.32.11/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/migrate.c linux-2.6.32.14/mm/migrate.c +--- linux-2.6.32.14/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -50411,9 +51141,9 @@ diff -urNp linux-2.6.32.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.32.11/mm/mlock.c linux-2.6.32.11/mm/mlock.c ---- linux-2.6.32.11/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400 +diff -urNp linux-2.6.32.14/mm/mlock.c linux-2.6.32.14/mm/mlock.c +--- linux-2.6.32.14/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -50482,9 +51212,9 @@ diff -urNp linux-2.6.32.11/mm/mlock.c linux-2.6.32.11/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.32.11/mm/mmap.c linux-2.6.32.11/mm/mmap.c ---- linux-2.6.32.11/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400 +diff -urNp linux-2.6.32.14/mm/mmap.c linux-2.6.32.14/mm/mmap.c +--- linux-2.6.32.14/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -51573,9 +52303,9 @@ diff -urNp linux-2.6.32.11/mm/mmap.c linux-2.6.32.11/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c ---- linux-2.6.32.11/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400 +diff -urNp linux-2.6.32.14/mm/mprotect.c linux-2.6.32.14/mm/mprotect.c +--- linux-2.6.32.14/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -51696,9 +52426,16 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c /* * First try to merge with previous and/or next vma. */ -@@ -196,8 +284,14 @@ success: +@@ -195,9 +283,21 @@ success: + * vm_flags and vm_page_prot are protected by the mmap_sem * held in write mode. */ ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ)) ++ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ; ++#endif ++ vma->vm_flags = newflags; + +#ifdef CONFIG_PAX_MPROTECT @@ -51712,7 +52449,7 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c if (vma_wants_writenotify(vma)) { vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); -@@ -238,6 +332,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -238,6 +338,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, end = start + len; if (end <= start) return -ENOMEM; @@ -51730,7 +52467,7 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c if (!arch_validate_prot(prot)) return -EINVAL; -@@ -245,7 +350,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -245,7 +356,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, /* * Does the application expect PROT_READ to imply PROT_EXEC: */ @@ -51739,7 +52476,7 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c prot |= PROT_EXEC; vm_flags = calc_vm_prot_bits(prot); -@@ -277,6 +382,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -277,6 +388,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (start > vma->vm_start) prev = vma; @@ -51756,7 +52493,7 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c for (nstart = start ; ; ) { unsigned long newflags; -@@ -301,6 +416,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -301,6 +422,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (error) goto out; perf_event_mmap(vma); @@ -51766,9 +52503,9 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.11/mm/mremap.c linux-2.6.32.11/mm/mremap.c ---- linux-2.6.32.11/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400 +diff -urNp linux-2.6.32.14/mm/mremap.c linux-2.6.32.14/mm/mremap.c +--- linux-2.6.32.14/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -51869,9 +52606,9 @@ diff -urNp linux-2.6.32.11/mm/mremap.c linux-2.6.32.11/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c ---- linux-2.6.32.11/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400 +diff -urNp linux-2.6.32.14/mm/nommu.c linux-2.6.32.14/mm/nommu.c +--- linux-2.6.32.14/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400 @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); @@ -51888,9 +52625,9 @@ diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.11/mm/page_alloc.c linux-2.6.32.11/mm/page_alloc.c ---- linux-2.6.32.11/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/page_alloc.c 2010-04-04 20:46:41.713805609 -0400 +diff -urNp linux-2.6.32.14/mm/page_alloc.c linux-2.6.32.14/mm/page_alloc.c +--- linux-2.6.32.14/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400 @@ -586,6 +586,10 @@ static void __free_pages_ok(struct page int bad = 0; int wasMlocked = __TestClearPageMlocked(page); @@ -51938,9 +52675,18 @@ diff -urNp linux-2.6.32.11/mm/page_alloc.c linux-2.6.32.11/mm/page_alloc.c arch_free_page(page, 0); kernel_map_pages(page, 1, 0); -diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/mm/percpu.c ---- linux-2.6.32.11/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400 +@@ -3723,7 +3740,7 @@ static void __init setup_usemap(struct p + zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize); + } + #else +-static void inline setup_usemap(struct pglist_data *pgdat, ++static inline void setup_usemap(struct pglist_data *pgdat, + struct zone *zone, unsigned long zonesize) {} + #endif /* CONFIG_SPARSEMEM */ + +diff -urNp linux-2.6.32.14/mm/percpu.c linux-2.6.32.14/mm/percpu.c +--- linux-2.6.32.14/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -51950,9 +52696,9 @@ diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.32.11/mm/rmap.c linux-2.6.32.11/mm/rmap.c ---- linux-2.6.32.11/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400 +diff -urNp linux-2.6.32.14/mm/rmap.c linux-2.6.32.14/mm/rmap.c +--- linux-2.6.32.14/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400 @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -51964,7 +52710,7 @@ diff -urNp linux-2.6.32.11/mm/rmap.c linux-2.6.32.11/mm/rmap.c anon_vma = find_mergeable_anon_vma(vma); allocated = NULL; if (!anon_vma) { -@@ -121,6 +125,15 @@ int anon_vma_prepare(struct vm_area_stru +@@ -121,6 +125,16 @@ int anon_vma_prepare(struct vm_area_stru /* page_table_lock to protect against threads */ spin_lock(&mm->page_table_lock); if (likely(!vma->anon_vma)) { @@ -51972,17 +52718,18 @@ diff -urNp linux-2.6.32.11/mm/rmap.c linux-2.6.32.11/mm/rmap.c +#ifdef CONFIG_PAX_SEGMEXEC + vma_m = pax_find_mirror_vma(vma); + if (vma_m) { ++ BUG_ON(vma_m->anon_vma); + vma_m->anon_vma = anon_vma; -+ __anon_vma_link(vma_m); ++ list_add_tail(&vma_m->anon_vma_node, &anon_vma->head); + } +#endif + vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.32.11/mm/shmem.c linux-2.6.32.11/mm/shmem.c ---- linux-2.6.32.11/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/mm/shmem.c linux-2.6.32.14/mm/shmem.c +--- linux-2.6.32.14/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -51992,9 +52739,9 @@ diff -urNp linux-2.6.32.11/mm/shmem.c linux-2.6.32.11/mm/shmem.c #ifdef CONFIG_SHMEM /* -diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c ---- linux-2.6.32.11/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/slab.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/mm/slab.c linux-2.6.32.14/mm/slab.c +--- linux-2.6.32.14/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/slab.c 2010-05-29 17:19:33.609046968 -0400 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -52031,16 +52778,24 @@ diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c /* internal cache of cache description objs */ static struct kmem_cache cache_cache = { -@@ -4082,7 +4082,7 @@ out: - schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC)); - } +@@ -4471,15 +4471,63 @@ static const struct file_operations proc --#ifdef CONFIG_SLABINFO -+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) - - static void print_slabinfo_header(struct seq_file *m) + static int __init slab_proc_init(void) { -@@ -4480,6 +4480,51 @@ static int __init slab_proc_init(void) +- proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); ++ mode_t gr_mode = S_IRUGO; ++ ++#ifdef CONFIG_GRKERNSEC_PROC_ADD ++ gr_mode = S_IRUSR; ++#endif ++ ++ proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations); + #ifdef CONFIG_DEBUG_SLAB_LEAK +- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); ++ proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations); + #endif + return 0; + } module_init(slab_proc_init); #endif @@ -52054,10 +52809,7 @@ diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c + unsigned int objnr; + unsigned long offset; + -+ if (!n) -+ return; -+ -+ if (ZERO_OR_NULL_PTR(ptr)) ++ if (ZERO_OR_NULL_PTR(ptr) && n) + goto report; + + if (!virt_addr_valid(ptr)) @@ -52092,9 +52844,9 @@ diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c ---- linux-2.6.32.11/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/slob.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c +--- linux-2.6.32.14/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/slob.c 2010-05-29 17:20:26.289194269 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -52240,7 +52992,7 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c EXPORT_SYMBOL(__kmalloc_node); void kfree(const void *block) -@@ -528,13 +540,84 @@ void kfree(const void *block) +@@ -528,13 +540,81 @@ void kfree(const void *block) sp = slob_page(block); if (is_slob_page(sp)) { int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); @@ -52266,10 +53018,7 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c + const slob_t *free; + const void *base; + -+ if (!n) -+ return; -+ -+ if (ZERO_OR_NULL_PTR(ptr)) ++ if (ZERO_OR_NULL_PTR(ptr) && n) + goto report; + + if (!virt_addr_valid(ptr)) @@ -52328,7 +53077,7 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c /* can't use ksize for kmem_cache_alloc memory, only kmalloc */ size_t ksize(const void *block) { -@@ -547,10 +630,10 @@ size_t ksize(const void *block) +@@ -547,10 +627,10 @@ size_t ksize(const void *block) sp = slob_page(block); if (is_slob_page(sp)) { int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); @@ -52342,7 +53091,7 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c } EXPORT_SYMBOL(ksize); -@@ -605,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_ +@@ -605,17 +685,25 @@ void *kmem_cache_alloc_node(struct kmem_ { void *b; @@ -52368,7 +53117,7 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c if (c->ctor) c->ctor(b); -@@ -627,10 +718,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); +@@ -627,10 +715,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); static void __kmem_cache_free(void *b, int size) { @@ -52387,7 +53136,7 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c } static void kmem_rcu_free(struct rcu_head *head) -@@ -643,15 +740,24 @@ static void kmem_rcu_free(struct rcu_hea +@@ -643,15 +737,24 @@ static void kmem_rcu_free(struct rcu_hea void kmem_cache_free(struct kmem_cache *c, void *b) { @@ -52415,9 +53164,9 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c ---- linux-2.6.32.11/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/slub.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c +--- linux-2.6.32.14/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/slub.c 2010-05-29 17:20:09.189015611 -0400 @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * page = virt_to_head_page(x); @@ -52455,7 +53204,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c list_del(&s->list); up_write(&slub_lock); if (kmem_cache_close(s)) { -@@ -2915,6 +2916,46 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -2915,6 +2916,43 @@ void *__kmalloc_node(size_t size, gfp_t EXPORT_SYMBOL(__kmalloc_node); #endif @@ -52467,10 +53216,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c + struct kmem_cache *s; + unsigned long offset; + -+ if (!n) -+ return; -+ -+ if (ZERO_OR_NULL_PTR(ptr)) ++ if (ZERO_OR_NULL_PTR(ptr) && n) + goto report; + + if (!virt_addr_valid(ptr)) @@ -52502,7 +53248,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c size_t ksize(const void *object) { struct page *page; -@@ -3186,7 +3227,7 @@ void __init kmem_cache_init(void) +@@ -3186,7 +3224,7 @@ void __init kmem_cache_init(void) */ create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node", sizeof(struct kmem_cache_node), GFP_NOWAIT); @@ -52511,7 +53257,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c caches++; hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI); -@@ -3293,7 +3334,7 @@ static int slab_unmergeable(struct kmem_ +@@ -3293,7 +3331,7 @@ static int slab_unmergeable(struct kmem_ /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -52520,7 +53266,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c return 1; return 0; -@@ -3353,7 +3394,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3353,7 +3391,7 @@ struct kmem_cache *kmem_cache_create(con if (s) { int cpu; @@ -52529,7 +53275,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3372,7 +3413,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3372,7 +3410,7 @@ struct kmem_cache *kmem_cache_create(con if (sysfs_slab_alias(s, name)) { down_write(&slub_lock); @@ -52538,7 +53284,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c up_write(&slub_lock); goto err; } -@@ -4101,7 +4142,7 @@ SLAB_ATTR_RO(ctor); +@@ -4101,7 +4139,7 @@ SLAB_ATTR_RO(ctor); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -52547,7 +53293,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c } SLAB_ATTR_RO(aliases); -@@ -4503,7 +4544,7 @@ static void kmem_cache_release(struct ko +@@ -4503,7 +4541,7 @@ static void kmem_cache_release(struct ko kfree(s); } @@ -52556,7 +53302,7 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c .show = slab_attr_show, .store = slab_attr_store, }; -@@ -4522,7 +4563,7 @@ static int uevent_filter(struct kset *ks +@@ -4522,7 +4560,7 @@ static int uevent_filter(struct kset *ks return 0; } @@ -52565,18 +53311,24 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c .filter = uevent_filter, }; -@@ -4696,7 +4737,7 @@ __initcall(slab_sysfs_init); - /* - * The /proc/slabinfo ABI - */ --#ifdef CONFIG_SLABINFO -+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) - static void print_slabinfo_header(struct seq_file *m) - { - seq_puts(m, "slabinfo - version: 2.1\n"); -diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c ---- linux-2.6.32.11/mm/util.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/util.c 2010-04-04 20:46:41.716811517 -0400 +@@ -4785,7 +4823,13 @@ static const struct file_operations proc + + static int __init slab_proc_init(void) + { +- proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations); ++ mode_t gr_mode = S_IRUGO; ++ ++#ifdef CONFIG_GRKERNSEC_PROC_ADD ++ gr_mode = S_IRUSR; ++#endif ++ ++ proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations); + return 0; + } + module_init(slab_proc_init); +diff -urNp linux-2.6.32.14/mm/util.c linux-2.6.32.14/mm/util.c +--- linux-2.6.32.14/mm/util.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/util.c 2010-05-28 21:27:16.563017088 -0400 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -52590,9 +53342,9 @@ diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c ---- linux-2.6.32.11/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/mm/vmalloc.c linux-2.6.32.14/mm/vmalloc.c +--- linux-2.6.32.14/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -52704,12 +53456,12 @@ diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c BUG_ON(in_interrupt()); + -+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) + if (flags & VM_KERNEXEC) { + if (start != VMALLOC_START || end != VMALLOC_END) + return NULL; -+ start = (unsigned long)&MODULES_EXEC_VADDR; -+ end = (unsigned long)&MODULES_EXEC_END; ++ start = (unsigned long)MODULES_EXEC_VADDR; ++ end = (unsigned long)MODULES_EXEC_END; + } +#endif + @@ -52720,7 +53472,7 @@ diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c if (count > totalram_pages) return NULL; -+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) + if (!(pgprot_val(prot) & _PAGE_NX)) + flags |= VM_KERNEXEC; +#endif @@ -52732,7 +53484,7 @@ diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c if (!size || (size >> PAGE_SHIFT) > totalram_pages) return NULL; -+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) + if (!(pgprot_val(prot) & _PAGE_NX)) + area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END, + node, gfp_mask, caller); @@ -52803,9 +53555,22 @@ diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.32.11/net/atm/atm_misc.c linux-2.6.32.11/net/atm/atm_misc.c ---- linux-2.6.32.11/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/net/8021q/vlan.c linux-2.6.32.14/net/8021q/vlan.c +--- linux-2.6.32.14/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400 +@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net + err = -EPERM; + if (!capable(CAP_NET_ADMIN)) + break; +- if ((args.u.name_type >= 0) && +- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) { ++ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) { + struct vlan_net *vn; + + vn = net_generic(net, vlan_net_id); +diff -urNp linux-2.6.32.14/net/atm/atm_misc.c linux-2.6.32.14/net/atm/atm_misc.c +--- linux-2.6.32.14/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -52842,9 +53607,9 @@ diff -urNp linux-2.6.32.11/net/atm/atm_misc.c linux-2.6.32.11/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c ---- linux-2.6.32.11/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/net/atm/proc.c linux-2.6.32.14/net/atm/proc.c +--- linux-2.6.32.14/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -52858,9 +53623,9 @@ diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-2.6.32.11/net/atm/resources.c linux-2.6.32.11/net/atm/resources.c ---- linux-2.6.32.11/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/atm/resources.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/net/atm/resources.c linux-2.6.32.14/net/atm/resources.c +--- linux-2.6.32.14/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -52879,9 +53644,9 @@ diff -urNp linux-2.6.32.11/net/atm/resources.c linux-2.6.32.11/net/atm/resources __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.11/net/bridge/br_private.h linux-2.6.32.11/net/bridge/br_private.h ---- linux-2.6.32.11/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/net/bridge/br_private.h linux-2.6.32.14/net/bridge/br_private.h +--- linux-2.6.32.14/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS @@ -52891,9 +53656,9 @@ diff -urNp linux-2.6.32.11/net/bridge/br_private.h linux-2.6.32.11/net/bridge/br extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.11/net/bridge/br_stp_if.c linux-2.6.32.11/net/bridge/br_stp_if.c ---- linux-2.6.32.11/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/net/bridge/br_stp_if.c linux-2.6.32.14/net/bridge/br_stp_if.c +--- linux-2.6.32.14/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -52903,9 +53668,9 @@ diff -urNp linux-2.6.32.11/net/bridge/br_stp_if.c linux-2.6.32.11/net/bridge/br_ printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.32.11/net/bridge/br_sysfs_if.c linux-2.6.32.11/net/bridge/br_sysfs_if.c ---- linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400 +diff -urNp linux-2.6.32.14/net/bridge/br_sysfs_if.c linux-2.6.32.14/net/bridge/br_sysfs_if.c +--- linux-2.6.32.14/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -52915,9 +53680,9 @@ diff -urNp linux-2.6.32.11/net/bridge/br_sysfs_if.c linux-2.6.32.11/net/bridge/b .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.32.11/net/core/dev.c linux-2.6.32.11/net/core/dev.c ---- linux-2.6.32.11/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/core/dev.c linux-2.6.32.14/net/core/dev.c +--- linux-2.6.32.14/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400 @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -52936,9 +53701,9 @@ diff -urNp linux-2.6.32.11/net/core/dev.c linux-2.6.32.11/net/core/dev.c { struct list_head *list = &__get_cpu_var(softnet_data).poll_list; unsigned long time_limit = jiffies + 2; -diff -urNp linux-2.6.32.11/net/core/flow.c linux-2.6.32.11/net/core/flow.c ---- linux-2.6.32.11/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/core/flow.c linux-2.6.32.14/net/core/flow.c +--- linux-2.6.32.14/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -52966,9 +53731,9 @@ diff -urNp linux-2.6.32.11/net/core/flow.c linux-2.6.32.11/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.32.11/net/dccp/ccids/ccid3.c linux-2.6.32.11/net/dccp/ccids/ccid3.c ---- linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/dccp/ccids/ccid3.c linux-2.6.32.14/net/dccp/ccids/ccid3.c +--- linux-2.6.32.14/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400 @@ -41,7 +41,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -52978,9 +53743,9 @@ diff -urNp linux-2.6.32.11/net/dccp/ccids/ccid3.c linux-2.6.32.11/net/dccp/ccids #endif /* -diff -urNp linux-2.6.32.11/net/dccp/dccp.h linux-2.6.32.11/net/dccp/dccp.h ---- linux-2.6.32.11/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/dccp/dccp.h linux-2.6.32.14/net/dccp/dccp.h +--- linux-2.6.32.14/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400 @@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) @@ -52994,9 +53759,9 @@ diff -urNp linux-2.6.32.11/net/dccp/dccp.h linux-2.6.32.11/net/dccp/dccp.h #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.32.11/net/decnet/sysctl_net_decnet.c linux-2.6.32.11/net/decnet/sysctl_net_decnet.c ---- linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/decnet/sysctl_net_decnet.c linux-2.6.32.14/net/decnet/sysctl_net_decnet.c +--- linux-2.6.32.14/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -53015,9 +53780,9 @@ diff -urNp linux-2.6.32.11/net/decnet/sysctl_net_decnet.c linux-2.6.32.11/net/de return -EFAULT; *lenp = len; -diff -urNp linux-2.6.32.11/net/ipv4/inet_hashtables.c linux-2.6.32.11/net/ipv4/inet_hashtables.c ---- linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/inet_hashtables.c linux-2.6.32.14/net/ipv4/inet_hashtables.c +--- linux-2.6.32.14/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -53042,9 +53807,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/inet_hashtables.c linux-2.6.32.11/net/ipv4/i if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -53054,9 +53819,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1 if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.11/net/ipv4/tcp_ipv4.c linux-2.6.32.11/net/ipv4/tcp_ipv4.c ---- linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/tcp_ipv4.c linux-2.6.32.14/net/ipv4/tcp_ipv4.c +--- linux-2.6.32.14/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400 @@ -84,6 +84,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; @@ -53101,9 +53866,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_ipv4.c linux-2.6.32.11/net/ipv4/tcp_ipv4 tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.11/net/ipv4/tcp_minisocks.c linux-2.6.32.11/net/ipv4/tcp_minisocks.c ---- linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/tcp_minisocks.c linux-2.6.32.14/net/ipv4/tcp_minisocks.c +--- linux-2.6.32.14/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400 @@ -26,6 +26,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -53126,9 +53891,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_minisocks.c linux-2.6.32.11/net/ipv4/tcp if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-2.6.32.11/net/ipv4/tcp_probe.c linux-2.6.32.11/net/ipv4/tcp_probe.c ---- linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/tcp_probe.c linux-2.6.32.14/net/ipv4/tcp_probe.c +--- linux-2.6.32.14/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -53138,9 +53903,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_probe.c linux-2.6.32.11/net/ipv4/tcp_pro return -EFAULT; cnt += width; } -diff -urNp linux-2.6.32.11/net/ipv4/tcp_timer.c linux-2.6.32.11/net/ipv4/tcp_timer.c ---- linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/tcp_timer.c linux-2.6.32.14/net/ipv4/tcp_timer.c +--- linux-2.6.32.14/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400 @@ -21,6 +21,10 @@ #include <linux/module.h> #include <net/tcp.h> @@ -53166,9 +53931,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_timer.c linux-2.6.32.11/net/ipv4/tcp_tim if (retransmits_timed_out(sk, retry_until)) { /* Has it gone just too far? */ tcp_write_err(sk); -diff -urNp linux-2.6.32.11/net/ipv4/udp.c linux-2.6.32.11/net/ipv4/udp.c ---- linux-2.6.32.11/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/ipv4/udp.c linux-2.6.32.14/net/ipv4/udp.c +--- linux-2.6.32.14/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -53238,9 +54003,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/udp.c linux-2.6.32.11/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.32.11/net/ipv6/exthdrs.c linux-2.6.32.11/net/ipv6/exthdrs.c ---- linux-2.6.32.11/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/ipv6/exthdrs.c linux-2.6.32.14/net/ipv6/exthdrs.c +--- linux-2.6.32.14/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -53250,9 +54015,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/exthdrs.c linux-2.6.32.11/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c ---- linux-2.6.32.11/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/ipv6/raw.c linux-2.6.32.14/net/ipv6/raw.c +--- linux-2.6.32.14/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -53262,9 +54027,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.32.11/net/ipv6/tcp_ipv6.c linux-2.6.32.11/net/ipv6/tcp_ipv6.c ---- linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/ipv6/tcp_ipv6.c linux-2.6.32.14/net/ipv6/tcp_ipv6.c +--- linux-2.6.32.14/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv6/tcp_ipv6.c 2010-05-28 21:27:16.624385427 -0400 @@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; @@ -53285,9 +54050,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/tcp_ipv6.c linux-2.6.32.11/net/ipv6/tcp_ipv6 tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.11/net/ipv6/udp.c linux-2.6.32.11/net/ipv6/udp.c ---- linux-2.6.32.11/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/ipv6/udp.c linux-2.6.32.14/net/ipv6/udp.c +--- linux-2.6.32.14/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/ipv6/udp.c 2010-05-28 21:27:16.631258014 -0400 @@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -53298,9 +54063,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/udp.c linux-2.6.32.11/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -53423,9 +54188,9 @@ diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/net/irda seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.32.11/net/mac80211/ieee80211_i.h linux-2.6.32.11/net/mac80211/ieee80211_i.h ---- linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 -+++ linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/mac80211/ieee80211_i.h linux-2.6.32.14/net/mac80211/ieee80211_i.h +--- linux-2.6.32.14/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 ++++ linux-2.6.32.14/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400 @@ -635,7 +635,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -53435,9 +54200,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/ieee80211_i.h linux-2.6.32.11/net/mac802 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; -diff -urNp linux-2.6.32.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/iface.c ---- linux-2.6.32.11/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/mac80211/iface.c linux-2.6.32.14/net/mac80211/iface.c +--- linux-2.6.32.14/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -53492,9 +54257,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/ifa ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); -diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main.c ---- linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 -+++ linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/mac80211/main.c linux-2.6.32.14/net/mac80211/main.c +--- linux-2.6.32.14/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 ++++ linux-2.6.32.14/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -53504,9 +54269,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c ---- linux-2.6.32.11/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/mac80211/pm.c linux-2.6.32.14/net/mac80211/pm.c +--- linux-2.6.32.14/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -53516,9 +54281,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate.c ---- linux-2.6.32.11/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/mac80211/rate.c linux-2.6.32.14/net/mac80211/rate.c +--- linux-2.6.32.14/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -53528,9 +54293,21 @@ diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util.c ---- linux-2.6.32.11/net/mac80211/util.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/mac80211/util.c 2010-04-04 20:46:41.724917264 -0400 +diff -urNp linux-2.6.32.14/net/mac80211/tx.c linux-2.6.32.14/net/mac80211/tx.c +--- linux-2.6.32.14/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 ++++ linux-2.6.32.14/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400 +@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct + return cpu_to_le16(dur); + } + +-static int inline is_ieee80211_device(struct ieee80211_local *local, ++static inline int is_ieee80211_device(struct ieee80211_local *local, + struct net_device *dev) + { + return local == wdev_priv(dev->ieee80211_ptr); +diff -urNp linux-2.6.32.14/net/mac80211/util.c linux-2.6.32.14/net/mac80211/util.c +--- linux-2.6.32.14/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 ++++ linux-2.6.32.14/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400 @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -53548,9 +54325,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util if (res) { WARN(local->suspended, "Harware became unavailable " "upon resume. This is could be a software issue" -diff -urNp linux-2.6.32.11/net/sctp/socket.c linux-2.6.32.11/net/sctp/socket.c ---- linux-2.6.32.11/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/net/sctp/socket.c linux-2.6.32.14/net/sctp/socket.c +--- linux-2.6.32.14/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -53568,9 +54345,9 @@ diff -urNp linux-2.6.32.11/net/sctp/socket.c linux-2.6.32.11/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.32.11/net/socket.c linux-2.6.32.11/net/socket.c ---- linux-2.6.32.11/net/socket.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/socket.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/net/socket.c linux-2.6.32.14/net/socket.c +--- linux-2.6.32.14/net/socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/socket.c 2010-05-28 21:27:16.671255671 -0400 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> @@ -53725,9 +54502,9 @@ diff -urNp linux-2.6.32.11/net/socket.c linux-2.6.32.11/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta len -= *ppos; if (len > *lenp) @@ -53737,9 +54514,9 @@ diff -urNp linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.11/net/su return -EFAULT; *lenp = len; *ppos += len; -diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c ---- linux-2.6.32.11/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/net/sysctl_net.c linux-2.6.32.14/net/sysctl_net.c +--- linux-2.6.32.14/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -53749,9 +54526,24 @@ diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.11/net/unix/af_unix.c linux-2.6.32.11/net/unix/af_unix.c ---- linux-2.6.32.11/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/net/tipc/socket.c linux-2.6.32.14/net/tipc/socket.c +--- linux-2.6.32.14/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400 +@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, + } else { + if (res == 0) + res = -ETIMEDOUT; +- else +- ; /* leave "res" unchanged */ ++ else { ++ /* leave "res" unchanged */ ++ } + sock->state = SS_DISCONNECTING; + } + +diff -urNp linux-2.6.32.14/net/unix/af_unix.c linux-2.6.32.14/net/unix/af_unix.c +--- linux-2.6.32.14/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -53809,9 +54601,52 @@ diff -urNp linux-2.6.32.11/net/unix/af_unix.c linux-2.6.32.11/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/samples/kobject/kset-example.c ---- linux-2.6.32.11/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/net/wireless/wext.c linux-2.6.32.14/net/wireless/wext.c +--- linux-2.6.32.14/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400 +@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc + */ + + /* Support for very large requests */ +- if ((descr->flags & IW_DESCR_FLAG_NOMAX) && +- (user_length > descr->max_tokens)) { ++ if (user_length > descr->max_tokens) { + /* Allow userspace to GET more than max so + * we can support any size GET requests. + * There is still a limit : -ENOMEM. +diff -urNp linux-2.6.32.14/net/xfrm/xfrm_policy.c linux-2.6.32.14/net/xfrm/xfrm_policy.c +--- linux-2.6.32.14/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400 +@@ -1477,7 +1477,7 @@ free_dst: + goto out; + } + +-static int inline ++static inline int + xfrm_dst_alloc_copy(void **target, void *src, int size) + { + if (!*target) { +@@ -1489,7 +1489,7 @@ xfrm_dst_alloc_copy(void **target, void + return 0; + } + +-static int inline ++static inline int + xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel) + { + #ifdef CONFIG_XFRM_SUB_POLICY +@@ -1501,7 +1501,7 @@ xfrm_dst_update_parent(struct dst_entry + #endif + } + +-static int inline ++static inline int + xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) + { + #ifdef CONFIG_XFRM_SUB_POLICY +diff -urNp linux-2.6.32.14/samples/kobject/kset-example.c linux-2.6.32.14/samples/kobject/kset-example.c +--- linux-2.6.32.14/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -53821,9 +54656,9 @@ diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/sample .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.32.11/scripts/basic/fixdep.c linux-2.6.32.11/scripts/basic/fixdep.c ---- linux-2.6.32.11/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/basic/fixdep.c linux-2.6.32.14/scripts/basic/fixdep.c +--- linux-2.6.32.14/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen static void parse_config_file(char *map, size_t len) @@ -53845,9 +54680,9 @@ diff -urNp linux-2.6.32.11/scripts/basic/fixdep.c linux-2.6.32.11/scripts/basic/ if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.32.11/scripts/kallsyms.c linux-2.6.32.11/scripts/kallsyms.c ---- linux-2.6.32.11/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/kallsyms.c linux-2.6.32.14/scripts/kallsyms.c +--- linux-2.6.32.14/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400 @@ -43,10 +43,10 @@ struct text_range { static unsigned long long _text; @@ -53863,9 +54698,9 @@ diff -urNp linux-2.6.32.11/scripts/kallsyms.c linux-2.6.32.11/scripts/kallsyms.c }; #define text_range_text (&text_ranges[0]) #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/file2alias.c ---- linux-2.6.32.11/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/mod/file2alias.c linux-2.6.32.14/scripts/mod/file2alias.c +--- linux-2.6.32.14/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -53920,9 +54755,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/ sprintf(alias, "dmi*"); -diff -urNp linux-2.6.32.11/scripts/mod/modpost.c linux-2.6.32.11/scripts/mod/modpost.c ---- linux-2.6.32.11/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/mod/modpost.c linux-2.6.32.14/scripts/mod/modpost.c +--- linux-2.6.32.14/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -53990,9 +54825,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/modpost.c linux-2.6.32.11/scripts/mod/mod goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.11/scripts/mod/modpost.h linux-2.6.32.11/scripts/mod/modpost.h ---- linux-2.6.32.11/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/mod/modpost.h linux-2.6.32.14/scripts/mod/modpost.h +--- linux-2.6.32.14/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -54012,9 +54847,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/modpost.h linux-2.6.32.11/scripts/mod/mod struct module { struct module *next; -diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/sumversion.c ---- linux-2.6.32.11/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/mod/sumversion.c linux-2.6.32.14/scripts/mod/sumversion.c +--- linux-2.6.32.14/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -54024,9 +54859,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/ warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.11/scripts/pnmtologo.c linux-2.6.32.11/scripts/pnmtologo.c ---- linux-2.6.32.11/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/scripts/pnmtologo.c linux-2.6.32.14/scripts/pnmtologo.c +--- linux-2.6.32.14/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -54053,9 +54888,9 @@ diff -urNp linux-2.6.32.11/scripts/pnmtologo.c linux-2.6.32.11/scripts/pnmtologo logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.11/security/commoncap.c linux-2.6.32.11/security/commoncap.c ---- linux-2.6.32.11/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/security/commoncap.c linux-2.6.32.14/security/commoncap.c +--- linux-2.6.32.14/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400 @@ -27,7 +27,7 @@ #include <linux/sched.h> #include <linux/prctl.h> @@ -54078,9 +54913,9 @@ diff -urNp linux-2.6.32.11/security/commoncap.c linux-2.6.32.11/security/commonc return 0; } -diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/security/integrity/ima/ima_api.c ---- linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/security/integrity/ima/ima_api.c linux-2.6.32.14/security/integrity/ima/ima_api.c +--- linux-2.6.32.14/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -54090,9 +54925,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/secu entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.11/security/integrity/ima/ima_fs.c linux-2.6.32.11/security/integrity/ima/ima_fs.c ---- linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/security/integrity/ima/ima_fs.c linux-2.6.32.14/security/integrity/ima/ima_fs.c +--- linux-2.6.32.14/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400 @@ -27,12 +27,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -54108,9 +54943,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_fs.c linux-2.6.32.11/secur return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security/integrity/ima/ima.h ---- linux-2.6.32.11/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/security/integrity/ima/ima.h linux-2.6.32.14/security/integrity/ima/ima.h +--- linux-2.6.32.14/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -54122,9 +54957,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.11/security/integrity/ima/ima_queue.c linux-2.6.32.11/security/integrity/ima/ima_queue.c ---- linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -0400 +diff -urNp linux-2.6.32.14/security/integrity/ima/ima_queue.c linux-2.6.32.14/security/integrity/ima/ima_queue.c +--- linux-2.6.32.14/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -54134,9 +54969,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_queue.c linux-2.6.32.11/se key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig ---- linux-2.6.32.11/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/security/Kconfig 2010-04-04 21:03:05.108480196 -0400 +diff -urNp linux-2.6.32.14/security/Kconfig linux-2.6.32.14/security/Kconfig +--- linux-2.6.32.14/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/security/Kconfig 2010-05-28 21:27:16.694974041 -0400 @@ -4,6 +4,499 @@ menu "Security options" @@ -54145,6 +54980,15 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig + +menu "PaX" + ++ config PAX_PER_CPU_PGD ++ bool ++ ++ config TASK_SIZE_MAX_SHIFT ++ int ++ depends on X86_64 ++ default 47 if !PAX_PER_CPU_PGD ++ default 42 if PAX_PER_CPU_PGD ++ +config PAX + bool "Enable various PaX features" + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86) @@ -54229,15 +55073,6 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig + bool 'hook' +endchoice + -+ config PAX_PER_CPU_PGD -+ bool -+ -+ config TASK_SIZE_MAX_SHIFT -+ int -+ depends on X86_64 -+ default 47 if !PAX_PER_CPU_PGD -+ default 42 if PAX_PER_CPU_PGD -+ +endmenu + +menu "Non-executable pages" @@ -54646,9 +55481,9 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.11/security/min_addr.c linux-2.6.32.11/security/min_addr.c ---- linux-2.6.32.11/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400 -+++ linux-2.6.32.11/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/security/min_addr.c linux-2.6.32.14/security/min_addr.c +--- linux-2.6.32.14/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400 ++++ linux-2.6.32.14/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -54665,9 +55500,9 @@ diff -urNp linux-2.6.32.11/security/min_addr.c linux-2.6.32.11/security/min_addr } /* -diff -urNp linux-2.6.32.11/sound/aoa/codecs/onyx.c linux-2.6.32.11/sound/aoa/codecs/onyx.c ---- linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/aoa/codecs/onyx.c linux-2.6.32.14/sound/aoa/codecs/onyx.c +--- linux-2.6.32.14/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -54696,9 +55531,9 @@ diff -urNp linux-2.6.32.11/sound/aoa/codecs/onyx.c linux-2.6.32.11/sound/aoa/cod onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.32.11/sound/core/oss/pcm_oss.c linux-2.6.32.11/sound/core/oss/pcm_oss.c ---- linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/core/oss/pcm_oss.c linux-2.6.32.14/sound/core/oss/pcm_oss.c +--- linux-2.6.32.14/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -54710,9 +55545,9 @@ diff -urNp linux-2.6.32.11/sound/core/oss/pcm_oss.c linux-2.6.32.11/sound/core/o #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/seq/seq_lock.h ---- linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/core/seq/seq_lock.h linux-2.6.32.14/sound/core/seq/seq_lock.h +--- linux-2.6.32.14/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -54728,9 +55563,9 @@ diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/ #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.32.11/sound/drivers/mts64.c linux-2.6.32.11/sound/drivers/mts64.c ---- linux-2.6.32.11/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/drivers/mts64.c linux-2.6.32.14/sound/drivers/mts64.c +--- linux-2.6.32.14/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; int pardev_claimed; @@ -54779,9 +55614,9 @@ diff -urNp linux-2.6.32.11/sound/drivers/mts64.c linux-2.6.32.11/sound/drivers/m return 0; } -diff -urNp linux-2.6.32.11/sound/drivers/portman2x4.c linux-2.6.32.11/sound/drivers/portman2x4.c ---- linux-2.6.32.11/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/drivers/portman2x4.c linux-2.6.32.14/sound/drivers/portman2x4.c +--- linux-2.6.32.14/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; int pardev_claimed; @@ -54791,9 +55626,9 @@ diff -urNp linux-2.6.32.11/sound/drivers/portman2x4.c linux-2.6.32.11/sound/driv int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.11/sound/oss/sb_audio.c linux-2.6.32.11/sound/oss/sb_audio.c ---- linux-2.6.32.11/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/oss/sb_audio.c linux-2.6.32.14/sound/oss/sb_audio.c +--- linux-2.6.32.14/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -54803,9 +55638,9 @@ diff -urNp linux-2.6.32.11/sound/oss/sb_audio.c linux-2.6.32.11/sound/oss/sb_aud if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci/ac97/ac97_codec.c ---- linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/pci/ac97/ac97_codec.c linux-2.6.32.14/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32.14/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -54815,9 +55650,9 @@ diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci/ac97/ac97_patch.c ---- linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 -+++ linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/pci/ac97/ac97_patch.c linux-2.6.32.14/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32.14/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 ++++ linux-2.6.32.14/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -55124,9 +55959,9 @@ diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci .build_specific = patch_ucb1400_specific, }; -diff -urNp linux-2.6.32.11/sound/pci/ens1370.c linux-2.6.32.11/sound/pci/ens1370.c ---- linux-2.6.32.11/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/pci/ens1370.c linux-2.6.32.14/sound/pci/ens1370.c +--- linux-2.6.32.14/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ @@ -55136,9 +55971,27 @@ diff -urNp linux-2.6.32.11/sound/pci/ens1370.c linux-2.6.32.11/sound/pci/ens1370 }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.32.11/sound/pci/intel8x0.c linux-2.6.32.11/sound/pci/intel8x0.c ---- linux-2.6.32.11/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400 +diff -urNp linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c +--- linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400 +@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str + cp_ready); + + /* TODO */ +- if (cp_state) +- ; +- if (cp_ready) +- ; ++ if (cp_state) { ++ } ++ if (cp_ready) { ++ } + } + + +diff -urNp linux-2.6.32.14/sound/pci/intel8x0.c linux-2.6.32.14/sound/pci/intel8x0.c +--- linux-2.6.32.14/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ @@ -55157,9 +56010,9 @@ diff -urNp linux-2.6.32.11/sound/pci/intel8x0.c linux-2.6.32.11/sound/pci/intel8 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.32.11/sound/pci/intel8x0m.c linux-2.6.32.11/sound/pci/intel8x0m.c ---- linux-2.6.32.11/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400 +diff -urNp linux-2.6.32.14/sound/pci/intel8x0m.c linux-2.6.32.14/sound/pci/intel8x0m.c +--- linux-2.6.32.14/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ @@ -55178,9 +56031,9 @@ diff -urNp linux-2.6.32.11/sound/pci/intel8x0m.c linux-2.6.32.11/sound/pci/intel }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.11/usr/gen_init_cpio.c linux-2.6.32.11/usr/gen_init_cpio.c ---- linux-2.6.32.11/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400 +diff -urNp linux-2.6.32.14/usr/gen_init_cpio.c linux-2.6.32.14/usr/gen_init_cpio.c +--- linux-2.6.32.14/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 ++++ linux-2.6.32.14/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -55203,10 +56056,10 @@ diff -urNp linux-2.6.32.11/usr/gen_init_cpio.c linux-2.6.32.11/usr/gen_init_cpio } else break; } -diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main.c ---- linux-2.6.32.11/virt/kvm/kvm_main.c 2010-03-15 11:52:04.000000000 -0400 -+++ linux-2.6.32.11/virt/kvm/kvm_main.c 2010-04-04 20:46:41.737788480 -0400 -@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode +diff -urNp linux-2.6.32.14/virt/kvm/kvm_main.c linux-2.6.32.14/virt/kvm/kvm_main.c +--- linux-2.6.32.14/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 ++++ linux-2.6.32.14/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400 +@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode return 0; } @@ -55214,7 +56067,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main static struct file_operations kvm_vcpu_fops = { .release = kvm_vcpu_release, .unlocked_ioctl = kvm_vcpu_ioctl, -@@ -2341,6 +2342,7 @@ static int kvm_vm_mmap(struct file *file +@@ -2344,6 +2345,7 @@ static int kvm_vm_mmap(struct file *file return 0; } @@ -55222,7 +56075,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main static struct file_operations kvm_vm_fops = { .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, -@@ -2428,6 +2430,7 @@ out: +@@ -2431,6 +2433,7 @@ out: return r; } @@ -55230,7 +56083,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main static struct file_operations kvm_chardev_ops = { .unlocked_ioctl = kvm_dev_ioctl, .compat_ioctl = kvm_dev_ioctl, -@@ -2437,6 +2440,9 @@ static struct miscdevice kvm_dev = { +@@ -2440,6 +2443,9 @@ static struct miscdevice kvm_dev = { KVM_MINOR, "kvm", &kvm_chardev_ops, @@ -55240,7 +56093,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main }; static void hardware_enable(void *junk) -@@ -2711,7 +2717,7 @@ static void kvm_sched_out(struct preempt +@@ -2714,7 +2720,7 @@ static void kvm_sched_out(struct preempt kvm_arch_vcpu_put(vcpu); } diff --git a/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch new file mode 100644 index 0000000000..25dc0dcdc2 --- /dev/null +++ b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch @@ -0,0 +1,14 @@ +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 31f4ba4..f4ea3a0 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1805,7 +1805,7 @@ restart: + /* EREMOTE tells the caller to generate + * a one-shot blackhole route. */ + dst_release(dst); +- xfrm_pols_put(pols, num_pols); ++ xfrm_pols_put(pols, drop_pols); + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); + return -EREMOTE; + } + diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD index 2dce290148..272d63ce02 100644 --- a/main/linux-headers/APKBUILD +++ b/main/linux-headers/APKBUILD @@ -2,7 +2,7 @@ pkgname=linux-headers pkgver=2.6.32.2 _kernver=2.6.32 -pkgrel=1 +pkgrel=2 pkgdesc="Linux system headers" url="http://kernel.org" license='GPL-2' @@ -14,15 +14,23 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 scsi.patch " -build() { - cd $srcdir/linux-$_kernver +prepare() { + cd "$srcdir"/linux-$_kernver if [ "$_kernver" != "$pkgver" ]; then bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1 fi patch -p1 -i "$srcdir"/scsi.patch || return 1 +} + +build() { + return 0 +} + +package() { + cd "$srcdir"/linux-$_kernver mkdir -p "$pkgdir/usr" - make headers_install INSTALL_HDR_PATH="$pkgdir/usr" + make headers_install INSTALL_HDR_PATH="$pkgdir/usr" || return 1 find "$pkgdir/usr" \( -name .install -o -name ..install.cmd \) -exec \ rm -f {} \; diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 05a3114698..c8a5774f01 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,8 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=2.6.32.10 +pkgver=2.6.32.14 + _kernver=2.6.32 pkgrel=0 pkgdesc="Linux kernel with vserver" @@ -14,7 +15,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - http://vserver.13thfloor.at/Experimental/patch-2.6.32.10-vs2.3.0.36.29.2.diff + http://vserver.13thfloor.at/Experimental/patch-2.6.32.14-vs2.3.0.36.29.4.diff kernelconfig.x86 " subpackages="$pkgname-dev" @@ -49,7 +50,10 @@ menuconfig() { build() { cd "$srcdir"/build - make CC="$CC" || return 1 + make CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + || return 1 + } package() { @@ -114,6 +118,6 @@ dev() { } md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 -0f1863836bf96fd0aab128d61eaa5693 patch-2.6.32.10.bz2 -393978a0b5c75b598f9fa711556dd2e1 patch-2.6.32.10-vs2.3.0.36.29.2.diff +90f0ec928aff643f05a8b98fad54b10c patch-2.6.32.14.bz2 +9b580218bcde3965bcb6b161227b99c4 patch-2.6.32.14-vs2.3.0.36.29.4.diff 42ce36a36e7c71ee54761e56d59d17ed kernelconfig.x86" diff --git a/main/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD index 2d94523d8d..d587b1b3a1 100644 --- a/main/lm_sensors/APKBUILD +++ b/main/lm_sensors/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lm_sensors pkgver=3.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." url="http://www.lm-sensors.org/" license="GPL" diff --git a/main/logrotate/APKBUILD b/main/logrotate/APKBUILD index 5eee0d551f..71818db620 100644 --- a/main/logrotate/APKBUILD +++ b/main/logrotate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=logrotate pkgver=3.7.8 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to rotate logfiles" url="https://fedorahosted.org/logrotate/" license="GPL" diff --git a/main/lsof/APKBUILD b/main/lsof/APKBUILD index b5f0018df9..d1cbe620c3 100644 --- a/main/lsof/APKBUILD +++ b/main/lsof/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lsof pkgver=4.83 -pkgrel=0 +pkgrel=1 pkgdesc="LiSt Open Files" url="http://people.freebsd.org/~abe/" license="custom" diff --git a/main/lua-bitlib/APKBUILD b/main/lua-bitlib/APKBUILD index 2a434d3e95..7063b8a869 100644 --- a/main/lua-bitlib/APKBUILD +++ b/main/lua-bitlib/APKBUILD @@ -2,7 +2,7 @@ pkgname=lua-bitlib _name=bitlib pkgver=26 -pkgrel=0 +pkgrel=1 pkgdesc="A lua library providing bitwise operations" url="http://luaforge.net/projects/bitlib" license="MIT/X11" diff --git a/main/lua-discount/APKBUILD b/main/lua-discount/APKBUILD index 9fe7cfd373..be0d689a0f 100644 --- a/main/lua-discount/APKBUILD +++ b/main/lua-discount/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-discount pkgver=1.2.10.1 -pkgrel=0 +pkgrel=1 pkgdesc="Lua binding to discount, a Markdown implementation in C" url="http://asbradbury.org/projects/lua-discount" license="BSD" diff --git a/main/lua-expat/APKBUILD b/main/lua-expat/APKBUILD index e2c58cad63..2063657c5a 100644 --- a/main/lua-expat/APKBUILD +++ b/main/lua-expat/APKBUILD @@ -3,7 +3,7 @@ pkgname=lua-expat _name=luaexpat pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0." url="http://luaforge.net/projects/luaexpat/" license="MIT" diff --git a/main/lua-iconv/APKBUILD b/main/lua-iconv/APKBUILD index 7f2f51718f..a6d29771e8 100644 --- a/main/lua-iconv/APKBUILD +++ b/main/lua-iconv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=lua-iconv pkgver=6 -pkgrel=0 +pkgrel=1 pkgdesc="Lua binding to the POSIX 'iconv' library" url="http://luaforge.net/projects/lua-iconv/" license="MIT" diff --git a/main/lua-md5/APKBUILD b/main/lua-md5/APKBUILD index 79813e53ae..5352d2780e 100644 --- a/main/lua-md5/APKBUILD +++ b/main/lua-md5/APKBUILD @@ -2,7 +2,7 @@ pkgname="lua-md5" _name="md5" pkgver=1.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Basic cryptographic facilities for Lua" url="http://www.keplerproject.org/md5/" license="MIT" diff --git a/main/lua-openrc/APKBUILD b/main/lua-openrc/APKBUILD index 56578c4002..966e1d3cc9 100644 --- a/main/lua-openrc/APKBUILD +++ b/main/lua-openrc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=lua-openrc pkgver=0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Lua module for OpenRC" url="http://git.alpinelinux.org/cgit/lua-openrc/" license="GPL" diff --git a/main/lua-pc/APKBUILD b/main/lua-pc/APKBUILD index 856432058d..9b1b38916b 100644 --- a/main/lua-pc/APKBUILD +++ b/main/lua-pc/APKBUILD @@ -2,7 +2,7 @@ pkgname=lua-pc _name=lpc pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Lua Process Call" url="http://lua.net-core.org/sputnik.lua?p=Telesto:About" license="MIT/X11" diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD index bb90a0c86f..ca9e323f81 100644 --- a/main/lua-posix/APKBUILD +++ b/main/lua-posix/APKBUILD @@ -2,7 +2,7 @@ pkgname=lua-posix _name=luaposix pkgver=5.1.4 -pkgrel=0 +pkgrel=1 pkgdesc="POSIX library for Lua" url="http://luaforge.net/projects/luaposix/" license="MIT" diff --git a/main/lua-socket/APKBUILD b/main/lua-socket/APKBUILD index df001152b7..cc897ae705 100644 --- a/main/lua-socket/APKBUILD +++ b/main/lua-socket/APKBUILD @@ -3,7 +3,7 @@ pkgname=lua-socket _name=luasocket pkgver=2.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language." url="http://luaforge.net/projects/luasocket/" license="MIT" diff --git a/main/lua-sql-mysql/APKBUILD b/main/lua-sql-mysql/APKBUILD index 669ad205fd..517d6a62ff 100644 --- a/main/lua-sql-mysql/APKBUILD +++ b/main/lua-sql-mysql/APKBUILD @@ -2,7 +2,7 @@ pkgname=lua-sql-mysql _name=luasql-mysql pkgver=2.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="MySQL driver for LuaSQL (luasql-mysql)" url="http://www.keplerproject.org/luasql/" license="MIT" diff --git a/main/lua-sql-postgres/APKBUILD b/main/lua-sql-postgres/APKBUILD index 08eb9d966d..d54d34017a 100644 --- a/main/lua-sql-postgres/APKBUILD +++ b/main/lua-sql-postgres/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=lua-sql-postgres pkgver=2.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL driver for LuaSQL" url="http://www.keplerproject.org/luasql/" license="MIT" diff --git a/main/lua-sql-sqlite3/APKBUILD b/main/lua-sql-sqlite3/APKBUILD index e5ace6d60f..677995763f 100644 --- a/main/lua-sql-sqlite3/APKBUILD +++ b/main/lua-sql-sqlite3/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=lua-sql-sqlite3 pkgver=2.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="LuaSQL driver for sqlite3" url="http://www.keplerproject.org/luasql/" license="MIT" diff --git a/main/lua-uuid/APKBUILD b/main/lua-uuid/APKBUILD index 0f8f899be1..82f00bf3a7 100644 --- a/main/lua-uuid/APKBUILD +++ b/main/lua-uuid/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=lua-uuid pkgver=5.1 -pkgrel=0 +pkgrel=1 pkgdesc="Lua library generating universally unique identifiers based on libuuid" url="http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid" license="Public Domain" diff --git a/main/lua-zlib/APKBUILD b/main/lua-zlib/APKBUILD index 6f319b4864..d37adab39d 100644 --- a/main/lua-zlib/APKBUILD +++ b/main/lua-zlib/APKBUILD @@ -4,7 +4,7 @@ pkgname=lua-zlib _name=lzlib pkgver=0.4 _ver=$pkgver-work2 -pkgrel=0 +pkgrel=1 pkgdesc="Lua bindings to the ZLib compression library" url="http://luaforge.net/projects/lzlib/" license="MIT" diff --git a/main/lua/APKBUILD b/main/lua/APKBUILD index 8a770eda83..040ecc75d4 100644 --- a/main/lua/APKBUILD +++ b/main/lua/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua pkgver=5.1.4 -pkgrel=3 +pkgrel=4 pkgdesc="A powerful light-weight programming language designed for extending applications." url="http://www.lua.org/" license="MIT" diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index d9511cf7d3..4be2a3f9bb 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.61 +pkgver=2.02.66 pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" @@ -31,7 +31,9 @@ build () { package() { cd "$srcdir"/LVM2.$pkgver - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" \ + usrlibdir="$pkgdir"/lib \ + install || return 1 install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm @@ -45,6 +47,6 @@ dm() { mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ } -md5sums="0fdac768c78d96525d47b5a3df4c67de LVM2.2.02.61.tgz +md5sums="59766571610a4298f8bedf9f73839050 LVM2.2.02.66.tgz 6f65f902cf19f144a42b8d6aceadf395 lvm.initd ec36d5fe4561220304e406c5c797e71f lvm.confd" diff --git a/main/lzo/APKBUILD b/main/lzo/APKBUILD index a9f2b912e1..aa73d34600 100644 --- a/main/lzo/APKBUILD +++ b/main/lzo/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=lzo pkgver=2.03 -pkgrel=0 +pkgrel=1 pkgdesc="LZO -- a real-time data compression library" url="http://www.oberhumer.com/opensource/lzo" license="GPL" -depends="uclibc" +depends="" makedepends="" install= subpackages="$pkgname-dev" diff --git a/main/m4/APKBUILD b/main/m4/APKBUILD index b1350037ee..098af7b7fa 100644 --- a/main/m4/APKBUILD +++ b/main/m4/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=m4 pkgver=1.4.14 -pkgrel=0 +pkgrel=1 pkgdesc="GNU macro processor" url="http://www.gnu.org/software/m4" depends= diff --git a/main/make/APKBUILD b/main/make/APKBUILD index 5b0137cc88..6e51fb94d8 100644 --- a/main/make/APKBUILD +++ b/main/make/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=make pkgver=3.81 -pkgrel=2 +pkgrel=3 pkgdesc="GNU make utility to maintain groups of programs" url="http://www.gnu.org/software/make" license=GPL diff --git a/main/man/APKBUILD b/main/man/APKBUILD index c6940dbf3b..3be9fdbd1e 100644 --- a/main/man/APKBUILD +++ b/main/man/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man pkgver=1.6f -pkgrel=1 +pkgrel=2 pkgdesc="A utility for reading man pages" url="http://primates.ximian.com/~flucifredi/man/" license="GPL" diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD index ed49a4c6a2..c85f9bae9c 100644 --- a/main/mdadm/APKBUILD +++ b/main/mdadm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mdadm pkgver=3.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="a tool for managing Linux Software RAID arrays" url="http://neil.brown.name/blog/mdadm" license="GPL-2" diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index 0df48f9df9..f371183283 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mercurial -pkgver=1.5.1 +pkgver=1.5.3 pkgrel=0 pkgdesc="A scalable distributed SCM tool" url="http://www.selenic.com/mercurial" @@ -29,4 +29,4 @@ package() { install -Dm644 contrib/vim/HGAnnotate.vim \ "${vimpath}/syntax/HGAnnotate.vim" || return 1 } -md5sums="22eac5602d777f9601e23700e641503f mercurial-1.5.1.tar.gz" +md5sums="0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz" diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 54a8f75c7a..403017613f 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa pkgver=7.7.1 -pkgrel=0 +pkgrel=1 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" license="LGPL" diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD index ad0760285e..d67b1b88b9 100644 --- a/main/midori/APKBUILD +++ b/main/midori/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=midori -pkgver=0.2.4 +pkgver=0.2.6 pkgrel=0 pkgdesc="A lightweight web browser based on Gtk WebKit" url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -45,4 +45,4 @@ package() { # PAX does not like the JIT paxctl -c -m -p "$pkgdir"/usr/bin/midori } -md5sums="ccd2ae162993c2c92c9e0eac7778c62d midori-0.2.4.tar.bz2" +md5sums="249ddb3485d8246e0fda25dd735953f0 midori-0.2.6.tar.bz2" diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD index 5b733b220e..58c86f1e19 100644 --- a/main/mini_httpd/APKBUILD +++ b/main/mini_httpd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mini_httpd pkgver=1.19 -pkgrel=3 +pkgrel=5 pkgdesc="Small forking webserver with ssl and ipv6 support" url="http://www.acme.com/software/mini_httpd/" license="BSD" diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD index 8a7a35c6f8..4c4f041ed7 100644 --- a/main/minicom/APKBUILD +++ b/main/minicom/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=minicom pkgver=2.4 -pkgrel=0 +pkgrel=1 pkgdesc="menu driven communications program for terminals" url="http://alioth.debian.org/projects/minicom" license="GPL" diff --git a/main/mkfontscale/APKBUILD b/main/mkfontscale/APKBUILD index 283a98567f..126dbf2d9c 100644 --- a/main/mkfontscale/APKBUILD +++ b/main/mkfontscale/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkfontscale pkgver=1.0.7 -pkgrel=0 +pkgrel=1 pkgdesc="X.org font scale" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/mlmmj/APKBUILD b/main/mlmmj/APKBUILD index 6ac4d1620f..1a8e30b50e 100644 --- a/main/mlmmj/APKBUILD +++ b/main/mlmmj/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mlmmj pkgver=1.2.16 -pkgrel=1 +pkgrel=2 pkgdesc="Mailing list managing made joyful" url="http://mlmmj.org/" license="MIT" diff --git a/main/module-init-tools/APKBUILD b/main/module-init-tools/APKBUILD index aaa9ceeb59..189f2f0d30 100644 --- a/main/module-init-tools/APKBUILD +++ b/main/module-init-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanel Copa <ncopa@alpinelinux.org> pkgname=module-init-tools pkgver=3.11.1 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://www.kernel.org" license='GPL' diff --git a/main/mousepad/APKBUILD b/main/mousepad/APKBUILD index ad5524f1d7..6fa9f2569a 100644 --- a/main/mousepad/APKBUILD +++ b/main/mousepad/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mousepad pkgver=0.2.16 -pkgrel=0 +pkgrel=1 pkgdesc="Simple Text Editor for Xfce4 (based on Gedit)" url="http://www.xfce.org/~benny/apps.html" license="GPL-2" diff --git a/main/mpc/APKBUILD b/main/mpc/APKBUILD index e385544a31..2d8282c08d 100644 --- a/main/mpc/APKBUILD +++ b/main/mpc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpc pkgver=0.19 -pkgrel=0 +pkgrel=1 pkgdesc="Minimalist command line interface to MPD" url="http://mpd.wikia.com/wiki/Client:Mpc" license="GPL2" diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index a66295913f..a549978c6b 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=mpd pkgver=0.15.9 -pkgrel=0 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" pkgusers="mpd" diff --git a/main/mpfr/APKBUILD b/main/mpfr/APKBUILD index 63914e04b2..e2d92d1299 100644 --- a/main/mpfr/APKBUILD +++ b/main/mpfr/APKBUILD @@ -1,26 +1,29 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpfr pkgver=2.4.2 -pkgrel=0 +pkgrel=2 pkgdesc="multiple-precision floating-point library" url="http://www.mpfr.org/" license="GPL LGPL" depends= -makedepends="gcc>=4.4.2 gmp-dev texinfo" +makedepends="gmp5-dev texinfo" source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2" subpackages="$pkgname-doc $pkgname-dev" build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ - --disable-thread-safe \ --enable-shared || return 1; make || return 1; - make check } package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="${pkgdir}" install || return 1; } + +dev() { + replaces=mpfr + default_dev +} md5sums="89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2" diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD index f10f46b17b..a043024737 100644 --- a/main/mpg123/APKBUILD +++ b/main/mpg123/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpg123 pkgver=1.12.1 -pkgrel=0 +pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" url="http://sourceforge.net/projects/mpg123" license="GPL2 LGPL2" diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD new file mode 100644 index 0000000000..f5f1ae7bd0 --- /dev/null +++ b/main/mplayer/APKBUILD @@ -0,0 +1,68 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=mplayer +pkgver=1.0_rc4_p20100506 +_svnver=SVN-r30554 +pkgrel=5 +pkgdesc="A movie player for linux" +url="http://www.mplayerhq.hu/" +license="GPL" +depends= +subpackages="$pkgname-doc" +makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev + libtheora-dev xvidcore-dev zlib-dev sdl-dev freetype-dev + x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev" + +# cdparanoia libcaca lirc-utils libgl-dev smbclient-dev +# aalib-dev jack-audio-connection-kit libmng-dev libxss-dev + +source="http://mirrors.kernel.org/gentoo/distfiles/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + sed -i "s/UNKNOWN/$_svnver/" version.sh + + export GCC_SPECS=/usr/share/gcc/hardenednopie.specs + ./configure --prefix=/usr \ + --disable-gui \ + --disable-gif \ + --disable-arts \ + --enable-x11 \ + --enable-runtime-cpudetection \ + --confdir=/etc/mplayer \ + --disable-nas \ + --disable-gl \ + --enable-tv-v4l1 \ + --enable-tv-v4l2 \ + --enable-largefiles \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-fribidi \ + --disable-libdv \ + --disable-musepack \ + --language=all\ + --disable-esd \ + --disable-mga \ + --disable-lirc \ + --enable-debug \ + --enable-radio \ + --enable-radio-capture \ + --extra-cflags="-I/usr/lib/live-media -O2" \ + --disable-nemesi \ + --enable-freetype \ + --enable-xvmc \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make -j1 DESTDIR="$pkgdir" install || return 1 + install -Dm644 etc/codecs.conf etc/input.conf etc/example.conf \ + "$pkgdir"/etc/mplayer/ || return 1 + install -dm755 "$pkgdir"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \ + "$pkgdir"/usr/share/mplayer/subfont.ttf || return 1 + rm -rf "$pkgdir"/usr/share/mplayer/font +} +md5sums="38126e7d1cf4044115a617dc331cddcc mplayer-1.0_rc4_p20100506.tar.bz2" diff --git a/main/mplayer/liba52_gcc_bug.patch b/main/mplayer/liba52_gcc_bug.patch new file mode 100644 index 0000000000..c0d42f876f --- /dev/null +++ b/main/mplayer/liba52_gcc_bug.patch @@ -0,0 +1,10 @@ +--- mplayer/configure.old 2009-04-16 12:02:10.000000000 +0200 ++++ mplayer/configure 2009-05-22 15:23:38.000000000 +0200 +@@ -6410,6 +6410,7 @@ + def_liba52='#undef CONFIG_LIBA52' + def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" + if test "$_liba52_internal" = yes ; then ++ test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /") + _liba52=yes + def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1" + _res_comment="internal" diff --git a/main/ruby/test.db b/main/mplayer/mplayer/configure.orig index e69de29bb2..e69de29bb2 100644 --- a/main/ruby/test.db +++ b/main/mplayer/mplayer/configure.orig diff --git a/main/mplayer/mplayer/configure.rej b/main/mplayer/mplayer/configure.rej new file mode 100644 index 0000000000..c0d42f876f --- /dev/null +++ b/main/mplayer/mplayer/configure.rej @@ -0,0 +1,10 @@ +--- mplayer/configure.old 2009-04-16 12:02:10.000000000 +0200 ++++ mplayer/configure 2009-05-22 15:23:38.000000000 +0200 +@@ -6410,6 +6410,7 @@ + def_liba52='#undef CONFIG_LIBA52' + def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" + if test "$_liba52_internal" = yes ; then ++ test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /") + _liba52=yes + def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1" + _res_comment="internal" diff --git a/main/mrxvt/APKBUILD b/main/mrxvt/APKBUILD index 0c9cb702aa..647a8669df 100644 --- a/main/mrxvt/APKBUILD +++ b/main/mrxvt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mark Constable <markc@renta.net> pkgname=mrxvt pkgver=0.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-tabbed X terminal emulator based on rxvt code" url="http://materm.sourceforge.net/wiki/pmwiki.php" license="GPL" diff --git a/main/mtools/APKBUILD b/main/mtools/APKBUILD index bc738e0032..73a61c158d 100644 --- a/main/mtools/APKBUILD +++ b/main/mtools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mtools pkgver=4.0.13 -pkgrel=0 +pkgrel=1 pkgdesc="A collection of utilities to access MS-DOS disks from Unix without mounting them" url="http://www.gnu.org/software/mtools/" license="GPL" diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index bc4f742846..492767901f 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.1.45 +pkgver=5.1.47 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -77,6 +77,6 @@ client() { done } -md5sums="06b5deb3a13c7600c38ba65b9f7e42c4 mysql-5.1.45.tar.gz +md5sums="02b9964b3966832f3d6bc87524bfd73f mysql-5.1.47.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index d929c807f6..67e6ce8dbd 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=nano pkgver=2.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor." url="http://www.nano-editor.org/" license="GPL" diff --git a/main/nasm/APKBUILD b/main/nasm/APKBUILD index 8185a79247..b3adaa15f6 100644 --- a/main/nasm/APKBUILD +++ b/main/nasm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nasm pkgver=2.08.01 -pkgrel=0 +pkgrel=1 pkgdesc="80x86 assembler designed for portability and modularity" url="http://nasm.sourceforge.net" license="LGPL" diff --git a/main/ncftp/APKBUILD b/main/ncftp/APKBUILD index 4495c55977..94b08e15e9 100644 --- a/main/ncftp/APKBUILD +++ b/main/ncftp/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=ncftp -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=0 pkgdesc="A set of free application programs implementing FTP" url="http://www.ncftp.com/" @@ -11,19 +11,31 @@ install="$pkgname.post-install" source="ftp://ftp.$pkgname.com/$pkgname/$pkgname-$pkgver-src.tar.bz2" subpackages="$pkgname-doc $pkgname-bookmarks" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + mkdir -p "$pkgdir"/usr/share || return 1 +} + build () { - cd "${srcdir}/${pkgname}-${pkgver}" || return 1 - install -d "${pkgdir}"/usr/share | return 1 + cd "$_builddir" || return 1 + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man || return 1 - cd "${srcdir}/${pkgname}-${pkgver}"/libncftp + + cd "$_builddir"/libncftp make shared || return 1 - make PREFIX="${pkgdir}"/usr soinstall || return 1 - cd "${srcdir}/${pkgname}-${pkgver}" || return 1 + cd "$_builddir" || return 1 make || return 1 +} + +package() { + cd "$_builddir"/libncftp + make PREFIX="${pkgdir}"/usr soinstall || return 1 + cd "$_builddir" || return 1 make DESTDIR="$pkgdir" install || return 1 - install -D doc/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}"/LICENSE || return 1 + install -D doc/LICENSE.txt "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE || return 1 } bookmarks () { @@ -32,4 +44,4 @@ bookmarks () { mv "$pkgdir"/usr/bin/ncftpbookmarks "$subpkgdir"/usr/bin/ || return 1 } -md5sums="fac4aa169e1734e8d9617afd4a9b51e5 ncftp-3.2.3-src.tar.bz2" +md5sums="216d6befdd7381b11ffdc8b6e0c1bd12 ncftp-3.2.4-src.tar.bz2" diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD index 9ae623a5b9..ef763f442b 100644 --- a/main/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ncurses pkgver=5.7 -pkgrel=1 +pkgrel=2 pkgdesc="Console display library" url="http://www.gnu.org/software/ncurses/" license=MIT diff --git a/main/neon/APKBUILD b/main/neon/APKBUILD index ef6fc8fed7..b756630cea 100644 --- a/main/neon/APKBUILD +++ b/main/neon/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=neon -pkgver=0.28.6 -pkgrel=0 +pkgver=0.29.3 +pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface" url="http://www.webdav.org/neon/" license="GPL LGPL" @@ -23,6 +23,10 @@ build () { --disable-static \ make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="252578ed555552b71d15909641484951 neon-0.28.6.tar.gz" +md5sums="ba1015b59c112d44d7797b62fe7bee51 neon-0.29.3.tar.gz" diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD index 19baedc901..3b68686d90 100644 --- a/main/net-snmp/APKBUILD +++ b/main/net-snmp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=net-snmp -pkgver=5.4.2.1 -pkgrel=3 +pkgver=5.5 +pkgrel=1 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" license="GPL" @@ -14,14 +14,17 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz snmpd.confd snmptrapd.initd snmptrapd.confd - CVE-2008-6123.patch " -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i ../CVE-2008-6123.patch || return 1 +_builddir="$srcdir/$pkgname-$pkgver" +build() { + cd "$_builddir" + export lt_cv_sys_max_cmd_len=8192 + + #build fails on: libnetsnmpmibs.so: undefined reference to `pthread_create' + LDFLAGS="$LDFLAGS -lpthread" ./configure --prefix=/usr \ --sysconfdir=/etc/snmp \ @@ -40,16 +43,20 @@ build() { --disable-embedded-perl # embedded-perl seems to create TEXTREL's - make -j1 || return 1 + make || return 1 +} + +package() { + cd "$_builddir" make -j1 DESTDIR="$pkgdir" install - install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd - install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd + install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd + install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd install -m755 -D "$srcdir"/snmptrapd.initd "$pkgdir"/etc/init.d/snmptrapd - install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd - install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example - mkdir -p "$pkgdir"/var/lib/net-snmp - find "$pkgdir" -name perllocal.pod -delete + install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd + install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example + mkdir -p "$pkgdir"/var/lib/net-snmp + find "$pkgdir" -name perllocal.pod -delete } tools() { @@ -58,9 +65,8 @@ tools() { } -md5sums="984932520143f0c8bf7b7ce1fc9e1da1 net-snmp-5.4.2.1.tar.gz +md5sums="5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz 198a4a7b80557fa8112394df5ec9914e snmpd.initd 96510a2f3bc9f21648b03f7e8d76c0d3 snmpd.confd 7ce3e9e880fc6313ae87eb000bae4bda snmptrapd.initd -363f7728a76bdfc46e29b7e1f5cf4950 snmptrapd.confd -e8eac801c76e03bca7e7bf6b267b0d3d CVE-2008-6123.patch" +363f7728a76bdfc46e29b7e1f5cf4950 snmptrapd.confd" diff --git a/main/net-snmp/CVE-2008-6123.patch b/main/net-snmp/CVE-2008-6123.patch deleted file mode 100644 index b4b06f63e9..0000000000 --- a/main/net-snmp/CVE-2008-6123.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c ---- snmplib.orig/snmpUDPDomain.c 2007-10-11 22:46:30.000000000 +0200 -+++ snmplib/snmpUDPDomain.c 2009-07-10 23:41:37.000000000 +0200 -@@ -104,12 +110,12 @@ - char tmp[64]; - to = (struct sockaddr_in *) &(addr_pair->remote_addr); - if (to == NULL) { -- sprintf(tmp, "UDP: [%s]->unknown", -+ sprintf(tmp, "UDP: unknown->[%s]", - inet_ntoa(addr_pair->local_addr)); - } else { -- sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr)); -- sprintf(tmp + strlen(tmp), "[%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu->", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); -+ sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr)); - } - return strdup(tmp); - } diff --git a/main/newt/APKBUILD b/main/newt/APKBUILD index 6f471b17a2..858ecd265f 100644 --- a/main/newt/APKBUILD +++ b/main/newt/APKBUILD @@ -1,20 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=newt -pkgver=0.52.10 +pkgver=0.52.11 pkgrel=0 pkgdesc="Redhat's Newt windowing toolkit development files" url="https://fedorahosted.org/newt/" license="LGPL-2" depends= makedepends="slang-dev popt-dev python-dev ncurses-dev wget" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc py-newt:py" source="https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz - $pkgname-0.52.7-notcl.patch " prepare() { cd "$srcdir"/$pkgname-$pkgver for i in ../*.patch; do + [ -r "$i" ] || continue msg "Applying $i..." patch -p1 < $i || return 1 done @@ -38,5 +38,11 @@ package() { make -j1 DESTDIR="$pkgdir" prefix="/usr" RPM_OPT_FLAGS="ERROR" install \ || true } -md5sums="bcbcc87ec19ba37d34f819209afa2e15 newt-0.52.10.tar.gz -6780156f3b66a3f05efe1ee821617031 newt-0.52.7-notcl.patch" + +py() { + pkgdesc="A NEWT module for Python" + mkdir -p "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ +} + +md5sums="4b9a0685ecd180c42d2c4a5806e3fc52 newt-0.52.11.tar.gz" diff --git a/main/newt/newt-0.52.7-notcl.patch b/main/newt/newt-0.52.7-notcl.patch deleted file mode 100644 index b9f86e6b60..0000000000 --- a/main/newt/newt-0.52.7-notcl.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- newt-0.52.7/Makefile.in.orig 2008-01-15 16:57:12.000000000 +0100 -+++ newt-0.52.7/Makefile.in 2008-01-15 16:58:38.000000000 +0100 -@@ -15,7 +15,7 @@ - PYTHONVERS = @PYTHONVERS@ - WHIPTCLSO = @WHIPTCLSO@ - --PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey -+PROGS = test whiptail testgrid testtree showchars showkey - TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o - NDIALOGOBJS = whiptail.o dialogboxes.o - WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o -@@ -78,9 +78,6 @@ - whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) - $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt - --whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) -- $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lslang -lpopt -lm -- - $(LIBNEWT): $(LIBOBJS) - ar rv $@ $^ - -@@ -120,12 +117,11 @@ - install -m 644 whiptail.1 $(instroot)/$(man1dir) - make -C po datadir=$(instroot)/$(datadir) install - --install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so -+install-sh: sharedlib _snackmodule.so - [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) - install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) - ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so - ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME) -- [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : - for ver in $(PYTHONVERS) ; do \ - [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ - install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD index 99500506f0..4807e752ca 100644 --- a/main/nfs-utils/APKBUILD +++ b/main/nfs-utils/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nfs-utils pkgver=1.2.0 -pkgrel=1 +pkgrel=3 pkgdesc="kernel-mode NFS" url="http://nfs.sourceforge.net/" license="GPL" depends="portmap" makedepends="e2fsprogs-dev" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc rpcgen" source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 nfs.initd nfs.confd @@ -37,13 +37,21 @@ build() { --with-statedir=/var/lib/nfs make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir" install install -m755 -D "$srcdir"/nfs.initd "$pkgdir"/etc/init.d/nfs install -m644 -D "$srcdir"/nfs.confd "$pkgdir"/etc/conf.d/nfs install -m644 -D "$srcdir"/nfs.exports "$pkgdir"/etc/exports - #mkdir -p "$pkgdir"/usr/lib/nfs - install -m755 -D tools/rpcgen/rpcgen "$pkgdir"/usr/bin/rpcgen +} + +rpcgen() { + pkgdesc="Remote Procedure Call (RPC) protocol compiler" + cd "$srcdir/$pkgname-$pkgver" + install -m755 -D tools/rpcgen/rpcgen "$subpkgdir"/usr/bin/rpcgen } md5sums="779cf81044e92cb51ad590960e7b3671 nfs-utils-1.2.0.tar.bz2 diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD index 45404557e7..dfe18d979c 100644 --- a/main/ngircd/APKBUILD +++ b/main/ngircd/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ngircd -pkgver=15 +pkgver=16 pkgrel=0 pkgdesc="Next Generation IRC Daemon" url="http://ngircd.barton.de/" @@ -34,5 +34,5 @@ package() { install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -md5sums="c183a85eba6fe51255983848f099c8ae ngircd-15.tar.gz +md5sums="8c9e0382cd982b0ca77c05528ebe28eb ngircd-16.tar.gz 50d8388540a2e3eb0630e8ac6369f394 ngircd.initd" diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD index d97acd7a75..6ced585c2f 100644 --- a/main/nmap/APKBUILD +++ b/main/nmap/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=nmap pkgver=5.21 -pkgrel=0 +pkgrel=2 pkgdesc="A network exploration tool and security/port scanner" url="http:/nmap.org" license="custom:GPL" diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD index ddc67fb423..6b50416780 100644 --- a/main/nrpe/APKBUILD +++ b/main/nrpe/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=nrpe pkgver=2.12 -pkgrel=2 +pkgrel=4 pkgusers="nagios" pkggroups="nagios" pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines." diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD new file mode 100644 index 0000000000..38f9d9c4d1 --- /dev/null +++ b/main/nspr/APKBUILD @@ -0,0 +1,64 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=nspr +pkgver=4.8.4 +pkgrel=0 +pkgdesc="Netscape Portable Runtime" +url="http://www.mozilla.org/projects/nspr/" +license="MPL-1.1 GPL-2 LGPL-2.1" +depends= +subpackages="$pkgname-dev" +source="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz + nspr-4.6.1-config-1.patch + nspr-4.7.0-prtime.patch + nspr-4.8-config.patch + nspr-4.8-pkgconfig-gentoo-3.patch + " + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + mkdir build inst + for i in "$srcdir"/*.patch; do + msg "Applying $i" + patch -p1 -i "$i" || return 1 + done + # respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + mozilla/nsprpub/config/rules.mk +} + +build() { + cd "$_builddir"/build + ../mozilla/nsprpub/configure --prefix=/usr \ + || return 1 + make CC="${CC:-gcc}" CXX="${CXX:-g++}" || return 1 +} + +package() { + local file= minor_version=${pkgver#*.} + minor_version=${minor_version%.*} + + cd "$_builddir"/build + make DESTDIR="$pkgdir" install || die "emake install failed" + + cd "$pkgdir"/usr/lib + rm -f *.a + for file in *.so; do + mv ${file} ${file}.${minor_version} || return 1 + ln -s ${file}.${minor_version} ${file} || return 1 + done + + cd "$_builddir"/build/config + install -Dm755 nspr-config "$pkgdir"/usr/bin/nspr-config || return 1 + install -Dm644 nspr.pc "$pkgdir"/usr/lib/pkgconfig/nspr.pc || return 1 + rm -rf "$pkgdir"/usr/bin/prerr.properties \ + "$pkgdir"/usr/bin/compile-et.pl \ + "$pkgdir"/usr/share/aclocal/nspr.m4 \ + "$pkgdir"/usr/include/nspr/md +} + +md5sums="a85bdbe1eb646aa32c785a37d8e3a2f5 nspr-4.8.4.tar.gz +d204a641dd7cbf6751d14dc6b98835f1 nspr-4.6.1-config-1.patch +c48e1f47799c1cff7e3bf46dc0e653f1 nspr-4.7.0-prtime.patch +c790c638a7c9fd1d731272f464f065c6 nspr-4.8-config.patch +5b67b4339be94d0dbc4337a55eabe73a nspr-4.8-pkgconfig-gentoo-3.patch" diff --git a/main/nspr/nspr-4.6.1-config-1.patch b/main/nspr/nspr-4.6.1-config-1.patch new file mode 100644 index 0000000000..b919c7930b --- /dev/null +++ b/main/nspr/nspr-4.6.1-config-1.patch @@ -0,0 +1,11 @@ +--- a/mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000 ++++ b/mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000 +@@ -3893,7 +3893,7 @@ + PR_MD_CSRCS=linux.c + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)' + _OPTIMIZE_FLAGS=-O2 + _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + # combo is not yet good at debugging inlined diff --git a/main/nspr/nspr-4.7.0-prtime.patch b/main/nspr/nspr-4.7.0-prtime.patch new file mode 100644 index 0000000000..74d5534d5a --- /dev/null +++ b/main/nspr/nspr-4.7.0-prtime.patch @@ -0,0 +1,26 @@ +--- a/mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 ++++ b/mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 +@@ -1536,7 +1536,7 @@ + case TT_EET: zone_offset = 2 * 60; break; + case TT_JST: zone_offset = 9 * 60; break; + default: +- PR_ASSERT (0); ++ return PR_FAILURE; + break; + } + } +@@ -1578,11 +1578,12 @@ + struct tm localTime; + time_t secs; + +- PR_ASSERT(result->tm_month > -1 && ++ if (!(result->tm_month > -1 && + result->tm_mday > 0 && + result->tm_hour > -1 && + result->tm_min > -1 && +- result->tm_sec > -1); ++ result->tm_sec > -1)) ++ return PR_FAILURE; + + /* + * To obtain time_t from a tm structure representing the local diff --git a/main/nspr/nspr-4.8-config.patch b/main/nspr/nspr-4.8-config.patch new file mode 100644 index 0000000000..4db2517e4e --- /dev/null +++ b/main/nspr/nspr-4.8-config.patch @@ -0,0 +1,47 @@ +--- a/mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 ++++ b/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 +@@ -112,6 +112,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 ++++ b/mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 +@@ -102,6 +102,10 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_ARCH), Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH),OS2) + MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def + GARBAGE += $(MAPFILE) +--- a/mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 ++++ b/mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 +@@ -168,6 +168,7 @@ + else + OS_LIBS = -ldl + endif ++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' + endif + + ifeq ($(OS_ARCH),HP-UX) +--- a/mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 ++++ b/mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 +@@ -122,7 +122,7 @@ + fi + + if test "$echo_libs" = "yes"; then +- libdirs=-L$libdir ++ libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_plds"; then + libdirs="$libdirs -lplds${major_version}" + fi diff --git a/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch new file mode 100644 index 0000000000..2525928db4 --- /dev/null +++ b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch @@ -0,0 +1,126 @@ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 +@@ -162,3 +162,4 @@ + RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include + RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin + RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib ++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in +--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 +@@ -52,9 +52,10 @@ + + # autoconf.mk must be deleted last (from the top-level directory) + # because it is included by every makefile. +-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config ++DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc + + RELEASE_BINS = nspr-config ++RELEASE_PC = nspr.pc + + include $(topsrcdir)/config/config.mk + +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 +@@ -92,13 +92,13 @@ + + # Set variables that may be dependent upon other variables + if test -z "$exec_prefix"; then +- exec_prefix=@exec_prefix@ ++ exec_prefix=`pkg-config --variable=exec_prefix nspr` + fi + if test -z "$includedir"; then +- includedir=@includedir@ ++ includedir=`pkg-config --variable=includedir nspr` + fi + if test -z "$libdir"; then +- libdir=@libdir@ ++ libdir=`pkg-config --variable=libdir nspr` + fi + + if test "$echo_prefix" = "yes"; then +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir} ++Cflags: -I${includedir} ++ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 +@@ -211,7 +211,7 @@ + rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) + +$(LOOP_OVER_DIRS) + +-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) ++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) + ifdef RELEASE_BINS + $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) + endif +@@ -221,6 +221,9 @@ + ifdef RELEASE_LIBS + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) + endif ++ifdef RELEASE_PC ++ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ ++endif + +$(LOOP_OVER_DIRS) + + release:: export +@@ -272,6 +275,23 @@ + fi + cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) + endif ++ifdef RELEASE_PC ++ @echo "Copying pkg-config files to release directory" ++ @if test -z "$(BUILD_NUMBER)"; then \ ++ echo "BUILD_NUMBER must be defined"; \ ++ false; \ ++ else \ ++ true; \ ++ fi ++ @if test ! -d $(RELEASE_PC_DEST); then \ ++ rm -rf $(RELEASE_PC_DEST); \ ++ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ ++ else \ ++ true; \ ++ fi ++ cp $(RELEASE_PC) $(RELEASE_PC_DEST) ++endif ++ + +$(LOOP_OVER_DIRS) + + alltags: +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure +--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 +@@ -6037,6 +6037,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in +--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 +@@ -2871,6 +2871,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD new file mode 100644 index 0000000000..c795669ea7 --- /dev/null +++ b/main/nss/APKBUILD @@ -0,0 +1,119 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=nss +pkgver=3.12.6 +_ver=3_12_6 +pkgrel=0 +pkgdesc="Mozilla Network Security Services" +url="http://www.mozilla.org/projects/security/pki/nss/" +license="MPL GPL" +depends= +makedepends="nspr-dev sqlite-dev zlib-dev perl" +subpackages="$pkgname-dev libnss" +source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src/$pkgname-$pkgver.tar.gz + nss-nolocalsql.patch + nss-no-rpath.patch + nss.pc.in + nss-config.in + add_spi+cacert_ca_certs.patch + ssl-renegotiate-transitional.patch" +depends_dev="nspr-dev" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -Np1 -i ""$srcdir"/add_spi+cacert_ca_certs.patch" || return 1 + patch -Np1 -i ""$srcdir"/ssl-renegotiate-transitional.patch" || return 1 + patch -Np0 -i ""$srcdir"/nss-nolocalsql.patch" || return 1 + patch -Np0 -i ""$srcdir"/nss-no-rpath.patch" || return 1 + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ + mozilla/security/coreconf/rules.mk + +} + +build() { + cd "$_builddir" + unset CFLAGS + unset CXXFLAGS + export BUILD_OPT=1 + export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` + export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` + export XCFLAGS="${CFLAGS}" + make -j 1 -C mozilla/security/coreconf || return 1 + make -j 1 -C mozilla/security/dbm || return 1 + make -j 1 -C mozilla/security/nss || return 1 +} + +package() { + cd "$_builddir" + install -m755 -d "$pkgdir"/usr/lib/pkgconfig + install -m755 -d "$pkgdir"/usr/bin + install -m755 -d "$pkgdir"/usr/include/nss + + NSS_VMAJOR=`awk '/#define.*NSS_VMAJOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h ` + msg "DEBUG: $NSS_VMAJOR" + NSS_VMINOR=`awk '/#define.*NSS_VMINOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h` + NSS_VPATCH=`awk '/#define.*NSS_VPATCH"/ {print $3}' mozilla/security/nss/lib/nss/nss.h` + + # pkgconfig files + sed "$srcdir"/nss.pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,$pkgver,g" \ + -e "s,%NSS_VERSION%,$pkgver,g" \ + > "$pkgdir"/usr/lib/pkgconfig/nss.pc \ + || return 1 + ln -sf nss.pc "$pkgdir"/usr/lib/pkgconfig/mozilla-nss.pc || return 1 + chmod 644 "$pkgdir"/usr/lib/pkgconfig/*.pc || return 1 + + # nss-config + sed "$srcdir"/nss-config.in \ + -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr/bin,g" \ + -e "s,@exec_prefix@,/usr/bin,g" \ + -e "s,@includedir@,/usr/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ + -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ + -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ + > "$pkgdir"/usr/bin/nss-config || return 1 + chmod 755 "$pkgdir"/usr/bin/nss-config || return 1 + local minor=${pkgver#*.} + minor=${minor%.*} + for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ + libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so; do + install -m755 mozilla/dist/*.OBJ/lib/${file} \ + "$pkgdir"/usr/lib/${file}.$minor || return 1 + ln -s $file.$minor "$pkgdir"/usr/lib/$file + done + install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "$pkgdir"/usr/lib/ \ + || return 1 + install -m644 mozilla/dist/*.OBJ/lib/*.chk "$pkgdir"/usr/lib/ \ + || return 1 + + for file in certutil cmsutil crlutil modutil pk12util shlibsign \ + signtool signver ssltap; do + install -m755 mozilla/dist/*.OBJ/bin/${file} "$pkgdir"/usr/bin/\ + || return 1 + done + install -m644 mozilla/dist/public/nss/*.h "$pkgdir"/usr/include/nss/ \ + || return 1 +} + +libnss() { + pkgdesc="Mozilla Network Security Service libraries" + mkdir -p "$subpkgdir"/usr/ + mv "$pkgdir"/usr/lib "$subpkgdir"/usr +} + +md5sums="da42596665f226de5eb3ecfc1ec57cd1 nss-3.12.6.tar.gz +1d8305dc458d28c6f32746d9132b9873 nss-nolocalsql.patch +e5c97db0c884d5f4cfda21e562dc9bba nss-no-rpath.patch +c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in +46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in +a744b499e7da252acd9ac8ff09af3d48 add_spi+cacert_ca_certs.patch +d83c7b61abb7e9f8f7bcd157183d1ade ssl-renegotiate-transitional.patch" diff --git a/main/nss/add_spi+cacert_ca_certs.patch b/main/nss/add_spi+cacert_ca_certs.patch new file mode 100644 index 0000000000..a8969ee43f --- /dev/null +++ b/main/nss/add_spi+cacert_ca_certs.patch @@ -0,0 +1,1168 @@ +## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds the SPI Inc. and CAcert.org CA certificates + +diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c +index 2c6fdab..2fb754c 100644 +--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c ++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -1020,6 +1020,24 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = { + static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_326 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE ++}; ++static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { ++ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED ++}; + #ifdef DEBUG + static const NSSItem nss_builtins_items_0 [] = { + { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -1028,7 +1046,7 @@ static const NSSItem nss_builtins_items_0 [] = { + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"CVS ID", (PRUint32)7 }, + { (void *)"NSS", (PRUint32)4 }, +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 } ++ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $", (PRUint32)160 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -21537,6 +21555,531 @@ static const NSSItem nss_builtins_items_321 [] = { + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; ++static const NSSItem nss_builtins_items_322 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" ++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" ++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" ++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" ++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" ++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" ++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" ++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063" ++"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060" ++"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016" ++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" ++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" ++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" ++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" ++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" ++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" ++"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" ++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" ++"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007" ++"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002" ++"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011" ++"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315" ++"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230" ++"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272" ++"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016" ++"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052" ++"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262" ++"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140" ++"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150" ++"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273" ++"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022" ++"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234" ++"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334" ++"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070" ++"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232" ++"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044" ++"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355" ++"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252" ++"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352" ++"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276" ++"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306" ++"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320" ++"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167" ++"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335" ++"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324" ++"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246" ++"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106" ++"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272" ++"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334" ++"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304" ++"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060" ++"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265" ++"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071" ++"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230" ++"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260" ++"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016" ++"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" ++"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" ++"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" ++"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" ++"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" ++"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" ++"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" ++"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001" ++"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037" ++"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160" ++"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157" ++"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006" ++"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164" ++"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060" ++"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045" ++"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162" ++"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077" ++"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102" ++"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165" ++"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164" ++"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040" ++"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167" ++"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006" ++"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001" ++"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201" ++"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275" ++"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234" ++"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323" ++"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073" ++"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140" ++"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353" ++"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160" ++"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334" ++"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231" ++"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116" ++"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145" ++"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031" ++"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363" ++"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330" ++"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367" ++"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260" ++"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223" ++"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335" ++"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026" ++"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005" ++"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361" ++"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371" ++"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246" ++"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206" ++"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153" ++"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344" ++"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143" ++"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362" ++"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226" ++"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175" ++"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305" ++"\103" ++, (PRUint32)1857 } ++}; ++static const NSSItem nss_builtins_items_323 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, ++ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106" ++"\166\316\217\063" ++, (PRUint32)20 }, ++ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153" ++, (PRUint32)16 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\000" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_324 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143" ++"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004" ++"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101" ++"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004" ++"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040" ++"\063\040\122\157\157\164" ++, (PRUint32)86 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\001" ++, (PRUint32)3 }, ++ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001" ++"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" ++"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" ++"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" ++"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" ++"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" ++"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" ++"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" ++"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" ++"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065" ++"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060" ++"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022" ++"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156" ++"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164" ++"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157" ++"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143" ++"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164" ++"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" ++"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" ++"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335" ++"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175" ++"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163" ++"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144" ++"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001" ++"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171" ++"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313" ++"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011" ++"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353" ++"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277" ++"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331" ++"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205" ++"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073" ++"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161" ++"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371" ++"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047" ++"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252" ++"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102" ++"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064" ++"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133" ++"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242" ++"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137" ++"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325" ++"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150" ++"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230" ++"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140" ++"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347" ++"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321" ++"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206" ++"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257" ++"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164" ++"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373" ++"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003" ++"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006" ++"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006" ++"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" ++"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162" ++"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034" ++"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162" ++"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003" ++"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001" ++"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002" ++"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101" ++"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160" ++"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206" ++"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241" ++"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072" ++"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135" ++"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253" ++"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364" ++"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172" ++"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302" ++"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214" ++"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074" ++"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154" ++"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025" ++"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352" ++"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231" ++"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213" ++"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325" ++"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242" ++"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214" ++"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027" ++"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057" ++"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224" ++"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134" ++"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356" ++"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005" ++"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355" ++"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143" ++"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123" ++"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243" ++"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005" ++"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156" ++"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317" ++"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360" ++"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101" ++"\322\156\245\033\231\047\200\347\013\251\250\000" ++, (PRUint32)1548 } ++}; ++static const NSSItem nss_builtins_items_325 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, ++ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304" ++"\030\116\052\055" ++, (PRUint32)20 }, ++ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266" ++, (PRUint32)16 }, ++ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" ++"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" ++"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" ++"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" ++"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" ++"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" ++"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" ++"\100\143\141\143\145\162\164\056\157\162\147" ++, (PRUint32)123 }, ++ { (void *)"\002\001\001" ++, (PRUint32)3 }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; ++static const NSSItem nss_builtins_items_326 [] = { ++ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, ++ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, ++ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" ++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" ++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" ++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" ++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" ++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" ++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" ++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" ++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" ++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" ++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" ++, (PRUint32)191 }, ++ { (void *)"0", (PRUint32)2 }, ++ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" ++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" ++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" ++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" ++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" ++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" ++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" ++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" ++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" ++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" ++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" ++, (PRUint32)191 }, ++ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" ++, (PRUint32)11 }, ++ { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000" ++"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206" ++"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003" ++"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010" ++"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125" ++"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163" ++"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167" ++"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151" ++"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003" ++"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061" ++"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146" ++"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061" ++"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026" ++"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151" ++"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063" ++"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060" ++"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125" ++"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023" ++"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004" ++"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061" ++"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141" ++"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143" ++"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125" ++"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036" ++"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151" ++"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045" ++"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150" ++"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156" ++"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" ++"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" ++"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051" ++"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074" ++"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271" ++"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240" ++"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321" ++"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265" ++"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175" ++"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375" ++"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161" ++"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342" ++"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172" ++"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056" ++"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247" ++"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310" ++"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361" ++"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356" ++"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110" ++"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151" ++"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316" ++"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307" ++"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320" ++"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205" ++"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123" ++"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154" ++"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275" ++"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356" ++"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250" ++"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204" ++"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147" ++"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305" ++"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057" ++"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124" ++"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060" ++"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161" ++"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122" ++"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346" ++"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102" ++"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061" ++"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016" ++"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025" ++"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141" ++"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037" ++"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040" ++"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061" ++"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141" ++"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103" ++"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" ++"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015" ++"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100" ++"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216" ++"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377" ++"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206" ++"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035" ++"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102" ++"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151" ++"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164" ++"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102" ++"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141" ++"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055" ++"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206" ++"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057" ++"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143" ++"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125" ++"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164" ++"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016" ++"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015" ++"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002" ++"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162" ++"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030" ++"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255" ++"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065" ++"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014" ++"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306" ++"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051" ++"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017" ++"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302" ++"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213" ++"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017" ++"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162" ++"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152" ++"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357" ++"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266" ++"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104" ++"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177" ++"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253" ++"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206" ++"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217" ++"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265" ++"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225" ++"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140" ++"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207" ++"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252" ++"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340" ++"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254" ++"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275" ++"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132" ++"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151" ++"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005" ++"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004" ++"\243\140" ++, (PRUint32)2066 } ++}; ++static const NSSItem nss_builtins_items_327 [] = { ++ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, ++ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, ++ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, ++ { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044" ++"\251\220\103\034" ++, (PRUint32)20 }, ++ { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170" ++, (PRUint32)16 }, ++ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" ++"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" ++"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" ++"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" ++"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" ++"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" ++"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" ++"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" ++"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" ++"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" ++"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" ++"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" ++, (PRUint32)191 }, ++ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" ++, (PRUint32)11 }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, ++ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } ++}; + + builtinsInternalObject + nss_builtins_data[] = { +@@ -21863,11 +22406,17 @@ nss_builtins_data[] = { + { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} }, + { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} }, + { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} }, +- { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} } ++ { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }, ++ { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} }, ++ { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} }, ++ { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, ++ { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, ++ { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, ++ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } + }; + const PRUint32 + #ifdef DEBUG +- nss_builtins_nObjects = 321+1; ++ nss_builtins_nObjects = 327+1; + #else +- nss_builtins_nObjects = 321; ++ nss_builtins_nObjects = 327; + #endif /* DEBUG */ +diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +index 22ed023..a8b94dd 100644 +--- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt ++++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +@@ -22200,3 +22200,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "CAcert.org Class 1 Root CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 ++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 ++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 ++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 ++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 ++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 ++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 ++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 ++\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 ++\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 ++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 ++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 ++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 ++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 ++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 ++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 ++\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 ++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 ++\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 ++\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 ++\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 ++\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 ++\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 ++\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 ++\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 ++\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 ++\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 ++\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 ++\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 ++\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 ++\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 ++\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 ++\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 ++\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 ++\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 ++\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 ++\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 ++\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 ++\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 ++\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 ++\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 ++\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 ++\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 ++\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 ++\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 ++\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 ++\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 ++\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 ++\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 ++\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 ++\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 ++\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 ++\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 ++\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 ++\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 ++\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 ++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 ++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 ++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 ++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 ++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 ++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 ++\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 ++\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 ++\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 ++\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 ++\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 ++\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 ++\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 ++\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 ++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 ++\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 ++\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 ++\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 ++\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 ++\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 ++\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 ++\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 ++\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 ++\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 ++\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 ++\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 ++\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 ++\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 ++\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 ++\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 ++\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 ++\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 ++\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 ++\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 ++\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 ++\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 ++\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 ++\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 ++\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 ++\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 ++\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 ++\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 ++\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 ++\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 ++\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 ++\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 ++\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 ++\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 ++\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 ++\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 ++\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 ++\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 ++\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 ++\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 ++\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 ++\103 ++END ++ ++# Trust for Certificate "CAcert.org Class 1 Root CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 ++\166\316\217\063 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "CAcert.org Class 3 Root CA" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 ++\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 ++\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 ++\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 ++\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 ++\063\040\122\157\157\164 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\001 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 ++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 ++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 ++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 ++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 ++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 ++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 ++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 ++\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 ++\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 ++\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 ++\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 ++\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 ++\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 ++\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 ++\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 ++\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 ++\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 ++\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 ++\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 ++\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 ++\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 ++\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 ++\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 ++\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 ++\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 ++\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 ++\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 ++\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 ++\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 ++\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 ++\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 ++\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 ++\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 ++\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 ++\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 ++\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 ++\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 ++\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 ++\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 ++\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 ++\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 ++\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 ++\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 ++\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 ++\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 ++\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 ++\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 ++\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 ++\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 ++\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 ++\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 ++\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 ++\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 ++\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 ++\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 ++\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 ++\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 ++\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 ++\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 ++\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 ++\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 ++\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 ++\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 ++\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 ++\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 ++\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 ++\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 ++\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 ++\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 ++\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 ++\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 ++\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 ++\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 ++\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 ++\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 ++\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 ++\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 ++\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 ++\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 ++\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 ++\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 ++\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 ++\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 ++\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 ++\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 ++\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 ++\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 ++\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 ++\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 ++\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 ++\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 ++\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 ++\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 ++\322\156\245\033\231\047\200\347\013\251\250\000 ++END ++ ++# Trust for Certificate "CAcert.org Class 3 Root CA" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 ++\030\116\052\055 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\001 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Software in the Public Interest, Inc. Root CA (2008)" ++# ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\011\000\350\216\266\311\370\052\024\050 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 ++\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 ++\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 ++\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 ++\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 ++\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 ++\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 ++\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 ++\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 ++\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 ++\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 ++\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 ++\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 ++\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 ++\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 ++\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 ++\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 ++\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 ++\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 ++\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 ++\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 ++\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 ++\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 ++\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 ++\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 ++\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 ++\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 ++\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 ++\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 ++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 ++\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 ++\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 ++\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 ++\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 ++\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 ++\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 ++\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 ++\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 ++\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 ++\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 ++\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 ++\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 ++\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 ++\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 ++\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 ++\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 ++\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 ++\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 ++\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 ++\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 ++\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 ++\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 ++\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 ++\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 ++\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 ++\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 ++\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 ++\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 ++\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 ++\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 ++\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 ++\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 ++\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 ++\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 ++\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 ++\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 ++\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 ++\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 ++\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 ++\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 ++\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 ++\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 ++\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 ++\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 ++\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 ++\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 ++\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 ++\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 ++\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 ++\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 ++\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 ++\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 ++\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 ++\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 ++\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 ++\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 ++\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 ++\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 ++\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 ++\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 ++\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 ++\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 ++\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 ++\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 ++\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 ++\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 ++\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 ++\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 ++\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 ++\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 ++\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 ++\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 ++\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 ++\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 ++\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 ++\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 ++\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 ++\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 ++\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 ++\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 ++\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 ++\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 ++\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 ++\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 ++\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 ++\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 ++\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 ++\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 ++\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 ++\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 ++\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 ++\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 ++\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 ++\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 ++\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 ++\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 ++\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 ++\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 ++\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 ++\243\140 ++END ++ ++# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 ++\251\220\103\034 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\011\000\350\216\266\311\370\052\024\050 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/main/nss/nss-config.in b/main/nss/nss-config.in new file mode 100644 index 0000000000..f8f893e71a --- /dev/null +++ b/main/nss/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nss + nssutil + ssl + smime +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes +lib_nssutil=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + ssl) + lib_ssl=yes + ;; + smime) + lib_smime=yes + ;; + nss) + lib_nss=yes + ;; + nssutil) + lib_nssutil=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=`pkg-config --variable=exec_prefix nss` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss` +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi + if test -n "$lib_nss"; then + libdirs="$libdirs -lnss${major_version}" + fi + if test -n "$lib_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/main/nss/nss-no-rpath.patch b/main/nss/nss-no-rpath.patch new file mode 100644 index 0000000000..35ea573154 --- /dev/null +++ b/main/nss/nss-no-rpath.patch @@ -0,0 +1,14 @@ +--- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 ++++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 +@@ -52,9 +52,9 @@ + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' + endif + endif + diff --git a/main/nss/nss-nolocalsql.patch b/main/nss/nss-nolocalsql.patch new file mode 100644 index 0000000000..dc75a223fc --- /dev/null +++ b/main/nss/nss-nolocalsql.patch @@ -0,0 +1,52 @@ +diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile +--- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800 ++++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800 +@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB + ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. + endif + +-ifndef MOZILLA_CLIENT +-ifndef NSS_USE_SYSTEM_SQLITE +-SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. +-endif +-endif ++#ifndef MOZILLA_CLIENT ++#ifndef NSS_USE_SYSTEM_SQLITE ++#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. ++#endif ++#endif + + ifndef MOZILLA_CLIENT + ifeq ($(OS_ARCH),Linux) +diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn +--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800 ++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800 +@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def + + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" + +-ifdef MOZILLA_CLIENT +-INCLUDES += -I$(DIST)/include/sqlite3 +-endif ++#ifdef MOZILLA_CLIENT ++#INCLUDES += -I$(DIST)/include/sqlite3 ++#endif + + CSRCS = \ + dbmshim.c \ +diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn +--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800 ++++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800 +@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def + + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" + +-ifdef MOZILLA_CLIENT +-INCLUDES += -I$(DIST)/include/sqlite3 +-endif ++#ifdef MOZILLA_CLIENT ++#INCLUDES += -I$(DIST)/include/sqlite3 ++#endif + + EXPORTS = \ + secmodt.h \ diff --git a/main/nss/nss.pc.in b/main/nss/nss.pc.in new file mode 100644 index 0000000000..d47b9e1469 --- /dev/null +++ b/main/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} diff --git a/main/nss/ssl-renegotiate-transitional.patch b/main/nss/ssl-renegotiate-transitional.patch new file mode 100644 index 0000000000..f457c55518 --- /dev/null +++ b/main/nss/ssl-renegotiate-transitional.patch @@ -0,0 +1,21 @@ +Enable transitional scheme for ssl renegotiation: + +(from mozilla/security/nss/lib/ssl/ssl.h) +Disallow unsafe renegotiation in server sockets only, but allow clients +to continue to renegotiate with vulnerable servers. +This value should only be used during the transition period when few +servers have been upgraded. + +diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c +index f1d1921..c074360 100644 +--- a/mozilla/security/nss/lib/ssl/sslsock.c ++++ b/mozilla/security/nss/lib/ssl/sslsock.c +@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { + PR_FALSE, /* noLocks */ + PR_FALSE, /* enableSessionTickets */ + PR_FALSE, /* enableDeflate */ +- 2, /* enableRenegotiation (default: requires extension) */ ++ 3, /* enableRenegotiation (default: transitional) */ + PR_FALSE, /* requireSafeNegotiation */ + }; + diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD index b8b615376d..9a2e0006ec 100644 --- a/main/ntfs-3g/APKBUILD +++ b/main/ntfs-3g/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ntfs-3g -pkgver=2010.3.6 +pkgver=2010.5.16 pkgrel=0 pkgdesc="A userspace ntfs driver with write support" url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -27,4 +27,4 @@ package() { } -md5sums="12ce21aa044c6068a4df6e8cbd3c5cfa ntfs-3g-2010.3.6.tgz" +md5sums="aeff7659a4943c9223d79116f051a863 ntfs-3g-2010.5.16.tgz" diff --git a/main/oidentd/APKBUILD b/main/oidentd/APKBUILD index eda425fbf8..b2d6fed4e3 100644 --- a/main/oidentd/APKBUILD +++ b/main/oidentd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=oidentd pkgver=2.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Configurable IDENT server that supports NAT/IP masq." url="http://dev.ojnk.net/" license="GPL" diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index 9a98906e46..cc369db6e6 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openldap pkgver=2.4.21 -pkgrel=0 +pkgrel=2 pkgdesc="LDAP Server" url="http://www.openldap.org/" license="custom" diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD index 2f0823f018..164b6ccb83 100644 --- a/main/opennhrp/APKBUILD +++ b/main/opennhrp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=opennhrp pkgver=0.11.5 -pkgrel=0 +pkgrel=2 pkgdesc="NBMA Next Hop Resolution Protocol daemon" url="http://sourceforge.net/projects/opennhrp" license="GPL-3" @@ -10,6 +10,7 @@ makedepends="c-ares-dev" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 opennhrp-0.9.3-peer-up-bgp.patch + opennhrp-script-timeout.patch $pkgname.initd $pkgname.confd " @@ -23,11 +24,16 @@ build() { sed -i -e 's/-Werror//' Make.rules make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp } md5sums="0982ce7c39bd760f0b58161f0883d4ec opennhrp-0.11.5.tar.bz2 f81539fc92800bb79668dda119a97d1d opennhrp-0.9.3-peer-up-bgp.patch +0178b95cba207156263096487b34f4ba opennhrp-script-timeout.patch ae65f88ccf849ef882669a8b4f0c7fc0 opennhrp.initd 8eee86233728dc0d156bbfee6d98f338 opennhrp.confd" diff --git a/main/opennhrp/opennhrp-script-timeout.patch b/main/opennhrp/opennhrp-script-timeout.patch new file mode 100644 index 0000000000..f28e01db2d --- /dev/null +++ b/main/opennhrp/opennhrp-script-timeout.patch @@ -0,0 +1,13 @@ +diff --git a/nhrp/nhrp_peer.c b/nhrp/nhrp_peer.c +index 4bcdd75..fb6c81c 100644 +--- a/nhrp/nhrp_peer.c ++++ b/nhrp/nhrp_peer.c +@@ -21,7 +21,7 @@ + #include "nhrp_peer.h" + #include "nhrp_interface.h" + +-#define NHRP_SCRIPT_TIMEOUT 20 ++#define NHRP_SCRIPT_TIMEOUT 120 + #define NHRP_PEER_FORMAT_LEN 128 + #define NHRP_NEGATIVE_CACHE_TIME (3*60) + #define NHRP_EXPIRY_TIME (5*60) diff --git a/main/openntpd/APKBUILD b/main/openntpd/APKBUILD index cb0bba50fe..8737a19dcb 100644 --- a/main/openntpd/APKBUILD +++ b/main/openntpd/APKBUILD @@ -2,7 +2,7 @@ pkgname=openntpd pkgver=3.9_p1 _myver=3.9p1 -pkgrel=6 +pkgrel=8 pkgdesc="Lightweight NTP server ported from OpenBSD" url=http://www.openntpd.org/ install=openntpd.pre-install diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 88cab44d79..bfa509bd3e 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openrc pkgver=0.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://roy.marples.name/openrc" license='BSD-2' diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 87d996e974..f34efa31ed 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssh -pkgver=5.4_p1 +pkgver=5.5_p1 _myver=${pkgver%_*}${pkgver#*_} pkgrel=0 pkgdesc="Port of OpenBSD's free SSH release" @@ -62,6 +62,6 @@ client() { "$subpkgdir"/etc/ssh/ } -md5sums="da10af8a789fa2e83e3635f3a1b76f5e openssh-5.4p1.tar.gz +md5sums="88633408f4cb1eb11ec7e2ec58b519eb openssh-5.5p1.tar.gz d993cc91e9fab6c6012390874c28af0a sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 22dc63397c..1bab1385ff 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,21 +1,21 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssl -pkgver=0.9.8n +pkgver=1.0.0 pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" -url=http://openssl.org +url="http://openssl.org" depends= -makedepends="perl" +makedepends="perl zlib-dev" license="openssl" -subpackages="$pkgname-dev $pkgname-doc libcrypto" +subpackages="$pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl" source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz - http://www.linuxfromscratch.org/patches/downloads/openssl/openssl-0.9.8g-fix_manpages-1.patch + fix-manpages.patch openssl-bb-basename.patch - openssl-0.9.8k-padlock-sha.patch " +# openssl-0.9.8k-padlock-sha.patch _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" @@ -27,7 +27,11 @@ prepare() { build() { cd "$_builddir" - ./config --prefix=/usr --openssldir=/etc/ssl shared enable-montasm + ./config --prefix=/usr \ + --openssldir=/etc/ssl \ + shared zlib enable-montasm enable-md2 \ + -Wa,--noexecstack \ + || return 1 make -j1 || return 1 } @@ -37,9 +41,16 @@ package() { make -j1 INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install } +dev() { + replaces="libcrypto openssl" + default_dev + # move symlinks + mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ +} + libcrypto() { pkgdesc="Crypto library from openssl" - replaces="openssl" + replaces="openssl libcrypto" mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib for i in "$pkgdir"/usr/lib/libcrypto*; do mv $i "$subpkgdir"/lib/ @@ -48,7 +59,16 @@ libcrypto() { mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/ } -md5sums="076d8efc3ed93646bd01f04e23c07066 openssl-0.9.8n.tar.gz -04a6a88c2ee4badd4f8649792b73eaf3 openssl-0.9.8g-fix_manpages-1.patch -c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch -86b7f1bf50e1f3ba407ec62001a51a0d openssl-0.9.8k-padlock-sha.patch" +libssl() { + pkgdesc="SSL shared libraries" + replaces="openssl" + mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib + for i in "$pkgdir"/usr/lib/libssl*; do + mv $i "$subpkgdir"/lib/ + ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/} + done +} + +md5sums="89eaa86e25b2845f920ec00ae4c864ed openssl-1.0.0.tar.gz +115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch +c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch" diff --git a/main/openssl/fix-manpages.patch b/main/openssl/fix-manpages.patch new file mode 100644 index 0000000000..7c6ac9902f --- /dev/null +++ b/main/openssl/fix-manpages.patch @@ -0,0 +1,1329 @@ +diff --git a/FAQ b/FAQ +index 2134e3a..18a8831 100644 +--- a/FAQ ++++ b/FAQ +@@ -724,7 +724,7 @@ OpenSSL by calling CRYPTO_set_locking_callback() and + CRYPTO_set_id_callback(), for all versions of OpenSSL up to and + including 0.9.8[abc...]. As of version 0.9.9, CRYPTO_set_id_callback() + and associated APIs are deprecated by CRYPTO_THREADID_set_callback() +-and friends. This is described in the threads(3) manpage. ++and friends. This is described in the openssl_threads(3) manpage. + + * I've compiled a program under Windows and it crashes: why? + +diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c +index 88088ce..e5da17f 100644 +--- a/crypto/rand/md_rand.c ++++ b/crypto/rand/md_rand.c +@@ -196,7 +196,7 @@ static void ssleay_rand_add(const void *buf, int num, double add) + int do_not_lock; + + /* +- * (Based on the rand(3) manpage) ++ * (Based on the openssl_rand(3) manpage) + * + * The input is chopped up into units of 20 bytes (or less for + * the last block). Each of these blocks is run through the hash +@@ -361,7 +361,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) + num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2); + + /* +- * (Based on the rand(3) manpage:) ++ * (Based on the openssl_rand(3) manpage) + * + * For each group of 10 bytes (or less), we do the following: + * +diff --git a/doc/apps/openssl.pod b/doc/apps/openssl.pod +index 738142e..e904f05 100644 +--- a/doc/apps/openssl.pod ++++ b/doc/apps/openssl.pod +@@ -163,7 +163,7 @@ Create or examine a netscape certificate sequence + + Online Certificate Status Protocol utility. + +-=item L<B<passwd>|passwd(1)> ++=item L<B<passwd>|openssl-passwd(1)> + + Generation of hashed passwords. + +@@ -401,7 +401,7 @@ L<crl(1)|crl(1)>, L<crl2pkcs7(1)|crl2pkcs7(1)>, L<dgst(1)|dgst(1)>, + L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>, + L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>, + L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>, +-L<passwd(1)|passwd(1)>, ++L<openssl-passwd(1)|openssl-passwd(1)>, + L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, + L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, + L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>, +diff --git a/doc/apps/passwd.pod b/doc/apps/passwd.pod +deleted file mode 100644 +index f449825..0000000 +--- a/doc/apps/passwd.pod ++++ /dev/null +@@ -1,82 +0,0 @@ +-=pod +- +-=head1 NAME +- +-passwd - compute password hashes +- +-=head1 SYNOPSIS +- +-B<openssl passwd> +-[B<-crypt>] +-[B<-1>] +-[B<-apr1>] +-[B<-salt> I<string>] +-[B<-in> I<file>] +-[B<-stdin>] +-[B<-noverify>] +-[B<-quiet>] +-[B<-table>] +-{I<password>} +- +-=head1 DESCRIPTION +- +-The B<passwd> command computes the hash of a password typed at +-run-time or the hash of each password in a list. The password list is +-taken from the named file for option B<-in file>, from stdin for +-option B<-stdin>, or from the command line, or from the terminal otherwise. +-The Unix standard algorithm B<crypt> and the MD5-based BSD password +-algorithm B<1> and its Apache variant B<apr1> are available. +- +-=head1 OPTIONS +- +-=over 4 +- +-=item B<-crypt> +- +-Use the B<crypt> algorithm (default). +- +-=item B<-1> +- +-Use the MD5 based BSD password algorithm B<1>. +- +-=item B<-apr1> +- +-Use the B<apr1> algorithm (Apache variant of the BSD algorithm). +- +-=item B<-salt> I<string> +- +-Use the specified salt. +-When reading a password from the terminal, this implies B<-noverify>. +- +-=item B<-in> I<file> +- +-Read passwords from I<file>. +- +-=item B<-stdin> +- +-Read passwords from B<stdin>. +- +-=item B<-noverify> +- +-Don't verify when reading a password from the terminal. +- +-=item B<-quiet> +- +-Don't output warnings when passwords given at the command line are truncated. +- +-=item B<-table> +- +-In the output list, prepend the cleartext password and a TAB character +-to each password hash. +- +-=back +- +-=head1 EXAMPLES +- +-B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>. +- +-B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>. +- +-B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. +- +-=cut +diff --git a/doc/crypto/BN_generate_prime.pod b/doc/crypto/BN_generate_prime.pod +index 7dccacb..71e7078 100644 +--- a/doc/crypto/BN_generate_prime.pod ++++ b/doc/crypto/BN_generate_prime.pod +@@ -90,7 +90,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. + + =head1 SEE ALSO + +-L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)> ++L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/BN_rand.pod b/doc/crypto/BN_rand.pod +index 81f93c2..690aa85 100644 +--- a/doc/crypto/BN_rand.pod ++++ b/doc/crypto/BN_rand.pod +@@ -45,7 +45,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. + + =head1 SEE ALSO + +-L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)> + + =head1 HISTORY +diff --git a/doc/crypto/CONF_modules_free.pod b/doc/crypto/CONF_modules_free.pod +index 87bc7b7..347020c 100644 +--- a/doc/crypto/CONF_modules_free.pod ++++ b/doc/crypto/CONF_modules_free.pod +@@ -37,7 +37,7 @@ None of the functions return a value. + =head1 SEE ALSO + + L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, +-L<CONF_modules_load_file(3), CONF_modules_load_file(3)> ++L<CONF_modules_load_file(3)|CONF_modules_load_file(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/CONF_modules_load_file.pod b/doc/crypto/CONF_modules_load_file.pod +index 9965d69..6dd9b1d 100644 +--- a/doc/crypto/CONF_modules_load_file.pod ++++ b/doc/crypto/CONF_modules_load_file.pod +@@ -51,7 +51,7 @@ return value of the failing module (this will always be zero or negative). + =head1 SEE ALSO + + L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, +-L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)> ++L<CONF_free(3)|CONF_free(3)>, L<openssl_err(3)|openssl_err(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/DH_generate_key.pod b/doc/crypto/DH_generate_key.pod +index 81f09fd..0d9f1e5 100644 +--- a/doc/crypto/DH_generate_key.pod ++++ b/doc/crypto/DH_generate_key.pod +@@ -40,7 +40,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. + + =head1 SEE ALSO + +-L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)> ++L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/DH_generate_parameters.pod b/doc/crypto/DH_generate_parameters.pod +index 9081e9e..0c0f78c 100644 +--- a/doc/crypto/DH_generate_parameters.pod ++++ b/doc/crypto/DH_generate_parameters.pod +@@ -59,7 +59,7 @@ a usable generator. + + =head1 SEE ALSO + +-L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DH_free(3)|DH_free(3)> + + =head1 HISTORY +diff --git a/doc/crypto/DSA_do_sign.pod b/doc/crypto/DSA_do_sign.pod +index 5dfc733..0a6d5f1 100644 +--- a/doc/crypto/DSA_do_sign.pod ++++ b/doc/crypto/DSA_do_sign.pod +@@ -36,7 +36,7 @@ L<ERR_get_error(3)|ERR_get_error(3)>. + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_SIG_new(3)|DSA_SIG_new(3)>, + L<DSA_sign(3)|DSA_sign(3)> + +diff --git a/doc/crypto/DSA_generate_key.pod b/doc/crypto/DSA_generate_key.pod +index af83ccf..95080eb 100644 +--- a/doc/crypto/DSA_generate_key.pod ++++ b/doc/crypto/DSA_generate_key.pod +@@ -24,7 +24,7 @@ The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>. + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_generate_parameters(3)|DSA_generate_parameters(3)> + + =head1 HISTORY +diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/crypto/DSA_generate_parameters.pod +index be7c924..2b1f78f 100644 +--- a/doc/crypto/DSA_generate_parameters.pod ++++ b/doc/crypto/DSA_generate_parameters.pod +@@ -90,7 +90,7 @@ Seed lengths E<gt> 20 are not supported. + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_free(3)|DSA_free(3)> + + =head1 HISTORY +diff --git a/doc/crypto/DSA_sign.pod b/doc/crypto/DSA_sign.pod +index 97389e8..2e6f6f3 100644 +--- a/doc/crypto/DSA_sign.pod ++++ b/doc/crypto/DSA_sign.pod +@@ -55,7 +55,7 @@ Standard, DSS), ANSI X9.30 + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_do_sign(3)|DSA_do_sign(3)> + + =head1 HISTORY +diff --git a/doc/crypto/ERR_GET_LIB.pod b/doc/crypto/ERR_GET_LIB.pod +index 2a129da..a881bdb 100644 +--- a/doc/crypto/ERR_GET_LIB.pod ++++ b/doc/crypto/ERR_GET_LIB.pod +@@ -41,7 +41,7 @@ The library number, function code and reason code respectively. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/ERR_clear_error.pod b/doc/crypto/ERR_clear_error.pod +index 566e1f4..0f503e7 100644 +--- a/doc/crypto/ERR_clear_error.pod ++++ b/doc/crypto/ERR_clear_error.pod +@@ -20,7 +20,7 @@ ERR_clear_error() has no return value. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/ERR_error_string.pod b/doc/crypto/ERR_error_string.pod +index cdfa7fe..d774ec1 100644 +--- a/doc/crypto/ERR_error_string.pod ++++ b/doc/crypto/ERR_error_string.pod +@@ -60,7 +60,7 @@ none is registered for the error code. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, + L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, + L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> + L<ERR_print_errors(3)|ERR_print_errors(3)> +diff --git a/doc/crypto/ERR_get_error.pod b/doc/crypto/ERR_get_error.pod +index 3444304..cd3d7ce 100644 +--- a/doc/crypto/ERR_get_error.pod ++++ b/doc/crypto/ERR_get_error.pod +@@ -61,7 +61,7 @@ The error code, or 0 if there is no error in the queue. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, + L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> + + =head1 HISTORY +diff --git a/doc/crypto/ERR_load_crypto_strings.pod b/doc/crypto/ERR_load_crypto_strings.pod +index 9bdec75..9c1b991 100644 +--- a/doc/crypto/ERR_load_crypto_strings.pod ++++ b/doc/crypto/ERR_load_crypto_strings.pod +@@ -35,7 +35,7 @@ ERR_free_strings() return no values. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/ERR_load_strings.pod b/doc/crypto/ERR_load_strings.pod +index 5acdd0e..261c87d 100644 +--- a/doc/crypto/ERR_load_strings.pod ++++ b/doc/crypto/ERR_load_strings.pod +@@ -43,7 +43,7 @@ ERR_get_next_error_library() returns a new library number. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/ERR_print_errors.pod b/doc/crypto/ERR_print_errors.pod +index b100a5f..a8b34b7 100644 +--- a/doc/crypto/ERR_print_errors.pod ++++ b/doc/crypto/ERR_print_errors.pod +@@ -38,7 +38,7 @@ ERR_print_errors() and ERR_print_errors_fp() return no values. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, + L<ERR_get_error(3)|ERR_get_error(3)>, + L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, + L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> +diff --git a/doc/crypto/ERR_put_error.pod b/doc/crypto/ERR_put_error.pod +index acd241f..9c0263a 100644 +--- a/doc/crypto/ERR_put_error.pod ++++ b/doc/crypto/ERR_put_error.pod +@@ -34,7 +34,7 @@ no values. + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/ERR_remove_state.pod b/doc/crypto/ERR_remove_state.pod +index 72925fb..8dd63da 100644 +--- a/doc/crypto/ERR_remove_state.pod ++++ b/doc/crypto/ERR_remove_state.pod +@@ -25,7 +25,7 @@ ERR_remove_state() returns no value. + + =head1 SEE ALSO + +-L<err(3)|err(3)> ++L<openssl_err(3)|openssl_err(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/crypto/EVP_BytesToKey.pod +index d375c46..6d6cf39 100644 +--- a/doc/crypto/EVP_BytesToKey.pod ++++ b/doc/crypto/EVP_BytesToKey.pod +@@ -59,7 +59,7 @@ EVP_BytesToKey() returns the size of the derived key in bytes. + + =head1 SEE ALSO + +-L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, ++L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> + + =head1 HISTORY +diff --git a/doc/crypto/EVP_OpenInit.pod b/doc/crypto/EVP_OpenInit.pod +index 2e710da..31172e4 100644 +--- a/doc/crypto/EVP_OpenInit.pod ++++ b/doc/crypto/EVP_OpenInit.pod +@@ -54,7 +54,7 @@ EVP_OpenFinal() returns 0 if the decrypt failed or 1 for success. + + =head1 SEE ALSO + +-L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, ++L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, + L<EVP_SealInit(3)|EVP_SealInit(3)> + +diff --git a/doc/crypto/EVP_SealInit.pod b/doc/crypto/EVP_SealInit.pod +index 7d793e1..a37101f 100644 +--- a/doc/crypto/EVP_SealInit.pod ++++ b/doc/crypto/EVP_SealInit.pod +@@ -74,7 +74,7 @@ with B<type> set to NULL. + + =head1 SEE ALSO + +-L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, ++L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, + L<EVP_OpenInit(3)|EVP_OpenInit(3)> + +diff --git a/doc/crypto/EVP_SignInit.pod b/doc/crypto/EVP_SignInit.pod +index 620a623..090f6e1 100644 +--- a/doc/crypto/EVP_SignInit.pod ++++ b/doc/crypto/EVP_SignInit.pod +@@ -89,7 +89,7 @@ The previous two bugs are fixed in the newer EVP_SignDigest*() function. + =head1 SEE ALSO + + L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>, +-L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, ++L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, + L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, + L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, + L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> +diff --git a/doc/crypto/EVP_VerifyInit.pod b/doc/crypto/EVP_VerifyInit.pod +index 9097f09..2a8d225 100644 +--- a/doc/crypto/EVP_VerifyInit.pod ++++ b/doc/crypto/EVP_VerifyInit.pod +@@ -80,7 +80,7 @@ The previous two bugs are fixed in the newer EVP_VerifyDigest*() function. + + L<evp(3)|evp(3)>, + L<EVP_SignInit(3)|EVP_SignInit(3)>, +-L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, ++L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, + L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, + L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, + L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> +diff --git a/doc/crypto/OPENSSL_config.pod b/doc/crypto/OPENSSL_config.pod +index e7bba2a..888de88 100644 +--- a/doc/crypto/OPENSSL_config.pod ++++ b/doc/crypto/OPENSSL_config.pod +@@ -73,7 +73,7 @@ Neither OPENSSL_config() nor OPENSSL_no_config() return a value. + =head1 SEE ALSO + + L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>, +-L<CONF_modules_free(3),CONF_modules_free(3)> ++L<CONF_modules_free(3)|CONF_modules_free(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/RAND_add.pod b/doc/crypto/RAND_add.pod +index 67c66f3..a6fc28a 100644 +--- a/doc/crypto/RAND_add.pod ++++ b/doc/crypto/RAND_add.pod +@@ -65,7 +65,7 @@ The other functions do not return values. + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, + L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> + + =head1 HISTORY +diff --git a/doc/crypto/RAND_bytes.pod b/doc/crypto/RAND_bytes.pod +index 1a9b91e..20c4110 100644 +--- a/doc/crypto/RAND_bytes.pod ++++ b/doc/crypto/RAND_bytes.pod +@@ -38,7 +38,7 @@ method. + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, + L<RAND_add(3)|RAND_add(3)> + + =head1 HISTORY +diff --git a/doc/crypto/RAND_cleanup.pod b/doc/crypto/RAND_cleanup.pod +index 3a8f074..c99537d 100644 +--- a/doc/crypto/RAND_cleanup.pod ++++ b/doc/crypto/RAND_cleanup.pod +@@ -20,7 +20,7 @@ RAND_cleanup() returns no value. + + =head1 SEE ALSO + +-L<rand(3)|rand(3)> ++L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/RAND_egd.pod b/doc/crypto/RAND_egd.pod +index 8b8c61d..c367290 100644 +--- a/doc/crypto/RAND_egd.pod ++++ b/doc/crypto/RAND_egd.pod +@@ -72,7 +72,7 @@ success, and -1 if the connection failed. The PRNG state is not considered. + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, + L<RAND_cleanup(3)|RAND_cleanup(3)> + + =head1 HISTORY +diff --git a/doc/crypto/RAND_load_file.pod b/doc/crypto/RAND_load_file.pod +index d8c134e..a079013 100644 +--- a/doc/crypto/RAND_load_file.pod ++++ b/doc/crypto/RAND_load_file.pod +@@ -43,7 +43,7 @@ error. + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> ++L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/RAND_set_rand_method.pod b/doc/crypto/RAND_set_rand_method.pod +index e5b780f..7f3ad1b 100644 +--- a/doc/crypto/RAND_set_rand_method.pod ++++ b/doc/crypto/RAND_set_rand_method.pod +@@ -67,7 +67,7 @@ algorithms. + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<engine(3)|engine(3)> ++L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/RSA_blinding_on.pod b/doc/crypto/RSA_blinding_on.pod +index fd2c69a..7b98614 100644 +--- a/doc/crypto/RSA_blinding_on.pod ++++ b/doc/crypto/RSA_blinding_on.pod +@@ -34,7 +34,7 @@ RSA_blinding_off() returns no value. + + =head1 SEE ALSO + +-L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)> ++L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/RSA_generate_key.pod b/doc/crypto/RSA_generate_key.pod +index 52dbb14..3db3487 100644 +--- a/doc/crypto/RSA_generate_key.pod ++++ b/doc/crypto/RSA_generate_key.pod +@@ -59,7 +59,7 @@ RSA_generate_key() goes into an infinite loop for illegal input values. + + =head1 SEE ALSO + +-L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, ++L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, + L<RSA_free(3)|RSA_free(3)> + + =head1 HISTORY +diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/crypto/RSA_public_encrypt.pod +index ab0fe3b..3b00daf 100644 +--- a/doc/crypto/RSA_public_encrypt.pod ++++ b/doc/crypto/RSA_public_encrypt.pod +@@ -73,7 +73,7 @@ SSL, PKCS #1 v2.0 + + =head1 SEE ALSO + +-L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, ++L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, + L<RSA_size(3)|RSA_size(3)> + + =head1 HISTORY +diff --git a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod b/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod +index e70380b..121f3df 100644 +--- a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod ++++ b/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod +@@ -48,7 +48,7 @@ These functions serve no recognizable purpose. + =head1 SEE ALSO + + L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, +-L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, + L<RSA_verify(3)|RSA_verify(3)> + + =head1 HISTORY +diff --git a/doc/crypto/X509_NAME_ENTRY_get_object.pod b/doc/crypto/X509_NAME_ENTRY_get_object.pod +index 41902c0..4716e7e 100644 +--- a/doc/crypto/X509_NAME_ENTRY_get_object.pod ++++ b/doc/crypto/X509_NAME_ENTRY_get_object.pod +@@ -65,7 +65,7 @@ set first so the relevant field information can be looked up internally. + =head1 SEE ALSO + + L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>, +-L<OBJ_nid2obj(3),OBJ_nid2obj(3)> ++L<OBJ_nid2obj(3)|OBJ_nid2obj(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/bn.pod b/doc/crypto/bn.pod +index cd2f8e5..a6f8c58 100644 +--- a/doc/crypto/bn.pod ++++ b/doc/crypto/bn.pod +@@ -167,7 +167,7 @@ of B<BIGNUM>s to external formats is described in L<BN_bn2bin(3)|BN_bn2bin(3)>. + =head1 SEE ALSO + + L<bn_internal(3)|bn_internal(3)>, +-L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, ++L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, + L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>, + L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>, + L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>, +diff --git a/doc/crypto/crypto.pod b/doc/crypto/crypto.pod +index 7a52799..ca71202 100644 +--- a/doc/crypto/crypto.pod ++++ b/doc/crypto/crypto.pod +@@ -46,7 +46,7 @@ L<sha(3)|sha(3)> + + =item AUXILIARY FUNCTIONS + +-L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)> + + =item INPUT/OUTPUT, DATA ENCODING +diff --git a/doc/crypto/des.pod b/doc/crypto/des.pod +index 6f0cf1c..3fd2c47 100644 +--- a/doc/crypto/des.pod ++++ b/doc/crypto/des.pod +@@ -115,7 +115,7 @@ each byte is the parity bit. The key schedule is an expanded form of + the key; it is used to speed the encryption process. + + DES_random_key() generates a random key. The PRNG must be seeded +-prior to using this function (see L<rand(3)|rand(3)>). If the PRNG ++prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>). If the PRNG + could not generate a secure key, 0 is returned. + + Before a DES key can be used, it must be converted into the +@@ -317,7 +317,7 @@ the MIT Kerberos library. + + =head1 SEE ALSO + +-crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)> ++crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff --git a/doc/crypto/dh.pod b/doc/crypto/dh.pod +index c3ccd06..28707bf 100644 +--- a/doc/crypto/dh.pod ++++ b/doc/crypto/dh.pod +@@ -67,8 +67,8 @@ modify keys. + + =head1 SEE ALSO + +-L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>, +-L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, ++L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, + L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, + L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, + L<DH_generate_parameters(3)|DH_generate_parameters(3)>, +diff --git a/doc/crypto/dsa.pod b/doc/crypto/dsa.pod +index da07d2b..3187a73 100644 +--- a/doc/crypto/dsa.pod ++++ b/doc/crypto/dsa.pod +@@ -100,7 +100,7 @@ Standard, DSS), ANSI X9.30 + + =head1 SEE ALSO + +-L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, ++L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>, + L<DSA_new(3)|DSA_new(3)>, + L<DSA_size(3)|DSA_size(3)>, +diff --git a/doc/crypto/engine.pod b/doc/crypto/engine.pod +index f5ab1c3..63f7ebc 100644 +--- a/doc/crypto/engine.pod ++++ b/doc/crypto/engine.pod +@@ -594,6 +594,6 @@ implementations. + + =head1 SEE ALSO + +-L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)> ++L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =cut +diff --git a/doc/crypto/err.pod b/doc/crypto/err.pod +deleted file mode 100644 +index 6f72955..0000000 +--- a/doc/crypto/err.pod ++++ /dev/null +@@ -1,187 +0,0 @@ +-=pod +- +-=head1 NAME +- +-err - error codes +- +-=head1 SYNOPSIS +- +- #include <openssl/err.h> +- +- unsigned long ERR_get_error(void); +- unsigned long ERR_peek_error(void); +- unsigned long ERR_get_error_line(const char **file, int *line); +- unsigned long ERR_peek_error_line(const char **file, int *line); +- unsigned long ERR_get_error_line_data(const char **file, int *line, +- const char **data, int *flags); +- unsigned long ERR_peek_error_line_data(const char **file, int *line, +- const char **data, int *flags); +- +- int ERR_GET_LIB(unsigned long e); +- int ERR_GET_FUNC(unsigned long e); +- int ERR_GET_REASON(unsigned long e); +- +- void ERR_clear_error(void); +- +- char *ERR_error_string(unsigned long e, char *buf); +- const char *ERR_lib_error_string(unsigned long e); +- const char *ERR_func_error_string(unsigned long e); +- const char *ERR_reason_error_string(unsigned long e); +- +- void ERR_print_errors(BIO *bp); +- void ERR_print_errors_fp(FILE *fp); +- +- void ERR_load_crypto_strings(void); +- void ERR_free_strings(void); +- +- void ERR_remove_state(unsigned long pid); +- +- void ERR_put_error(int lib, int func, int reason, const char *file, +- int line); +- void ERR_add_error_data(int num, ...); +- +- void ERR_load_strings(int lib,ERR_STRING_DATA str[]); +- unsigned long ERR_PACK(int lib, int func, int reason); +- int ERR_get_next_error_library(void); +- +-=head1 DESCRIPTION +- +-When a call to the OpenSSL library fails, this is usually signalled +-by the return value, and an error code is stored in an error queue +-associated with the current thread. The B<err> library provides +-functions to obtain these error codes and textual error messages. +- +-The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to +-access error codes. +- +-Error codes contain information about where the error occurred, and +-what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to +-extract this information. A method to obtain human-readable error +-messages is described in L<ERR_error_string(3)|ERR_error_string(3)>. +- +-L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the +-error queue. +- +-Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to +-avoid memory leaks when threads are terminated. +- +-=head1 ADDING NEW ERROR CODES TO OPENSSL +- +-See L<ERR_put_error(3)> if you want to record error codes in the +-OpenSSL error system from within your application. +- +-The remainder of this section is of interest only if you want to add +-new error codes to OpenSSL or add error codes from external libraries. +- +-=head2 Reporting errors +- +-Each sub-library has a specific macro XXXerr() that is used to report +-errors. Its first argument is a function code B<XXX_F_...>, the second +-argument is a reason code B<XXX_R_...>. Function codes are derived +-from the function names; reason codes consist of textual error +-descriptions. For example, the function ssl23_read() reports a +-"handshake failure" as follows: +- +- SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE); +- +-Function and reason codes should consist of upper case characters, +-numbers and underscores only. The error file generation script translates +-function codes into function names by looking in the header files +-for an appropriate function name, if none is found it just uses +-the capitalized form such as "SSL23_READ" in the above example. +- +-The trailing section of a reason code (after the "_R_") is translated +-into lower case and underscores changed to spaces. +- +-When you are using new function or reason codes, run B<make errors>. +-The necessary B<#define>s will then automatically be added to the +-sub-library's header file. +- +-Although a library will normally report errors using its own specific +-XXXerr macro, another library's macro can be used. This is normally +-only done when a library wants to include ASN1 code which must use +-the ASN1err() macro. +- +-=head2 Adding new libraries +- +-When adding a new sub-library to OpenSSL, assign it a library number +-B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its +-name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add +-C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function +-(in B<crypto/err/err_all.c>). Finally, add an entry +- +- L XXX xxx.h xxx_err.c +- +-to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile. +-Running B<make errors> will then generate a file B<xxx_err.c>, and +-add all error codes used in the library to B<xxx.h>. +- +-Additionally the library include file must have a certain form. +-Typically it will initially look like this: +- +- #ifndef HEADER_XXX_H +- #define HEADER_XXX_H +- +- #ifdef __cplusplus +- extern "C" { +- #endif +- +- /* Include files */ +- +- #include <openssl/bio.h> +- #include <openssl/x509.h> +- +- /* Macros, structures and function prototypes */ +- +- +- /* BEGIN ERROR CODES */ +- +-The B<BEGIN ERROR CODES> sequence is used by the error code +-generation script as the point to place new error codes, any text +-after this point will be overwritten when B<make errors> is run. +-The closing #endif etc will be automatically added by the script. +- +-The generated C error code file B<xxx_err.c> will load the header +-files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the +-header file must load any additional header files containing any +-definitions it uses. +- +-=head1 USING ERROR CODES IN EXTERNAL LIBRARIES +- +-It is also possible to use OpenSSL's error code scheme in external +-libraries. The library needs to load its own codes and call the OpenSSL +-error code insertion script B<mkerr.pl> explicitly to add codes to +-the header file and generate the C error code file. This will normally +-be done if the external library needs to generate new ASN1 structures +-but it can also be used to add more general purpose error code handling. +- +-TBA more details +- +-=head1 INTERNALS +- +-The error queues are stored in a hash table with one B<ERR_STATE> +-entry for each pid. ERR_get_state() returns the current thread's +-B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error +-codes. When more error codes are added, the old ones are overwritten, +-on the assumption that the most recent errors are most important. +- +-Error strings are also stored in hash table. The hash tables can +-be obtained by calling ERR_get_err_state_table(void) and +-ERR_get_string_table(void) respectively. +- +-=head1 SEE ALSO +- +-L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>, +-L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>, +-L<ERR_get_error(3)|ERR_get_error(3)>, +-L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>, +-L<ERR_clear_error(3)|ERR_clear_error(3)>, +-L<ERR_error_string(3)|ERR_error_string(3)>, +-L<ERR_print_errors(3)|ERR_print_errors(3)>, +-L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, +-L<ERR_remove_state(3)|ERR_remove_state(3)>, +-L<ERR_put_error(3)|ERR_put_error(3)>, +-L<ERR_load_strings(3)|ERR_load_strings(3)>, +-L<SSL_get_error(3)|SSL_get_error(3)> +- +-=cut +diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod +deleted file mode 100644 +index 1c068c8..0000000 +--- a/doc/crypto/rand.pod ++++ /dev/null +@@ -1,175 +0,0 @@ +-=pod +- +-=head1 NAME +- +-rand - pseudo-random number generator +- +-=head1 SYNOPSIS +- +- #include <openssl/rand.h> +- +- int RAND_set_rand_engine(ENGINE *engine); +- +- int RAND_bytes(unsigned char *buf, int num); +- int RAND_pseudo_bytes(unsigned char *buf, int num); +- +- void RAND_seed(const void *buf, int num); +- void RAND_add(const void *buf, int num, int entropy); +- int RAND_status(void); +- +- int RAND_load_file(const char *file, long max_bytes); +- int RAND_write_file(const char *file); +- const char *RAND_file_name(char *file, size_t num); +- +- int RAND_egd(const char *path); +- +- void RAND_set_rand_method(const RAND_METHOD *meth); +- const RAND_METHOD *RAND_get_rand_method(void); +- RAND_METHOD *RAND_SSLeay(void); +- +- void RAND_cleanup(void); +- +- /* For Win32 only */ +- void RAND_screen(void); +- int RAND_event(UINT, WPARAM, LPARAM); +- +-=head1 DESCRIPTION +- +-Since the introduction of the ENGINE API, the recommended way of controlling +-default implementations is by using the ENGINE API functions. The default +-B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by +-RAND_get_rand_method(), is only used if no ENGINE has been set as the default +-"rand" implementation. Hence, these two functions are no longer the recommened +-way to control defaults. +- +-If an alternative B<RAND_METHOD> implementation is being used (either set +-directly or as provided by an ENGINE module), then it is entirely responsible +-for the generation and management of a cryptographically secure PRNG stream. The +-mechanisms described below relate solely to the software PRNG implementation +-built in to OpenSSL and used by default. +- +-These functions implement a cryptographically secure pseudo-random +-number generator (PRNG). It is used by other library functions for +-example to generate random keys, and applications can use it when they +-need randomness. +- +-A cryptographic PRNG must be seeded with unpredictable data such as +-mouse movements or keys pressed at random by the user. This is +-described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file +-(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the +-seeding process whenever the application is started. +- +-L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the +-PRNG. +- +-=head1 INTERNALS +- +-The RAND_SSLeay() method implements a PRNG based on a cryptographic +-hash function. +- +-The following description of its design is based on the SSLeay +-documentation: +- +-First up I will state the things I believe I need for a good RNG. +- +-=over 4 +- +-=item 1 +- +-A good hashing algorithm to mix things up and to convert the RNG 'state' +-to random numbers. +- +-=item 2 +- +-An initial source of random 'state'. +- +-=item 3 +- +-The state should be very large. If the RNG is being used to generate +-4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum). +-If your RNG state only has 128 bits, you are obviously limiting the +-search space to 128 bits, not 2048. I'm probably getting a little +-carried away on this last point but it does indicate that it may not be +-a bad idea to keep quite a lot of RNG state. It should be easier to +-break a cipher than guess the RNG seed data. +- +-=item 4 +- +-Any RNG seed data should influence all subsequent random numbers +-generated. This implies that any random seed data entered will have +-an influence on all subsequent random numbers generated. +- +-=item 5 +- +-When using data to seed the RNG state, the data used should not be +-extractable from the RNG state. I believe this should be a +-requirement because one possible source of 'secret' semi random +-data would be a private key or a password. This data must +-not be disclosed by either subsequent random numbers or a +-'core' dump left by a program crash. +- +-=item 6 +- +-Given the same initial 'state', 2 systems should deviate in their RNG state +-(and hence the random numbers generated) over time if at all possible. +- +-=item 7 +- +-Given the random number output stream, it should not be possible to determine +-the RNG state or the next random number. +- +-=back +- +-The algorithm is as follows. +- +-There is global state made up of a 1023 byte buffer (the 'state'), a +-working hash value ('md'), and a counter ('count'). +- +-Whenever seed data is added, it is inserted into the 'state' as +-follows. +- +-The input is chopped up into units of 20 bytes (or less for +-the last block). Each of these blocks is run through the hash +-function as follows: The data passed to the hash function +-is the current 'md', the same number of bytes from the 'state' +-(the location determined by in incremented looping index) as +-the current 'block', the new key data 'block', and 'count' +-(which is incremented after each use). +-The result of this is kept in 'md' and also xored into the +-'state' at the same locations that were used as input into the +-hash function. I +-believe this system addresses points 1 (hash function; currently +-SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash +-function and xor). +- +-When bytes are extracted from the RNG, the following process is used. +-For each group of 10 bytes (or less), we do the following: +- +-Input into the hash function the local 'md' (which is initialized from +-the global 'md' before any bytes are generated), the bytes that are to +-be overwritten by the random bytes, and bytes from the 'state' +-(incrementing looping index). From this digest output (which is kept +-in 'md'), the top (up to) 10 bytes are returned to the caller and the +-bottom 10 bytes are xored into the 'state'. +- +-Finally, after we have finished 'num' random bytes for the caller, +-'count' (which is incremented) and the local and global 'md' are fed +-into the hash function and the results are kept in the global 'md'. +- +-I believe the above addressed points 1 (use of SHA-1), 6 (by hashing +-into the 'state' the 'old' data from the caller that is about to be +-overwritten) and 7 (by not using the 10 bytes given to the caller to +-update the 'state', but they are used to update 'md'). +- +-So of the points raised, only 2 is not addressed (but see +-L<RAND_add(3)|RAND_add(3)>). +- +-=head1 SEE ALSO +- +-L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, +-L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>, +-L<RAND_bytes(3)|RAND_bytes(3)>, +-L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, +-L<RAND_cleanup(3)|RAND_cleanup(3)> +- +-=cut +diff --git a/doc/crypto/rsa.pod b/doc/crypto/rsa.pod +index 45ac53f..5fa0dcc 100644 +--- a/doc/crypto/rsa.pod ++++ b/doc/crypto/rsa.pod +@@ -108,7 +108,7 @@ RSA was covered by a US patent which expired in September 2000. + =head1 SEE ALSO + + L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, +-L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, + L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>, + L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>, + L<RSA_generate_key(3)|RSA_generate_key(3)>, +diff --git a/doc/crypto/threads.pod b/doc/crypto/threads.pod +deleted file mode 100644 +index dc0e939..0000000 +--- a/doc/crypto/threads.pod ++++ /dev/null +@@ -1,210 +0,0 @@ +-=pod +- +-=head1 NAME +- +-CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback, +-CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy, +-CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks, +-CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback, +-CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid, +-CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support +- +-=head1 SYNOPSIS +- +- #include <openssl/crypto.h> +- +- /* Don't use this structure directly. */ +- typedef struct crypto_threadid_st +- { +- void *ptr; +- unsigned long val; +- } CRYPTO_THREADID; +- /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */ +- void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val); +- void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr); +- int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *)); +- void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *); +- void CRYPTO_THREADID_current(CRYPTO_THREADID *id); +- int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, +- const CRYPTO_THREADID *b); +- void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, +- const CRYPTO_THREADID *src); +- unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id); +- +- int CRYPTO_num_locks(void); +- +- /* struct CRYPTO_dynlock_value needs to be defined by the user */ +- struct CRYPTO_dynlock_value; +- +- void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value * +- (*dyn_create_function)(char *file, int line)); +- void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function) +- (int mode, struct CRYPTO_dynlock_value *l, +- const char *file, int line)); +- void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function) +- (struct CRYPTO_dynlock_value *l, const char *file, int line)); +- +- int CRYPTO_get_new_dynlockid(void); +- +- void CRYPTO_destroy_dynlockid(int i); +- +- void CRYPTO_lock(int mode, int n, const char *file, int line); +- +- #define CRYPTO_w_lock(type) \ +- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) +- #define CRYPTO_w_unlock(type) \ +- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) +- #define CRYPTO_r_lock(type) \ +- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) +- #define CRYPTO_r_unlock(type) \ +- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) +- #define CRYPTO_add(addr,amount,type) \ +- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) +- +-=head1 DESCRIPTION +- +-OpenSSL can safely be used in multi-threaded applications provided +-that at least two callback functions are set, locking_function and +-threadid_func. +- +-locking_function(int mode, int n, const char *file, int line) is +-needed to perform locking on shared data structures. +-(Note that OpenSSL uses a number of global data structures that +-will be implicitly shared whenever multiple threads use OpenSSL.) +-Multi-threaded applications will crash at random if it is not set. +- +-locking_function() must be able to handle up to CRYPTO_num_locks() +-different mutex locks. It sets the B<n>-th lock if B<mode> & +-B<CRYPTO_LOCK>, and releases it otherwise. +- +-B<file> and B<line> are the file number of the function setting the +-lock. They can be useful for debugging. +- +-threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing +-thread's identifier into B<id>. The implementation of this callback should not +-fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread +-IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based. +-If the application does not register such a callback using +-CRYPTO_THREADID_set_callback(), then a default implementation is used - on +-Windows and BeOS this uses the system's default thread identifying APIs, and on +-all other platforms it uses the address of B<errno>. The latter is satisfactory +-for thread-safety if and only if the platform has a thread-local error number +-facility. +- +-Once threadid_func() is registered, or if the built-in default implementation is +-to be used; +- +-=over 4 +- +-=item * +-CRYPTO_THREADID_current() records the currently-executing thread ID into the +-given B<id> object. +- +-=item * +-CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie. +-the same semantics as memcmp()). +- +-=item * +-CRYPTO_THREADID_cpy() duplicates a thread ID value, +- +-=item * +-CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This +-is usually the exact numeric or pointer-based thread ID used internally, however +-this also handles the unusual case where pointers are larger than 'long' +-variables and the platform's thread IDs are pointer-based - in this case, mixing +-is done to attempt to produce a unique numeric value even though it is not as +-wide as the platform's true thread IDs. +- +-=back +- +-Additionally, OpenSSL supports dynamic locks, and sometimes, some parts +-of OpenSSL need it for better performance. To enable this, the following +-is required: +- +-=over 4 +- +-=item * +-Three additional callback function, dyn_create_function, dyn_lock_function +-and dyn_destroy_function. +- +-=item * +-A structure defined with the data that each lock needs to handle. +- +-=back +- +-struct CRYPTO_dynlock_value has to be defined to contain whatever structure +-is needed to handle locks. +- +-dyn_create_function(const char *file, int line) is needed to create a +-lock. Multi-threaded applications might crash at random if it is not set. +- +-dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line) +-is needed to perform locking off dynamic lock numbered n. Multi-threaded +-applications might crash at random if it is not set. +- +-dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is +-needed to destroy the lock l. Multi-threaded applications might crash at +-random if it is not set. +- +-CRYPTO_get_new_dynlockid() is used to create locks. It will call +-dyn_create_function for the actual creation. +- +-CRYPTO_destroy_dynlockid() is used to destroy locks. It will call +-dyn_destroy_function for the actual destruction. +- +-CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield +-describing what should be done with the lock. n is the number of the +-lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined +-from the following values. These values are pairwise exclusive, with +-undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE +-should not be used together): +- +- CRYPTO_LOCK 0x01 +- CRYPTO_UNLOCK 0x02 +- CRYPTO_READ 0x04 +- CRYPTO_WRITE 0x08 +- +-=head1 RETURN VALUES +- +-CRYPTO_num_locks() returns the required number of locks. +- +-CRYPTO_get_new_dynlockid() returns the index to the newly created lock. +- +-The other functions return no values. +- +-=head1 NOTES +- +-You can find out if OpenSSL was configured with thread support: +- +- #define OPENSSL_THREAD_DEFINES +- #include <openssl/opensslconf.h> +- #if defined(OPENSSL_THREADS) +- // thread support enabled +- #else +- // no thread support +- #endif +- +-Also, dynamic locks are currently not used internally by OpenSSL, but +-may do so in the future. +- +-=head1 EXAMPLES +- +-B<crypto/threads/mttest.c> shows examples of the callback functions on +-Solaris, Irix and Win32. +- +-=head1 HISTORY +- +-CRYPTO_set_locking_callback() is +-available in all versions of SSLeay and OpenSSL. +-CRYPTO_num_locks() was added in OpenSSL 0.9.4. +-All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev. +-B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0 +-to replace (actually, deprecate) the previous CRYPTO_set_id_callback(), +-CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed +-thread IDs to always be represented by 'unsigned long'. +- +-=head1 SEE ALSO +- +-L<crypto(3)|crypto(3)> +- +-=cut +diff --git a/doc/ssl/SSL_get_error.pod b/doc/ssl/SSL_get_error.pod +index 48c6b15..5432293 100644 +--- a/doc/ssl/SSL_get_error.pod ++++ b/doc/ssl/SSL_get_error.pod +@@ -105,7 +105,7 @@ OpenSSL error queue contains more information on the error. + + =head1 SEE ALSO + +-L<ssl(3)|ssl(3)>, L<err(3)|err(3)> ++L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)> + + =head1 HISTORY + +diff --git a/doc/ssl/SSL_want.pod b/doc/ssl/SSL_want.pod +index c0059c0..2e51a75 100644 +--- a/doc/ssl/SSL_want.pod ++++ b/doc/ssl/SSL_want.pod +@@ -72,6 +72,6 @@ return 1, when the corresponding condition is true or 0 otherwise. + + =head1 SEE ALSO + +-L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> ++L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> + + =cut diff --git a/main/openssl/openssl-0.9.8k-quote-cc.patch b/main/openssl/openssl-0.9.8k-quote-cc.patch deleted file mode 100644 index 5a61662886..0000000000 --- a/main/openssl/openssl-0.9.8k-quote-cc.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- openssl-0.9.8k/Makefile.orig 2009-04-07 12:28:31.000000000 +0000 -+++ openssl-0.9.8k/Makefile 2009-04-07 12:30:13.000000000 +0000 -@@ -359,7 +359,7 @@ - $(AR) libcrypto.a fips/fipscanister.o ; \ - else \ - if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ -- FIPSLD_CC=$(CC); CC=fips/fipsld; \ -+ FIPSLD_CC="$(CC)"; CC=fips/fipsld; \ - export CC FIPSLD_CC; \ - fi; \ - $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ -@@ -382,9 +382,9 @@ - fips/fipscanister.o: build_fips - libfips$(SHLIB_EXT): fips/fipscanister.o - @if [ "$(SHLIB_TARGET)" != "" ]; then \ -- FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \ -+ FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \ - $(MAKE) -f Makefile.shared -e $(BUILDENV) \ -- CC=$${CC} LIBNAME=fips THIS=$@ \ -+ CC="$${CC}" LIBNAME=fips THIS=$@ \ - LIBEXTRAS=fips/fipscanister.o \ - LIBDEPS="$(EX_LIBS)" \ - LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ ---- openssl-0.9.8k/apps/Makefile.orig 2009-04-07 12:35:30.000000000 +0000 -+++ openssl-0.9.8k/apps/Makefile 2009-04-07 12:56:53.000000000 +0000 -@@ -153,12 +153,12 @@ - shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - elif [ -n "$(FIPSCANLIB)" ]; then \ -- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ -+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ - fi; \ - LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ - [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ -- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ -+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -(cd ..; \ ---- openssl-0.9.8k/test/Makefile.orig 2009-04-07 13:26:06.000000000 +0000 -+++ openssl-0.9.8k/test/Makefile 2009-04-07 13:26:38.000000000 +0000 -@@ -402,13 +402,13 @@ - if [ "$(FIPSCANLIB)" = "libfips" ]; then \ - LIBRARIES="-L$(TOP) -lfips"; \ - elif [ -n "$(FIPSCANLIB)" ]; then \ -- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ -+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ - LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ - else \ - LIBRARIES="$(LIBCRYPTO)"; \ - fi; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ -- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ -+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -@@ -417,11 +417,11 @@ - fi; \ - LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ - if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ -- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ -+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ - fi; \ - [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ -- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ -+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD index bd751f3111..3bd1119a45 100644 --- a/main/openvpn/APKBUILD +++ b/main/openvpn/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openvpn pkgver=2.1.1 -pkgrel=0 +pkgrel=2 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="http://openvpn.sourceforge.net/" license="custom" diff --git a/main/oprofile/APKBUILD b/main/oprofile/APKBUILD index 29cb35bf7e..bc81fff7a9 100644 --- a/main/oprofile/APKBUILD +++ b/main/oprofile/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=oprofile pkgver=0.9.6 -pkgrel=0 +pkgrel=1 pkgdesc="A System Profiler for Linux" url="http://oprofile.sourceforge.net/" license="GPL" diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD index b310c80c60..6a80beb219 100644 --- a/main/orage/APKBUILD +++ b/main/orage/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=orage pkgver=4.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="A simple calendar application with reminders for Xfce" url="http://www.xfce.org/projects/orage/" license="GPL-2" diff --git a/main/p7zip/APKBUILD b/main/p7zip/APKBUILD index b022e17baf..19ecadb2c5 100644 --- a/main/p7zip/APKBUILD +++ b/main/p7zip/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=p7zip pkgver=9.04 -pkgrel=0 +pkgrel=2 pkgdesc="A command-line port of the 7zip compression utility" url="http://p7zip.sourceforge.net" license="GPL" subpackages="$pkgname-doc" depends= -makedepends="bash uclibc++-dev" +makedepends="bash" #install=p7zip.install source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${pkgver}_src_all.tar.bz2 p7zip-cc-cxx.patch" @@ -16,8 +16,6 @@ build() { cd "$srcdir"/${pkgname}_${pkgver} patch -p1 -i ../p7zip-cc-cxx.patch || return 1 sed -i "s|usr/local|usr|g" makefile - export CXX=${UC_CXX:-g++-uc} - make all3 OPTFLAGS="${CXXFLAGS}" || return 1 } diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD index 967a643210..c941679c00 100644 --- a/main/pango/APKBUILD +++ b/main/pango/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pango pkgver=1.28.0 -pkgrel=0 +pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.pango.org/" license="LGPL" diff --git a/main/parole/APKBUILD b/main/parole/APKBUILD index 07b9b0d788..49c1930a57 100644 --- a/main/parole/APKBUILD +++ b/main/parole/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=parole pkgver=0.2.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Media player for the Xfce desktop" url="http://goodies.xfce.org/projects/applications/parole/" license="GPL" diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD index 0ae62c975d..2bf6e95f8a 100644 --- a/main/parted/APKBUILD +++ b/main/parted/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=parted pkgver=2.2 -pkgrel=0 +pkgrel=1 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="http://www.gnu.org/software/parted/parted.html" license="GPL3" diff --git a/main/patch/APKBUILD b/main/patch/APKBUILD index 7090ee4852..2b9aa1d2d5 100644 --- a/main/patch/APKBUILD +++ b/main/patch/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=patch pkgver=2.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Utility to apply diffs to files" url="http://www.gnu.org/software/patch/patch.html" license='GPL' diff --git a/main/pax-utils/APKBUILD b/main/pax-utils/APKBUILD index 8b31035f59..4a7069bc0d 100644 --- a/main/pax-utils/APKBUILD +++ b/main/pax-utils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pax-utils pkgver=0.2 -pkgrel=0 +pkgrel=1 pkgdesc="ELF related utils for ELF 32/64 binaries" url="http://hardened.gentoo.org/pax-utils.xml" license='GPL-2' diff --git a/main/paxctl/APKBUILD b/main/paxctl/APKBUILD index b8ac414d76..401cc872f2 100644 --- a/main/paxctl/APKBUILD +++ b/main/paxctl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=paxctl pkgver=0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Manage PaX releated program header flags" url="http://pax.grsecurity.net" license="GPL-2" diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD index 946c24c160..7c775f972f 100644 --- a/main/pciutils/APKBUILD +++ b/main/pciutils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=pciutils pkgver=3.1.7 -pkgrel=0 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" license="GPL" diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD index 87a1c30521..a5afa81ea5 100644 --- a/main/pcmciautils/APKBUILD +++ b/main/pcmciautils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcmciautils pkgver=016 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for inserting and removing PCMCIA cards" url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license="GPL" diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD index f46c34268c..c091226e11 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre pkgver=8.02 -pkgrel=0 +pkgrel=1 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" license="BSD" diff --git a/main/perl-compress-raw-bzip2/APKBUILD b/main/perl-compress-raw-bzip2/APKBUILD index 864722974f..7d8d0b1746 100644 --- a/main/perl-compress-raw-bzip2/APKBUILD +++ b/main/perl-compress-raw-bzip2/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-compress-raw-bzip2 _realname=Compress-Raw-Bzip2 pkgver=2.024 -pkgrel=0 +pkgrel=1 pkgdesc="Perl low-level interface to bzip2 compression library" url="http://search.cpan.org/~pmqs/Compress-Raw-Bzip2-2.024/" license="GPL PerlArtistic" diff --git a/main/perl-compress-raw-zlib/APKBUILD b/main/perl-compress-raw-zlib/APKBUILD index a5820f84c6..0529ccbdf0 100644 --- a/main/perl-compress-raw-zlib/APKBUILD +++ b/main/perl-compress-raw-zlib/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-compress-raw-zlib _realname=Compress-Raw-Zlib pkgver=2.024 -pkgrel=0 +pkgrel=1 pkgdesc="Perl low-level interface to zlib compression library" url="http://search.cpan.org/~pmqs/Compress-Raw-Zlib-2.024/" license="GPL PerlArtistic" diff --git a/main/perl-convert-uulib/APKBUILD b/main/perl-convert-uulib/APKBUILD index e469ed9acb..e9ecba5371 100644 --- a/main/perl-convert-uulib/APKBUILD +++ b/main/perl-convert-uulib/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-convert-uulib _realname=Convert-UUlib pkgver=1.12 -pkgrel=0 +pkgrel=1 pkgdesc="Perl interface to the uulib library" url="http://search.cpan.org/~mlehmann/Convert-UUlib-1.12/UUlib.pm" license="Artistic GPL2" diff --git a/main/perl-crypt-openssl-random/APKBUILD b/main/perl-crypt-openssl-random/APKBUILD index 78568c61bd..3334a629d6 100644 --- a/main/perl-crypt-openssl-random/APKBUILD +++ b/main/perl-crypt-openssl-random/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-crypt-openssl-random _realname=Crypt-OpenSSL-Random pkgver=0.04 -pkgrel=0 +pkgrel=2 pkgdesc="RSA encoding and decoding, using the openSSL libraries" url="http://search.cpan.org/~iroberts/Crypt-OpenSSL-Random-0.04/" license="Unknown" diff --git a/main/perl-crypt-openssl-rsa/APKBUILD b/main/perl-crypt-openssl-rsa/APKBUILD index 1b5991650c..bce2e80701 100644 --- a/main/perl-crypt-openssl-rsa/APKBUILD +++ b/main/perl-crypt-openssl-rsa/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-crypt-openssl-rsa _realname=Crypt-OpenSSL-RSA pkgver=0.26 -pkgrel=0 +pkgrel=2 pkgdesc="RSA encoding and decoding, using the openSSL libraries" url="http://search.cpan.org/~iroberts/Crypt-OpenSSL-RSA-0.25/" license="Unknown" diff --git a/main/perl-db/APKBUILD b/main/perl-db/APKBUILD index 2b434ea5d5..dbc64cfcfc 100644 --- a/main/perl-db/APKBUILD +++ b/main/perl-db/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-db _realname=BerkeleyDB pkgver=0.41 -pkgrel=0 +pkgrel=1 pkgdesc="Perl extension for Berkeley DB version 2, 3 or 4" url="http://search.cpan.org/~pmqs/BerkeleyDB-0.38/" license="GPL PerlArtistic" diff --git a/main/perl-db_file/APKBUILD b/main/perl-db_file/APKBUILD index 88b155d65e..7f3d6875d3 100644 --- a/main/perl-db_file/APKBUILD +++ b/main/perl-db_file/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-db_file _realname=DB_File pkgver=1.820 -pkgrel=1 +pkgrel=2 pkgdesc="Perl5 access to Berkeley DB" url="http://search.cpan.org/~pmqs/DB_File-1.820/" license="GPL PerlArtistic" diff --git a/main/perl-digest-sha1/APKBUILD b/main/perl-digest-sha1/APKBUILD index 0b40dfb40a..044d84423b 100644 --- a/main/perl-digest-sha1/APKBUILD +++ b/main/perl-digest-sha1/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.12 -pkgrel=0 +pkgrel=1 pkgdesc="Perl interface to the SHA-1 algorithm" url="http://search.cpan.org/~gaas/Digest-SHA1-2.12/" license="GPL PerlArtistic" diff --git a/main/perl-file-rsync/APKBUILD b/main/perl-file-rsync/APKBUILD index 700e3eeef7..2a1e928531 100644 --- a/main/perl-file-rsync/APKBUILD +++ b/main/perl-file-rsync/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-file-rsync _realname=File-RsyncP pkgver=0.68 -pkgrel=0 +pkgrel=1 pkgdesc="Perl rsync client" url="http://search.cpan.org/~cbarratt/File-RsyncP-0.68/" license="GPL PerlArtistic" diff --git a/main/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD index 8fbac7fec6..87961b1f4f 100644 --- a/main/perl-html-parser/APKBUILD +++ b/main/perl-html-parser/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-html-parser _realname=HTML-Parser pkgver=3.64 -pkgrel=0 +pkgrel=1 pkgdesc="Parse section of HTML documents" url="http://search.cpan.org/~gaas/HTML-Parser-3.60/" license="GPL PerlArtistic" diff --git a/main/perl-mail-clamav/APKBUILD b/main/perl-mail-clamav/APKBUILD index c8ef7ea723..5f33f12b3e 100644 --- a/main/perl-mail-clamav/APKBUILD +++ b/main/perl-mail-clamav/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-mail-clamav _realname=Mail-ClamAV pkgver=0.29 -pkgrel=0 +pkgrel=1 pkgdesc="Perl extension for the clamav virus scanner" url="http://search.cpan.org/~converter/Mail-ClamAV-0.29/" license="Unknown" diff --git a/main/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD index a86c014fde..9682b7e2b0 100644 --- a/main/perl-mail-spamassassin/APKBUILD +++ b/main/perl-mail-spamassassin/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-mail-spamassassin _realname=Mail-SpamAssassin pkgver=3.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Spam detector and markup engine" url="http://search.cpan.org/~jmason/Mail-SpamAssassin-3.2.5/" license="unknown" diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD index d87821b69b..7f3580d061 100644 --- a/main/perl-net-dns/APKBUILD +++ b/main/perl-net-dns/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-net-dns _realname=Net-DNS pkgver=0.66 -pkgrel=0 +pkgrel=1 pkgdesc="Perl interface to the DNS resolver" url="http://search.cpan.org/dist/Archive-Zip/" license="unknown" diff --git a/main/perl-net-ssleay/APKBUILD b/main/perl-net-ssleay/APKBUILD index 966aeb770c..d6c366aaae 100644 --- a/main/perl-net-ssleay/APKBUILD +++ b/main/perl-net-ssleay/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-net-ssleay _realname=Net-SSLeay pkgver=1.36 -pkgrel=0 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" url="http://search.cpan.org/dist/Net-SSLeay/" license="GPL" diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD index c1e687de00..8643038afb 100644 --- a/main/perl-netaddr-ip/APKBUILD +++ b/main/perl-netaddr-ip/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.027 -pkgrel=0 +pkgrel=1 pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets" url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/" license="Unknown" diff --git a/main/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD index 83e13d8f6b..65fc2adc86 100644 --- a/main/perl-test-pod/APKBUILD +++ b/main/perl-test-pod/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-test-pod _realname=Test-Pod -pkgver=1.26 +pkgver=1.44 pkgrel=0 pkgdesc="Check for POD errors in files" url="http://search.cpan.org/~petdance/Test-Pod-1.26/" @@ -11,7 +11,7 @@ depends="perl" makedepends="perl-dev" install= subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_realname-$pkgver.tar.gz" +source="http://search.cpan.org/CPAN/authors/id/D/DW/DWHEELER/$_realname-$pkgver.tar.gz" build() { cd "$srcdir/$_realname-$pkgver" @@ -23,4 +23,4 @@ build() { find "$pkgdir" -name perllocal.pod -delete } -md5sums="2f259135656ac4549b65a4f14f07b7c6 Test-Pod-1.26.tar.gz" +md5sums="02380af5539521524d5df17273a57ae7 Test-Pod-1.44.tar.gz" diff --git a/main/perl-time-hires/APKBUILD b/main/perl-time-hires/APKBUILD index 331167432f..6c2dc445b6 100644 --- a/main/perl-time-hires/APKBUILD +++ b/main/perl-time-hires/APKBUILD @@ -2,7 +2,7 @@ pkgname=perl-time-hires _realname=Time-HiRes pkgver=1.9721 -pkgrel=0 +pkgrel=1 pkgdesc="High resolution alarm, sleep, gettimeofday, interval timers" url="http://search.cpan.org/~jhi/Time-HiRes-${pkgver}/" license="unknown" diff --git a/main/perl-unix-syslog/APKBUILD b/main/perl-unix-syslog/APKBUILD index 3bc8793d37..21c5b2ac64 100644 --- a/main/perl-unix-syslog/APKBUILD +++ b/main/perl-unix-syslog/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-unix-syslog _realname=Unix-Syslog pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Perl interface to the UNIX syslog(3) calls" url="http://search.cpan.org/~mharnisch/Unix-Syslog-1.1/" license="unknown" diff --git a/main/perl-xml-parser/APKBUILD b/main/perl-xml-parser/APKBUILD index e2319ac8f3..48601fef5e 100644 --- a/main/perl-xml-parser/APKBUILD +++ b/main/perl-xml-parser/APKBUILD @@ -2,7 +2,7 @@ pkgname=perl-xml-parser _name=XML-Parser pkgver=2.36 -pkgrel=0 +pkgrel=1 pkgdesc="XML::Parser - an XML parser module for perl" url="http://search.cpan.org/dist/XML-Parser/" license="GPL PerlArtistic" diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD index abca94bdf1..42643135c6 100644 --- a/main/perl/APKBUILD +++ b/main/perl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl pkgver=5.10.1 -pkgrel=0 +pkgrel=1 pkgdesc="Larry Wall's Practical Extraction and Report Language" url=http://www.perl.org license="Artistic GPL-2" diff --git a/main/pgcluster/APKBUILD b/main/pgcluster/APKBUILD index c45aecfce2..ec2a51af8e 100644 --- a/main/pgcluster/APKBUILD +++ b/main/pgcluster/APKBUILD @@ -2,7 +2,7 @@ pkgname=pgcluster pkgver=1.9.0_rc5 _myver=1.9.0rc5 -pkgrel=2 +pkgrel=4 pkgdesc="PostgreSQL with multi-master cluster/replication patch" url="http://pgfoundry.org/projects/pgcluster/" license="BSD" diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD index 5bfb6b32ce..fbd8ca073d 100644 --- a/main/pgpool/APKBUILD +++ b/main/pgpool/APKBUILD @@ -3,7 +3,7 @@ pkgname=pgpool _opkgname=pgpool-II pkgver=2.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Pgpool II is a connection pooling/replication server for PostgreSQL." url="http://pgfoundry.org/projects/pgpool/" license="BSD" diff --git a/main/php-apc/APKBUILD b/main/php-apc/APKBUILD index 8e1fc5b1a1..260ae8e970 100644 --- a/main/php-apc/APKBUILD +++ b/main/php-apc/APKBUILD @@ -3,7 +3,7 @@ pkgname=php-apc pkgver=3.1.3_p1 _realver=3.1.3p1 -pkgrel=0 +pkgrel=1 pkgdesc="Alternative PHP Cache" url="http://pecl.php.net/package/APC" license="PHP" diff --git a/main/php-fileinfo/APKBUILD b/main/php-fileinfo/APKBUILD index 8e72f404c3..5bcfc32e53 100644 --- a/main/php-fileinfo/APKBUILD +++ b/main/php-fileinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=php-fileinfo pkgver=1.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="This extension allows retrieval of information regarding vast majority of file." url="http://pecl.php.net/package/Fileinfo" license="PHP" diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 1b72cc3098..7c044c8c22 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -3,7 +3,7 @@ pkgname=php pkgver=5.3.2 _suhosinver=${pkgver}-0.9.9.1 -pkgrel=1 +pkgrel=6 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" license="PHP-3" @@ -12,10 +12,10 @@ install="$pkgname.post-upgrade" makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev - gd-dev gmp-dev gettext-dev imap-dev aspell-dev + gd-dev gmp5-dev gettext-dev imap-dev aspell-dev net-snmp-dev libxslt-dev cyrus-sasl-dev openldap-dev pkgconfig libgcrypt-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-cli +subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-pear $pkgname-bcmath $pkgname-bz2 $pkgname-calendar @@ -63,6 +63,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz + php-install-pear-xml.patch zend_execute_API.c.patch " @@ -71,6 +72,9 @@ _extdir="/usr/lib/php/20090626" build() { cd "$srcdir/$pkgname-$pkgver" + # beat the pear installer into using xml.so + patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1 + # apply suhosin patch gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \ | patch -p1 || return 1 @@ -112,7 +116,7 @@ build() { --with-jpeg-dir=shared,/usr \ --with-ldap=shared \ --with-mcrypt=shared \ - --with-mysql-sock=/tmp/mysql.sock \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ --with-mysql=shared,mysqlnd \ --with-mysqli=shared,mysqlnd \ --with-openssl=shared \ @@ -178,6 +182,17 @@ cli() { mv "$pkgdir"/usr/bin/php "$subpkgdir"/usr/bin/ } +pear() { + depends="php" + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/share + mkdir -p "$subpkgdir"/etc/php + mv "$pkgdir"/usr/share/pear "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/bin/pear* "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/pecl "$subpkgdir"/usr/bin/ + mv "$pkgdir"/etc/php/pear.conf "$subpkgdir"/etc/php/ +} + _mv_mod() { pkgdesc="$1 php extension" mkdir -p "$subpkgdir/$_extdir" @@ -243,4 +258,5 @@ dev() { md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz +5111e3be06d391f8772587c675240fab php-install-pear-xml.patch 55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch" diff --git a/main/php/php-install-pear-xml.patch b/main/php/php-install-pear-xml.patch new file mode 100644 index 0000000000..f7a6fff58b --- /dev/null +++ b/main/php/php-install-pear-xml.patch @@ -0,0 +1,15 @@ +--- ./pear/Makefile.frag.orig ++++ ./pear/Makefile.frag +@@ -2,8 +2,11 @@ + + peardir=$(PEAR_INSTALLDIR) + ++# help the built php to find xml extension so we can install pear ++PEAR_INSTALL_XML_FLAGS = -d extension_dir="$(top_builddir)/modules" -d extension=xml.so ++ + # Skip all php.ini files altogether +-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 ++PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 $(PEAR_INSTALL_XML_FLAGS) + + WGET = `which wget 2>/dev/null` + FETCH = `which fetch 2>/dev/null` diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD new file mode 100644 index 0000000000..bff483fc0d --- /dev/null +++ b/main/pidgin/APKBUILD @@ -0,0 +1,64 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=pidgin +pkgver=2.7.0 +pkgrel=1 +pkgdesc="graphical multi-protocol instant messaging client for X" +url="http://pidgin.im/" +license="GPL" +depends= +makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev + libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev + cyrus-sasl-dev ncurses-dev nss-dev" +subpackages="$pkgname-dev $pkgname-doc finch libpurple" +source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 + msn_fix.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -Np0 -i ""$srcdir"/msn_fix.patch" || return 1 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-avahi \ + --disable-doxygen \ + --disable-gnutls \ + --disable-meanwhile \ + --disable-nm \ + --disable-perl \ + --disable-schemas-install \ + --disable-screensaver \ + --disable-tcl \ + --disable-vv \ + --enable-cyrus-sasl \ + --enable-nss \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +finch() { + pkgdesc="text-based multi-protocol instant messaging client" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/lib/gnt "$pkgdir"/usr/lib/libgnt.so.* \ + "$pkgdir"/usr/lib/finch \ + "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/bin/finch "$subpkgdir"/usr/bin/ +} + +libpurple() { + pkgdesc="multi-protocol instant messaging library" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share/sounds + mv "$pkgdir"/usr/lib/*purple* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ + "$subpkgdir"/usr/share/ +} +md5sums="63a36f91d29f5ac5a402ffd2d7dbbb72 pidgin-2.7.0.tar.bz2 +bbf9d6f6fc19342af7e059dc13432d27 msn_fix.patch" diff --git a/main/pidgin/msn_fix.patch b/main/pidgin/msn_fix.patch new file mode 100644 index 0000000000..f93fef8a45 --- /dev/null +++ b/main/pidgin/msn_fix.patch @@ -0,0 +1,28 @@ +# +# +# patch "libpurple/protocols/msn/slplink.c" +# from [a96a53635871463de0177e5a99fe4ebdc2c7d577] +# to [87ada76abf90c44e615679efc5f8128bb941bba1] +# +============================================================ +--- libpurple/protocols/msn/slplink.c a96a53635871463de0177e5a99fe4ebdc2c7d577 ++++ libpurple/protocols/msn/slplink.c 87ada76abf90c44e615679efc5f8128bb941bba1 +@@ -383,6 +383,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s + msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) + { + MsnMessage *msg; ++ const char *passport; + + slpmsg->msg = msg = msn_message_new_msnslp(); + +@@ -421,7 +422,8 @@ msn_slplink_release_slpmsg(MsnSlpLink *s + + msg->msnslp_header.total_size = slpmsg->size; + +- msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user); ++ passport = purple_normalize(slplink->session->account, slplink->remote_user); ++ msn_message_set_attr(msg, "P2P-Dest", passport); + + msg->ack_cb = msg_ack; + msg->nak_cb = msg_nak; + diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD index b211173ff3..3f08adac73 100644 --- a/main/pinentry/APKBUILD +++ b/main/pinentry/APKBUILD @@ -1,42 +1,44 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pinentry -pkgver=0.7.6 +pkgver=0.8.0 _uiconv_ver=0.3 pkgrel=0 pkgdesc="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" url="http://www.gnupg.org/aegypten2" license="GPL-2" -depends="ncurses libcap" -makedepends="ncurses-dev libcap-dev" -subpackages="$pkgname-doc" +depends= +install="pinentry.post-install pinentry.post-deinstall" +makedepends="ncurses-dev libcap-dev gtk+-dev" +subpackages="$pkgname-doc $pkgname-gtk" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz http://git.alpinelinux.org/cgit/uiconv/snapshot/uiconv-$_uiconv_ver.tar.bz2 " build () { - # we build it against uiconv to avoid the bloaty GNU libiconv. - # it will be linked statically so we don't need it in depends - cd "$srcdir/uiconv-$_uiconv_ver" - make - make DESTDIR="$srcdir" PREFIX=/uiconv install - cd "$srcdir"/$pkgname-$pkgver - - # the configure script have a broken --with-libiconv-prefix option - # so we set the -I and -L flags hard - export CFLAGS="$CFLAGS -I $srcdir/uiconv/include" - export LDFLAGS="$LDFLAGS -L $srcdir/uiconv/lib" - ./configure --prefix=/usr \ --disable-pinentry-gtk \ - --disable-pinentry-gtk2 \ + --enable-pinentry-gtk2 \ --disable-pinentry-qt \ --enable-pinentry-curses \ - --enable-fallback-curses \ - --with-libiconv-prefix="$srcdir"/uiconv + --enable-pinentry-gtk2 \ + --enable-fallback-curses make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install + # created by post install scripts so we can override with gtk version + rm -f "$pkgdir"/usr/bin/pinentry +} + +gtk() { + install="pinentry-gtk.post-install pinentry-gtk.post-deinstall" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/pinentry-gtk* "$subpkgdir"/usr/bin/ } -md5sums="5a4f676375fa882009da02013d77210f pinentry-0.7.6.tar.gz + +md5sums="590be1b00f9ab63205843c7fed8caf35 pinentry-0.8.0.tar.gz 5cd7f80085324d08cb976fec674cd98d uiconv-0.3.tar.bz2" diff --git a/main/pinentry/pinentry-gtk.post-deinstall b/main/pinentry/pinentry-gtk.post-deinstall new file mode 100644 index 0000000000..887ef798ae --- /dev/null +++ b/main/pinentry/pinentry-gtk.post-deinstall @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ -f /usr/bin/pinentry-curses ]; then + ln -sf pinentry-curses /usr/bin/pinentry +else + rm -f /usr/bin/pinentry +fi + diff --git a/main/pinentry/pinentry-gtk.post-install b/main/pinentry/pinentry-gtk.post-install new file mode 100644 index 0000000000..8b51ca005f --- /dev/null +++ b/main/pinentry/pinentry-gtk.post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +ln -sf pinentry-gtk-2 /usr/bin/pinentry + diff --git a/main/pinentry/pinentry.post-deinstall b/main/pinentry/pinentry.post-deinstall new file mode 100644 index 0000000000..38939e5b49 --- /dev/null +++ b/main/pinentry/pinentry.post-deinstall @@ -0,0 +1,6 @@ +#!/bin/sh + +if ! [ -f /usr/bin/pinentry-gtk-2 ]; then + rm -f /usr/bin/pinentry +fi + diff --git a/main/pinentry/pinentry.post-install b/main/pinentry/pinentry.post-install new file mode 100644 index 0000000000..0dfd31e955 --- /dev/null +++ b/main/pinentry/pinentry.post-install @@ -0,0 +1,6 @@ +#!/bin/sh + +if ! [ -f /usr/bin/pinentry-gtk-2 ]; then + ln -sf pinentry-curses /usr/bin/pinentry +fi + diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD index aabc7f78cb..b09a41c7df 100644 --- a/main/pingu/APKBUILD +++ b/main/pingu/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pingu pkgver=0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Small daemon that pings hosts and executes a script when status change" url="http://git.alpinelinux.org/cgit/pingu" license="GPL" diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD index 7ea5259e71..ab6d7a90e9 100644 --- a/main/pixman/APKBUILD +++ b/main/pixman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pixman -pkgver=0.16.6 +pkgver=0.18.2 pkgrel=0 pkgdesc="Pixman library" url="http://xorg.freedesktop.org" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="fbd6ee9cb09d0b26281557bc7afcb3ab pixman-0.16.6.tar.bz2" +md5sums="8f0c47bbb12a0d9c0d14242596bf6bf9 pixman-0.18.2.tar.bz2" diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD index 363d7616ea..77722b13dd 100644 --- a/main/pjproject/APKBUILD +++ b/main/pjproject/APKBUILD @@ -1,21 +1,19 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pjproject -pkgver=1.4 -pkgrel=0 +pkgver=1.6 +pkgrel=1 pkgdesc="CLI Softphone" url="http://www.pjsip.org/pjsua.htm" license="GPL" depends= -makedepends="uclibc++-dev openssl-dev pth-dev" +makedepends="openssl-dev pth-dev" install= subpackages="$pkgname-dev pjsua" source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" - export CXX=${CXX_UC:-g++-uc} - ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \ --prefix=/usr \ --sysconfdir=/etc \ @@ -23,8 +21,11 @@ build() { --infodir=/usr/share/info make -j1 dep || return 1 make -j1 all || return 1 - make -j1 DESTDIR="$pkgdir" prefix=/usr install +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir" prefix=/usr install } pjsua() { @@ -35,4 +36,4 @@ pjsua() { } -md5sums="c5abd0d764d89788d817d449141e45a6 pjproject-1.4.tar.bz2" +md5sums="8e804c4930a5ee98a7a0ed2619c09b44 pjproject-1.6.tar.bz2" diff --git a/main/pkgconfig/APKBUILD b/main/pkgconfig/APKBUILD index afdb272888..753e07b98b 100644 --- a/main/pkgconfig/APKBUILD +++ b/main/pkgconfig/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pkgconfig pkgver=0.23 -pkgrel=0 +pkgrel=1 pkgdesc="A system for managing library compile/link flags" url="http://pkgconfig.freedesktop.org/wiki/" license="GPL" diff --git a/main/policyd-spf-fs/APKBUILD b/main/policyd-spf-fs/APKBUILD index 34c7e90f97..30fad5f5d1 100644 --- a/main/policyd-spf-fs/APKBUILD +++ b/main/policyd-spf-fs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=policyd-spf-fs pkgver=23 -pkgrel=0 +pkgrel=1 pkgdesc="Policy daemon for checking SPF records in postfix" url="http://www.freestone.net/software/policyd-spf-fs/" license="GPL" @@ -24,6 +24,7 @@ build() { msg "Apply $i" patch -p1 < $i || return 1 done + sed -i -e 's/-lnsl//' Makefile make CFLAGS+=-DHAVE_NS_TYPE || return 1 diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD index a92d765065..81e9c6f967 100644 --- a/main/poppler-gtk/APKBUILD +++ b/main/poppler-gtk/APKBUILD @@ -5,7 +5,7 @@ pkgname=poppler-gtk _realname=poppler pkgver=0.12.4 -pkgrel=0 +pkgrel=1 pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" license="GPL" diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD index b6b8a31d0b..56cce5a09a 100644 --- a/main/poppler/APKBUILD +++ b/main/poppler/APKBUILD @@ -5,7 +5,7 @@ # So we build gtk support in poppler-gtk pkgname=poppler pkgver=0.12.4 -pkgrel=0 +pkgrel=1 pkgdesc="PDF rendering library based on xpdf 3.0" url="http://poppler.freedesktop.org/" license="GPL" diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD index 469b65bd8d..146f927d82 100644 --- a/main/popt/APKBUILD +++ b/main/popt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=popt -pkgver=1.15 +pkgver=1.16 pkgrel=0 pkgdesc="A commandline option parser" url="http://rpm5.org" @@ -11,9 +11,13 @@ subpackages="$pkgname-doc $pkgname-dev" build () { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR=$pkgdir install || return 1 } -md5sums="c61ef795fa450eb692602a661ec8d7f1 popt-1.15.tar.gz" +md5sums="3743beefa3dd6247a73f8f7a32c14c33 popt-1.16.tar.gz" diff --git a/main/portmap/APKBUILD b/main/portmap/APKBUILD index afdb114ace..fb86bac3a7 100644 --- a/main/portmap/APKBUILD +++ b/main/portmap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=portmap pkgver=6.0 -pkgrel=3 +pkgrel=5 pkgdesc="RPC connection manager" url="http://neil.brown.name/portmap/" license="GPL" @@ -14,15 +14,22 @@ source="http://neil.brown.name/$pkgname/$pkgname-$pkgver.tgz $pkgname.confd $pkgname.initd" -build () -{ + +prepare() { cd "$srcdir"/portmap_$pkgver for i in ../*.patch; do msg "Applying $i" patch -p1 < $i || return 1 done +} +build() { + cd "$srcdir"/portmap_$pkgver make NO_TCP_WRAPPER=NO || return 1 +} + +package() { + cd "$srcdir"/portmap_$pkgver mkdir -p "$pkgdir"/sbin mkdir -p "$pkgdir"/usr/share/man/man8 make BASEDIR="$pkgdir" install diff --git a/main/portmap/portmap.pre-install b/main/portmap/portmap.pre-install index b0dcfb9c5c..ea2baf9e3a 100644 --- a/main/portmap/portmap.pre-install +++ b/main/portmap/portmap.pre-install @@ -1,3 +1,3 @@ #!/bin/sh -adduser -h /dev/null -s /bin/false -D rpc 2>/dev/null || true +adduser -h /var/lib/empty -H -s /bin/false -S -D rpc 2>/dev/null || true diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD index e4e43fea88..a2213c269d 100644 --- a/main/postfix/APKBUILD +++ b/main/postfix/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postfix -pkgver=2.6.5 -pkgrel=2 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" url="http://www.postfix.org/" license="IPL-1" @@ -12,7 +12,7 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre $pkgname-pgsql" source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz $pkgname.initd - postfix-2.6.1-dynamicmaps.patch + postfix-2.7.0-dynamic-maps.patch dynamicmaps.cf postfix-ldap.post-install postfix-mysql.post-install @@ -145,9 +145,9 @@ mysql() { _mv_dict mysql ;} pcre() { _mv_dict pcre ; } pgsql() { _mv_dict pgsql ; } -md5sums="6b954cfb3eb6141dac1e773281211717 postfix-2.6.5.tar.gz +md5sums="df648f59421604e895cce56325f00bae postfix-2.7.0.tar.gz 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd -d45552cfdcd911d0934c0cb7816c4011 postfix-2.6.1-dynamicmaps.patch +4d9c373e8a35bfb5bfa9b899e64fb70a postfix-2.7.0-dynamic-maps.patch 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf 2ebe51a882eb9d6d7866583eb6af3969 postfix-ldap.post-install 2ebe51a882eb9d6d7866583eb6af3969 postfix-mysql.post-install diff --git a/main/postfix/postfix-2.6.1-dynamicmaps.patch b/main/postfix/postfix-2.6.1-dynamicmaps.patch deleted file mode 100644 index 630abedc3b..0000000000 --- a/main/postfix/postfix-2.6.1-dynamicmaps.patch +++ /dev/null @@ -1,5273 +0,0 @@ -diff -ruN a/conf/postfix-files b/conf/postfix-files ---- a/conf/postfix-files 2009-06-01 12:27:42.000000000 +0000 -+++ b/conf/postfix-files 2009-06-01 13:08:26.000000000 +0000 -@@ -65,6 +65,10 @@ - $queue_directory/trace:d:$mail_owner:-:700:ucr - $daemon_directory/anvil:f:root:-:755 - $daemon_directory/bounce:f:root:-:755 -+$daemon_directory/dict_ldap.so:f:root:-:755 -+$daemon_directory/dict_pcre.so:f:root:-:755 -+$daemon_directory/dict_mysql.so:f:root:-:755 -+$daemon_directory/dict_pgsql.so:f:root:-:755 - $daemon_directory/cleanup:f:root:-:755 - $daemon_directory/discard:f:root:-:755 - $daemon_directory/error:f:root:-:755 -@@ -94,6 +98,11 @@ - $daemon_directory/trivial-rewrite:f:root:-:755 - $daemon_directory/verify:f:root:-:755 - $daemon_directory/virtual:f:root:-:755 -+/usr/lib/libpostfix-dns.so.1:f:root:-:755 -+/usr/lib/libpostfix-global.so.1:f:root:-:755 -+/usr/lib/libpostfix-tls.so.1:f:root:-:755 -+/usr/lib/libpostfix-master.so.1:f:root:-:755 -+/usr/lib/libpostfix-util.so.1:f:root:-:755 - $daemon_directory/nqmgr:h:$daemon_directory/qmgr - $daemon_directory/lmtp:h:$daemon_directory/smtp - $command_directory/postalias:f:root:-:755 -@@ -117,6 +126,7 @@ - $config_directory/aliases:f:root:-:644:p1 - $config_directory/bounce.cf.default:f:root:-:644:1 - $config_directory/canonical:f:root:-:644:p1 -+$config_directory/dynamicmaps.cf:f:root:-:644:p - $config_directory/cidr_table:f:root:-:644:o - $config_directory/generic:f:root:-:644:p1 - $config_directory/generics:f:root:-:644:o -diff -ruN a/src/dns/Makefile.in b/src/dns/Makefile.in ---- a/src/dns/Makefile.in 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/dns/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -14,7 +14,7 @@ - LIB_DIR = ../../lib - INC_DIR = ../../include - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -31,12 +31,10 @@ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -ruN a/src/global/Makefile.in b/src/global/Makefile.in ---- a/src/global/Makefile.in 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -34,7 +34,7 @@ - canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ - clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ - defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ -- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ -+ deliver_request.o \ - dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ - dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ - ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ -@@ -103,10 +103,13 @@ - LIB_DIR = ../../lib - INC_DIR = ../../include - MAKES = -+LDAPSO = dict_ldap.so -+MYSQLSO = dict_mysql.so -+PGSQLSO = dict_pgsql.so - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - --all: $(LIB) -+all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) - - $(OBJS): ../../conf/makedefs.out - -@@ -116,14 +119,30 @@ - test: $(TESTPROG) - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) -+ -+$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a -+ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal -+ -+$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a -+ gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal -+ -+$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a -+ gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - --update: $(LIB_DIR)/$(LIB) $(HDRS) -+../../libexec/$(LDAPSO): $(LDAPSO) -+ cp $(LDAPSO) ../../libexec -+ -+../../libexec/$(MYSQLSO): $(MYSQLSO) -+ cp $(MYSQLSO) ../../libexec -+ -+../../libexec/$(PGSQLSO): $(PGSQLSO) -+ cp $(PGSQLSO) ../../libexec -+ -+update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) - -for i in $(HDRS); \ - do \ - cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -491,7 +510,7 @@ - lint $(DEFS) $(SRCS) $(LINTFIX) - - clean: -- rm -f *.o $(LIB) *core $(TESTPROG) junk -+ rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk - rm -rf printfck - - tidy: clean -diff -ruN a/src/global/Makefile.in.orig b/src/global/Makefile.in.orig ---- a/src/global/Makefile.in.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/global/Makefile.in.orig 2009-06-01 13:07:56.000000000 +0000 -@@ -0,0 +1,2018 @@ -+SHELL = /bin/sh -+SRCS = abounce.c anvil_clnt.c been_here.c bounce.c bounce_log.c \ -+ canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \ -+ clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ -+ defer.c deliver_completed.c deliver_flock.c deliver_pass.c \ -+ deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \ -+ dict_proxy.c domain_list.c dot_lockfile.c dot_lockfile_as.c \ -+ dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \ -+ ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \ -+ header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \ -+ mail_addr.c mail_addr_crunch.c mail_addr_find.c mail_addr_map.c \ -+ mail_command_client.c mail_command_server.c mail_conf.c \ -+ mail_conf_bool.c mail_conf_int.c mail_conf_long.c mail_conf_raw.c \ -+ mail_conf_str.c mail_conf_time.c mail_connect.c mail_copy.c \ -+ mail_date.c mail_dict.c mail_error.c mail_flush.c mail_open_ok.c \ -+ mail_params.c mail_pathname.c mail_queue.c mail_run.c \ -+ mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \ -+ mark_corrupt.c match_parent_style.c mbox_conf.c mbox_open.c \ -+ mime_state.c mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_open.c \ -+ mkmap_sdbm.c msg_stats_print.c msg_stats_scan.c mynetworks.c \ -+ mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \ -+ pipe_command.c post_mail.c quote_821_local.c quote_822_local.c \ -+ rcpt_buf.c rcpt_print.c rec_attr_map.c rec_streamlf.c rec_type.c \ -+ recipient_list.c record.c remove.c resolve_clnt.c resolve_local.c \ -+ rewrite_clnt.c scache_clnt.c scache_multi.c scache_single.c \ -+ sent.c smtp_stream.c split_addr.c string_list.c strip_addr.c \ -+ sys_exits.c timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \ -+ tok822_resolve.c tok822_rewrite.c tok822_tree.c trace.c \ -+ user_acl.c valid_mailhost_addr.c verify.c verify_clnt.c \ -+ verp_sender.c wildcard_inet_addr.c xtext.c delivered_hdr.c \ -+ fold_addr.c header_body_checks.c mkmap_proxy.c data_redirect.c \ -+ match_service.c mail_conf_nint.c -+OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ -+ canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ -+ clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ -+ defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ -+ deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ -+ dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ -+ dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ -+ ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ -+ header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \ -+ mail_addr.o mail_addr_crunch.o mail_addr_find.o mail_addr_map.o \ -+ mail_command_client.o mail_command_server.o mail_conf.o \ -+ mail_conf_bool.o mail_conf_int.o mail_conf_long.o mail_conf_raw.o \ -+ mail_conf_str.o mail_conf_time.o mail_connect.o mail_copy.o \ -+ mail_date.o mail_dict.o mail_error.o mail_flush.o mail_open_ok.o \ -+ mail_params.o mail_pathname.o mail_queue.o mail_run.o \ -+ mail_scan_dir.o mail_stream.o mail_task.o mail_trigger.o maps.o \ -+ mark_corrupt.o match_parent_style.o mbox_conf.o mbox_open.o \ -+ mime_state.o mkmap_cdb.o mkmap_db.o mkmap_dbm.o mkmap_open.o \ -+ mkmap_sdbm.o msg_stats_print.o msg_stats_scan.o mynetworks.o \ -+ mypwd.o namadr_list.o off_cvt.o opened.o own_inet_addr.o \ -+ pipe_command.o post_mail.o quote_821_local.o quote_822_local.o \ -+ rcpt_buf.o rcpt_print.o rec_attr_map.o rec_streamlf.o rec_type.o \ -+ recipient_list.o record.o remove.o resolve_clnt.o resolve_local.o \ -+ rewrite_clnt.o scache_clnt.o scache_multi.o scache_single.o \ -+ sent.o smtp_stream.o split_addr.o string_list.o strip_addr.o \ -+ sys_exits.o timed_ipc.o tok822_find.o tok822_node.o tok822_parse.o \ -+ tok822_resolve.o tok822_rewrite.o tok822_tree.o trace.o \ -+ user_acl.o valid_mailhost_addr.o verify.o verify_clnt.o \ -+ verp_sender.o wildcard_inet_addr.o xtext.o delivered_hdr.o \ -+ fold_addr.o header_body_checks.o mkmap_proxy.o data_redirect.o \ -+ match_service.o mail_conf_nint.o -+HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \ -+ canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \ -+ conv_time.h db_common.h debug_peer.h debug_process.h defer.h \ -+ deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \ -+ dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h domain_list.h \ -+ dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \ -+ dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \ -+ file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \ -+ int_filt.h is_header.h lex_822.h log_adhoc.h mail_addr.h \ -+ mail_addr_crunch.h mail_addr_find.h mail_addr_map.h mail_conf.h \ -+ mail_copy.h mail_date.h mail_dict.h mail_error.h mail_flush.h \ -+ mail_open_ok.h mail_params.h mail_proto.h mail_queue.h mail_run.h \ -+ mail_scan_dir.h mail_stream.h mail_task.h mail_version.h maps.h \ -+ mark_corrupt.h match_parent_style.h mbox_conf.h mbox_open.h \ -+ mime_state.h mkmap.h msg_stats.h mynetworks.h mypwd.h namadr_list.h \ -+ off_cvt.h opened.h own_inet_addr.h pipe_command.h post_mail.h \ -+ qmgr_user.h qmqp_proto.h quote_821_local.h quote_822_local.h \ -+ quote_flags.h rcpt_buf.h rcpt_print.h rec_attr_map.h rec_streamlf.h \ -+ rec_type.h recipient_list.h record.h resolve_clnt.h resolve_local.h \ -+ rewrite_clnt.h scache.h sent.h smtp_stream.h split_addr.h \ -+ string_list.h strip_addr.h sys_exits.h timed_ipc.h tok822.h \ -+ trace.h user_acl.h valid_mailhost_addr.h verify.h verify_clnt.h \ -+ verp_sender.h wildcard_inet_addr.h xtext.h delivered_hdr.h \ -+ fold_addr.h header_body_checks.h data_redirect.h match_service.h -+TESTSRC = rec2stream.c stream2rec.c recdump.c -+DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE) -+CFLAGS = $(DEBUG) $(OPT) $(DEFS) -+INCL = -+LIB = libglobal.a -+TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \ -+ mail_addr_map mail_date maps mynetworks mypwd namadr_list \ -+ off_cvt quote_822_local rec2stream recdump resolve_clnt \ -+ resolve_local rewrite_clnt stream2rec string_list tok822_parse \ -+ quote_821_local mail_conf_time mime_state strip_addr \ -+ verify_clnt xtext anvil_clnt scache ehlo_mask \ -+ valid_mailhost_addr own_inet_addr header_body_checks \ -+ data_redirect -+ -+LIBS = ../../lib/libutil.a -+LIB_DIR = ../../lib -+INC_DIR = ../../include -+MAKES = -+ -+.c.o:; $(CC) $(CFLAGS) -c $*.c -+ -+all: $(LIB) -+ -+$(OBJS): ../../conf/makedefs.out -+ -+Makefile: Makefile.in -+ cat ../../conf/makedefs.out $? >$@ -+ -+test: $(TESTPROG) -+ -+$(LIB): $(OBJS) -+ $(AR) $(ARFL) $(LIB) $? -+ $(RANLIB) $(LIB) -+ -+$(LIB_DIR)/$(LIB): $(LIB) -+ cp $(LIB) $(LIB_DIR) -+ $(RANLIB) $(LIB_DIR)/$(LIB) -+ -+update: $(LIB_DIR)/$(LIB) $(HDRS) -+ -for i in $(HDRS); \ -+ do \ -+ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -+ done -+ cd $(INC_DIR); chmod 644 $(HDRS) -+ -+dot_lockfile: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+tok822_parse: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+rec2stream: rec2stream.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+stream2rec: stream2rec.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+recdump: recdump.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+namadr_list: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+domain_list: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mynetworks: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+resolve_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+rewrite_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+quote_822_local: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+off_cvt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_addr_map: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_addr_find: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+maps: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mypwd: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_date: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+resolve_local: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mail_addr_crunch: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+string_list: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+local_transport: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+quote_821_local: quote_821_local.c $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIBS) $(SYSLIBS) -+ -+mail_conf_time: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+mime_state: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+strip_addr: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) -DTEST $(CFLAGS) -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+verify_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+xtext: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+anvil_clnt: $(LIB) $(LIBS) -+ mv $@.o junk -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ mv junk $@.o -+ -+scache: scache.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+ehlo_mask: ehlo_mask.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+valid_mailhost_addr: valid_mailhost_addr.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+own_inet_addr: own_inet_addr.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+header_body_checks: header_body_checks.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+data_redirect: data_redirect.c $(LIB) $(LIBS) -+ $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -+ -+tests: tok822_test mime_tests strip_addr_test tok822_limit_test \ -+ xtext_test scache_multi_test ehlo_mask_test \ -+ namadr_list_test mail_conf_time_test header_body_checks_tests -+ -+mime_tests: mime_test mime_nest mime_8bit mime_dom mime_trunc mime_cvt \ -+ mime_cvt2 mime_cvt3 mime_garb1 mime_garb2 mime_garb3 mime_garb4 -+ -+header_body_checks_tests: header_body_checks_null_test \ -+ header_body_checks_warn_test header_body_checks_prepend_test \ -+ header_body_checks_ignore_test header_body_checks_replace_test -+ -+root_tests: rewrite_clnt_test resolve_clnt_test -+ -+tok822_test: tok822_parse tok822_parse.in tok822_parse.ref -+ ./tok822_parse <tok822_parse.in >tok822_parse.tmp 2>&1 -+ diff tok822_parse.ref tok822_parse.tmp -+ rm -f tok822_parse.tmp -+ -+mime_test: mime_state mime_test.in mime_test.ref -+ ./mime_state <mime_test.in >mime_test.tmp -+ diff mime_test.ref mime_test.tmp -+ rm -f mime_test.tmp -+ -+mime_nest: mime_state mime_nest.in mime_nest.ref -+ ./mime_state <mime_nest.in >mime_nest.tmp -+ diff mime_nest.ref mime_nest.tmp -+ rm -f mime_nest.tmp -+ -+mime_8bit: mime_state mime_8bit.in mime_8bit.ref -+ ./mime_state <mime_8bit.in >mime_8bit.tmp -+ diff mime_8bit.ref mime_8bit.tmp -+ rm -f mime_8bit.tmp -+ -+mime_dom: mime_state mime_dom.in mime_dom.ref -+ ./mime_state <mime_dom.in >mime_dom.tmp -+ diff mime_dom.ref mime_dom.tmp -+ rm -f mime_dom.tmp -+ -+mime_trunc: mime_state mime_trunc.in mime_trunc.ref -+ ./mime_state <mime_trunc.in >mime_trunc.tmp -+ diff mime_trunc.ref mime_trunc.tmp -+ rm -f mime_trunc.tmp -+ -+mime_cvt: mime_state mime_cvt.in mime_cvt.ref -+ ./mime_state <mime_cvt.in >mime_cvt.tmp -+ diff mime_cvt.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_cvt2: mime_state mime_cvt.in2 mime_cvt.ref2 -+ ./mime_state <mime_cvt.in2 >mime_cvt.tmp -+ diff mime_cvt.ref2 mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_cvt3: mime_state mime_cvt.in3 mime_cvt.ref3 -+ ./mime_state <mime_cvt.in3 >mime_cvt.tmp -+ diff mime_cvt.ref3 mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb1: mime_state mime_garb1.in mime_garb1.ref -+ ./mime_state <mime_garb1.in >mime_cvt.tmp -+ diff mime_garb1.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb2: mime_state mime_garb2.in mime_garb2.ref -+ ./mime_state <mime_garb2.in >mime_cvt.tmp -+ diff mime_garb2.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb3: mime_state mime_garb3.in mime_garb3.ref -+ ./mime_state <mime_garb3.in >mime_cvt.tmp -+ diff mime_garb3.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+mime_garb4: mime_state mime_garb4.in mime_garb4.ref -+ ./mime_state <mime_garb4.in >mime_cvt.tmp -+ diff mime_garb4.ref mime_cvt.tmp -+ rm -f mime_cvt.tmp -+ -+tok822_limit_test: tok822_parse tok822_limit.in tok822_limit.ref -+ ./tok822_parse <tok822_limit.in >tok822_limit.tmp -+ diff tok822_limit.ref tok822_limit.tmp -+ rm -f tok822_limit.tmp -+ -+strip_addr_test: strip_addr strip_addr.ref -+ ./strip_addr 2>strip_addr.tmp -+ diff strip_addr.ref strip_addr.tmp -+ rm -f strip_addr.tmp -+ -+xtext_test: xtext -+ ./xtext <xtext.c | od -cb >xtext.tmp -+ od -cb <xtext.c >xtext.ref -+ cmp xtext.ref xtext.tmp -+ rm -f xtext.ref xtext.tmp -+ -+# Requires: Postfix running, root privileges -+ -+rewrite_clnt_test: rewrite_clnt rewrite_clnt.in rewrite_clnt.ref -+ @set -- `id`; case "$$1" in \ -+ *"(root)") ;; \ -+ *) echo 'This test requires root privilege'; exit 1;; \ -+ esac -+ @test -n "`postconf -h remote_header_rewrite_domain`" || { \ -+ echo 'This test requires non-empty remote_header_rewrite_domain'; exit 1; } -+ ./rewrite_clnt <rewrite_clnt.in >rewrite_clnt.tmp -+ sed -e "s/MYDOMAIN/`postconf -h mydomain`/" \ -+ -e "s/INVALID_DOMAIN/`postconf -h remote_header_rewrite_domain`/" \ -+ rewrite_clnt.ref | diff - rewrite_clnt.tmp -+ rm -f rewrite_clnt.tmp -+ -+# Requires: Postfix, root, relayhost=$mydomain, no transport map -+ -+resolve_clnt_test: resolve_clnt resolve_clnt.in resolve_clnt.ref -+ @set -- `id`; case "$$1" in \ -+ *"(root)") ;; \ -+ *) echo 'This test requires root privilege'; exit 1;; \ -+ esac -+ @test "`postconf -h relayhost`" = '$$mydomain' || { \ -+ echo 'This test requires relayhost=$$mydomain'; exit 1; } -+ @test "`postconf -h transport_maps`" = "" || { \ -+ echo 'This test requires no transport map'; exit 1; } -+ sed -e "s/MYDOMAIN/`postconf -h mydomain`/g" \ -+ -e "s/MYHOSTNAME/`postconf -h myhostname`/g" \ -+ resolve_clnt.in | ./resolve_clnt >resolve_clnt.tmp -+ sed -e "s/MYDOMAIN/`postconf -h mydomain`/g" \ -+ -e "s/MYHOSTNAME/`postconf -h myhostname`/g" \ -+ -e "s/RELAYHOST/`postconf -h mydomain`/g" \ -+ resolve_clnt.ref | diff - resolve_clnt.tmp -+ rm -f resolve_clnt.tmp -+ -+scache_multi_test: scache scache_multi.in scache_multi.ref -+ ./scache <scache_multi.in >scache_multi.tmp -+ diff scache_multi.ref scache_multi.tmp -+ rm -f scache_multi.tmp -+ -+ehlo_mask_test: ehlo_mask ehlo_mask.in ehlo_mask.ref -+ ./ehlo_mask <ehlo_mask.in >ehlo_mask.tmp -+ diff ehlo_mask.ref ehlo_mask.tmp -+ rm -f ehlo_mask.tmp -+ -+namadr_list_test: namadr_list namadr_list.in namadr_list.ref -+ -sh namadr_list.in >namadr_list.tmp 2>&1 -+ diff namadr_list.ref namadr_list.tmp -+ rm -f namadr_list.tmp -+ -+mail_conf_time_test: mail_conf_time mail_conf_time.ref -+ ./mail_conf_time >mail_conf_time.tmp -+ diff mail_conf_time.ref mail_conf_time.tmp -+ rm -f mail_conf_time.tmp -+ -+header_body_checks_null_test: header_body_checks header_body_checks_null.ref -+ ./header_body_checks "" "" "" "" \ -+ <mime_test.in >header_body_checks_null.tmp 2>&1 -+ cmp header_body_checks_null.ref header_body_checks_null.tmp -+ ./header_body_checks static:dunno static:dunno static:dunno static:dunno \ -+ <mime_test.in >header_body_checks_null.tmp 2>&1 -+ cmp header_body_checks_null.ref header_body_checks_null.tmp -+ ./header_body_checks static:ok static:ok static:ok static:ok \ -+ <mime_test.in >header_body_checks_null.tmp 2>&1 -+ cmp header_body_checks_null.ref header_body_checks_null.tmp -+ rm -f header_body_checks_null.tmp -+ -+header_body_checks_warn_test: header_body_checks header_body_checks_warn.ref -+ ./header_body_checks static:warn static:warn static:warn static:warn \ -+ <mime_test.in >header_body_checks_warn.tmp 2>&1 -+ cmp header_body_checks_warn.ref header_body_checks_warn.tmp -+ rm -f header_body_checks_warn.tmp -+ -+header_body_checks_prepend_test: header_body_checks header_body_checks_prepend.ref -+ echo /./ prepend header: head >header_body_checks_head -+ echo /./ prepend header: mime >header_body_checks_mime -+ echo /./ prepend header: nest >header_body_checks_nest -+ echo /./ prepend body >header_body_checks_body -+ ./header_body_checks regexp:header_body_checks_head regexp:header_body_checks_mime \ -+ regexp:header_body_checks_nest regexp:header_body_checks_body \ -+ <mime_test.in >header_body_checks_prepend.tmp 2>&1 -+ cmp header_body_checks_prepend.ref header_body_checks_prepend.tmp -+ rm -f header_body_checks_prepend.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body -+ -+# Note: the IGNORE action will not strip empty lines. Postfix maps -+# currently never see null query strings because some map types raise -+# errors. We can eliminate this restriction by allowing individual -+# map types to advertise whether they can handle null queries. -+header_body_checks_ignore_test: header_body_checks header_body_checks_ignore.ref -+ ./header_body_checks static:ignore static:ignore static:ignore static:ignore \ -+ <mime_test.in >header_body_checks_ignore.tmp 2>&1 -+ cmp header_body_checks_ignore.ref header_body_checks_ignore.tmp -+ rm -f header_body_checks_ignore.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body -+ -+header_body_checks_replace_test: header_body_checks header_body_checks_replace.ref -+ echo /./ replace header: head >header_body_checks_head -+ echo /./ replace header: mime >header_body_checks_mime -+ echo /./ replace header: nest >header_body_checks_nest -+ echo /./ replace body >header_body_checks_body -+ ./header_body_checks regexp:header_body_checks_head regexp:header_body_checks_mime \ -+ regexp:header_body_checks_nest regexp:header_body_checks_body \ -+ <mime_test.in >header_body_checks_replace.tmp 2>&1 -+ cmp header_body_checks_replace.ref header_body_checks_replace.tmp -+ rm -f header_body_checks_replace.tmp header_body_checks_head header_body_checks_mime header_body_checks_nest header_body_checks_body -+ -+printfck: $(OBJS) $(PROG) -+ rm -rf printfck -+ mkdir printfck -+ cp *.h printfck -+ sed '1,/^# do not edit/!d' Makefile >printfck/Makefile -+ set -e; for i in *.c; do printfck -f .printfck $$i >printfck/$$i; done -+ cd printfck; make "INC_DIR=../../../include" `cd ..; ls *.o` -+ -+lint: -+ lint $(DEFS) $(SRCS) $(LINTFIX) -+ -+clean: -+ rm -f *.o $(LIB) *core $(TESTPROG) junk -+ rm -rf printfck -+ -+tidy: clean -+ -+depend: $(MAKES) -+ (sed '1,/^# do not edit/!d' Makefile.in; \ -+ set -e; for i in [a-z][a-z0-9]*.c; do \ -+ $(CC) -E $(DEFS) $(INCL) $$i | grep -v '[<>]' | sed -n -e '/^# *1 *"\([^"]*\)".*/{' \ -+ -e 's//'`echo $$i|sed 's/c$$/o/'`': \1/' \ -+ -e 's/o: \.\//o: /' -e p -e '}' ; \ -+ done | sort -u) | grep -v '[.][o][:][ ][/]' >$$$$ && mv $$$$ Makefile.in -+ @$(EXPORT) make -f Makefile.in Makefile 1>&2 -+ -+# do not edit below this line - it is generated by 'make depend' -+abounce.o: ../../include/attr.h -+abounce.o: ../../include/events.h -+abounce.o: ../../include/iostuff.h -+abounce.o: ../../include/msg.h -+abounce.o: ../../include/mymalloc.h -+abounce.o: ../../include/sys_defs.h -+abounce.o: ../../include/vbuf.h -+abounce.o: ../../include/vstream.h -+abounce.o: ../../include/vstring.h -+abounce.o: abounce.c -+abounce.o: abounce.h -+abounce.o: bounce.h -+abounce.o: deliver_request.h -+abounce.o: dsn.h -+abounce.o: dsn_buf.h -+abounce.o: mail_params.h -+abounce.o: mail_proto.h -+abounce.o: msg_stats.h -+abounce.o: recipient_list.h -+anvil_clnt.o: ../../include/attr.h -+anvil_clnt.o: ../../include/attr_clnt.h -+anvil_clnt.o: ../../include/iostuff.h -+anvil_clnt.o: ../../include/msg.h -+anvil_clnt.o: ../../include/mymalloc.h -+anvil_clnt.o: ../../include/stringops.h -+anvil_clnt.o: ../../include/sys_defs.h -+anvil_clnt.o: ../../include/vbuf.h -+anvil_clnt.o: ../../include/vstream.h -+anvil_clnt.o: ../../include/vstring.h -+anvil_clnt.o: anvil_clnt.c -+anvil_clnt.o: anvil_clnt.h -+anvil_clnt.o: mail_params.h -+anvil_clnt.o: mail_proto.h -+been_here.o: ../../include/htable.h -+been_here.o: ../../include/msg.h -+been_here.o: ../../include/mymalloc.h -+been_here.o: ../../include/stringops.h -+been_here.o: ../../include/sys_defs.h -+been_here.o: ../../include/vbuf.h -+been_here.o: ../../include/vstring.h -+been_here.o: been_here.c -+been_here.o: been_here.h -+bounce.o: ../../include/attr.h -+bounce.o: ../../include/iostuff.h -+bounce.o: ../../include/msg.h -+bounce.o: ../../include/mymalloc.h -+bounce.o: ../../include/sys_defs.h -+bounce.o: ../../include/vbuf.h -+bounce.o: ../../include/vstream.h -+bounce.o: ../../include/vstring.h -+bounce.o: bounce.c -+bounce.o: bounce.h -+bounce.o: defer.h -+bounce.o: deliver_request.h -+bounce.o: dsn.h -+bounce.o: dsn_buf.h -+bounce.o: dsn_print.h -+bounce.o: dsn_util.h -+bounce.o: log_adhoc.h -+bounce.o: mail_params.h -+bounce.o: mail_proto.h -+bounce.o: msg_stats.h -+bounce.o: rcpt_print.h -+bounce.o: recipient_list.h -+bounce.o: trace.h -+bounce.o: verify.h -+bounce_log.o: ../../include/attr.h -+bounce_log.o: ../../include/iostuff.h -+bounce_log.o: ../../include/msg.h -+bounce_log.o: ../../include/mymalloc.h -+bounce_log.o: ../../include/stringops.h -+bounce_log.o: ../../include/sys_defs.h -+bounce_log.o: ../../include/vbuf.h -+bounce_log.o: ../../include/vstream.h -+bounce_log.o: ../../include/vstring.h -+bounce_log.o: ../../include/vstring_vstream.h -+bounce_log.o: bounce_log.c -+bounce_log.o: bounce_log.h -+bounce_log.o: dsn.h -+bounce_log.o: dsn_buf.h -+bounce_log.o: dsn_mask.h -+bounce_log.o: mail_params.h -+bounce_log.o: mail_proto.h -+bounce_log.o: mail_queue.h -+bounce_log.o: rcpt_buf.h -+bounce_log.o: recipient_list.h -+canon_addr.o: ../../include/attr.h -+canon_addr.o: ../../include/iostuff.h -+canon_addr.o: ../../include/mymalloc.h -+canon_addr.o: ../../include/sys_defs.h -+canon_addr.o: ../../include/vbuf.h -+canon_addr.o: ../../include/vstream.h -+canon_addr.o: ../../include/vstring.h -+canon_addr.o: canon_addr.c -+canon_addr.o: canon_addr.h -+canon_addr.o: mail_proto.h -+canon_addr.o: rewrite_clnt.h -+cfg_parser.o: ../../include/argv.h -+cfg_parser.o: ../../include/dict.h -+cfg_parser.o: ../../include/msg.h -+cfg_parser.o: ../../include/mymalloc.h -+cfg_parser.o: ../../include/sys_defs.h -+cfg_parser.o: ../../include/vbuf.h -+cfg_parser.o: ../../include/vstream.h -+cfg_parser.o: ../../include/vstring.h -+cfg_parser.o: cfg_parser.c -+cfg_parser.o: cfg_parser.h -+cfg_parser.o: mail_conf.h -+cleanup_strerror.o: ../../include/msg.h -+cleanup_strerror.o: ../../include/sys_defs.h -+cleanup_strerror.o: ../../include/vbuf.h -+cleanup_strerror.o: ../../include/vstring.h -+cleanup_strerror.o: cleanup_strerror.c -+cleanup_strerror.o: cleanup_user.h -+cleanup_strflags.o: ../../include/msg.h -+cleanup_strflags.o: ../../include/sys_defs.h -+cleanup_strflags.o: ../../include/vbuf.h -+cleanup_strflags.o: ../../include/vstring.h -+cleanup_strflags.o: cleanup_strflags.c -+cleanup_strflags.o: cleanup_user.h -+clnt_stream.o: ../../include/attr.h -+clnt_stream.o: ../../include/events.h -+clnt_stream.o: ../../include/iostuff.h -+clnt_stream.o: ../../include/msg.h -+clnt_stream.o: ../../include/mymalloc.h -+clnt_stream.o: ../../include/sys_defs.h -+clnt_stream.o: ../../include/vbuf.h -+clnt_stream.o: ../../include/vstream.h -+clnt_stream.o: clnt_stream.c -+clnt_stream.o: clnt_stream.h -+clnt_stream.o: mail_params.h -+clnt_stream.o: mail_proto.h -+conv_time.o: ../../include/msg.h -+conv_time.o: ../../include/sys_defs.h -+conv_time.o: conv_time.c -+conv_time.o: conv_time.h -+data_redirect.o: ../../include/argv.h -+data_redirect.o: ../../include/dict.h -+data_redirect.o: ../../include/dict_cdb.h -+data_redirect.o: ../../include/dict_db.h -+data_redirect.o: ../../include/dict_dbm.h -+data_redirect.o: ../../include/msg.h -+data_redirect.o: ../../include/name_code.h -+data_redirect.o: ../../include/split_at.h -+data_redirect.o: ../../include/stringops.h -+data_redirect.o: ../../include/sys_defs.h -+data_redirect.o: ../../include/vbuf.h -+data_redirect.o: ../../include/vstream.h -+data_redirect.o: ../../include/vstring.h -+data_redirect.o: data_redirect.c -+data_redirect.o: data_redirect.h -+data_redirect.o: dict_proxy.h -+data_redirect.o: mail_params.h -+db_common.o: ../../include/argv.h -+db_common.o: ../../include/dict.h -+db_common.o: ../../include/match_list.h -+db_common.o: ../../include/match_ops.h -+db_common.o: ../../include/msg.h -+db_common.o: ../../include/mymalloc.h -+db_common.o: ../../include/sys_defs.h -+db_common.o: ../../include/vbuf.h -+db_common.o: ../../include/vstream.h -+db_common.o: ../../include/vstring.h -+db_common.o: cfg_parser.h -+db_common.o: db_common.c -+db_common.o: db_common.h -+db_common.o: string_list.h -+debug_peer.o: ../../include/match_list.h -+debug_peer.o: ../../include/match_ops.h -+debug_peer.o: ../../include/msg.h -+debug_peer.o: ../../include/sys_defs.h -+debug_peer.o: debug_peer.c -+debug_peer.o: debug_peer.h -+debug_peer.o: mail_params.h -+debug_peer.o: match_parent_style.h -+debug_peer.o: namadr_list.h -+debug_process.o: ../../include/msg.h -+debug_process.o: ../../include/sys_defs.h -+debug_process.o: debug_process.c -+debug_process.o: debug_process.h -+debug_process.o: mail_conf.h -+debug_process.o: mail_params.h -+defer.o: ../../include/attr.h -+defer.o: ../../include/iostuff.h -+defer.o: ../../include/msg.h -+defer.o: ../../include/sys_defs.h -+defer.o: ../../include/vbuf.h -+defer.o: ../../include/vstream.h -+defer.o: ../../include/vstring.h -+defer.o: bounce.h -+defer.o: defer.c -+defer.o: defer.h -+defer.o: deliver_request.h -+defer.o: dsn.h -+defer.o: dsn_buf.h -+defer.o: dsn_print.h -+defer.o: dsn_util.h -+defer.o: flush_clnt.h -+defer.o: log_adhoc.h -+defer.o: mail_params.h -+defer.o: mail_proto.h -+defer.o: mail_queue.h -+defer.o: msg_stats.h -+defer.o: rcpt_print.h -+defer.o: recipient_list.h -+defer.o: trace.h -+defer.o: verify.h -+deliver_completed.o: ../../include/msg.h -+deliver_completed.o: ../../include/sys_defs.h -+deliver_completed.o: ../../include/vbuf.h -+deliver_completed.o: ../../include/vstream.h -+deliver_completed.o: ../../include/vstring.h -+deliver_completed.o: deliver_completed.c -+deliver_completed.o: deliver_completed.h -+deliver_completed.o: rec_type.h -+deliver_completed.o: record.h -+deliver_flock.o: ../../include/iostuff.h -+deliver_flock.o: ../../include/myflock.h -+deliver_flock.o: ../../include/sys_defs.h -+deliver_flock.o: ../../include/vbuf.h -+deliver_flock.o: ../../include/vstring.h -+deliver_flock.o: deliver_flock.c -+deliver_flock.o: deliver_flock.h -+deliver_flock.o: mail_params.h -+deliver_pass.o: ../../include/attr.h -+deliver_pass.o: ../../include/iostuff.h -+deliver_pass.o: ../../include/msg.h -+deliver_pass.o: ../../include/mymalloc.h -+deliver_pass.o: ../../include/split_at.h -+deliver_pass.o: ../../include/sys_defs.h -+deliver_pass.o: ../../include/vbuf.h -+deliver_pass.o: ../../include/vstream.h -+deliver_pass.o: ../../include/vstring.h -+deliver_pass.o: bounce.h -+deliver_pass.o: defer.h -+deliver_pass.o: deliver_pass.c -+deliver_pass.o: deliver_pass.h -+deliver_pass.o: deliver_request.h -+deliver_pass.o: dsb_scan.h -+deliver_pass.o: dsn.h -+deliver_pass.o: dsn_buf.h -+deliver_pass.o: mail_params.h -+deliver_pass.o: mail_proto.h -+deliver_pass.o: msg_stats.h -+deliver_pass.o: rcpt_print.h -+deliver_pass.o: recipient_list.h -+deliver_request.o: ../../include/attr.h -+deliver_request.o: ../../include/iostuff.h -+deliver_request.o: ../../include/msg.h -+deliver_request.o: ../../include/myflock.h -+deliver_request.o: ../../include/mymalloc.h -+deliver_request.o: ../../include/sys_defs.h -+deliver_request.o: ../../include/vbuf.h -+deliver_request.o: ../../include/vstream.h -+deliver_request.o: ../../include/vstring.h -+deliver_request.o: deliver_request.c -+deliver_request.o: deliver_request.h -+deliver_request.o: dsn.h -+deliver_request.o: dsn_print.h -+deliver_request.o: mail_open_ok.h -+deliver_request.o: mail_proto.h -+deliver_request.o: mail_queue.h -+deliver_request.o: msg_stats.h -+deliver_request.o: rcpt_buf.h -+deliver_request.o: recipient_list.h -+delivered_hdr.o: ../../include/htable.h -+delivered_hdr.o: ../../include/msg.h -+delivered_hdr.o: ../../include/mymalloc.h -+delivered_hdr.o: ../../include/stringops.h -+delivered_hdr.o: ../../include/sys_defs.h -+delivered_hdr.o: ../../include/vbuf.h -+delivered_hdr.o: ../../include/vstream.h -+delivered_hdr.o: ../../include/vstring.h -+delivered_hdr.o: ../../include/vstring_vstream.h -+delivered_hdr.o: delivered_hdr.c -+delivered_hdr.o: delivered_hdr.h -+delivered_hdr.o: fold_addr.h -+delivered_hdr.o: header_opts.h -+delivered_hdr.o: is_header.h -+delivered_hdr.o: quote_822_local.h -+delivered_hdr.o: quote_flags.h -+delivered_hdr.o: rec_type.h -+delivered_hdr.o: record.h -+dict_ldap.o: ../../include/argv.h -+dict_ldap.o: ../../include/binhash.h -+dict_ldap.o: ../../include/dict.h -+dict_ldap.o: ../../include/match_list.h -+dict_ldap.o: ../../include/match_ops.h -+dict_ldap.o: ../../include/msg.h -+dict_ldap.o: ../../include/mymalloc.h -+dict_ldap.o: ../../include/stringops.h -+dict_ldap.o: ../../include/sys_defs.h -+dict_ldap.o: ../../include/vbuf.h -+dict_ldap.o: ../../include/vstream.h -+dict_ldap.o: ../../include/vstring.h -+dict_ldap.o: cfg_parser.h -+dict_ldap.o: db_common.h -+dict_ldap.o: dict_ldap.c -+dict_ldap.o: dict_ldap.h -+dict_ldap.o: string_list.h -+dict_mysql.o: ../../include/argv.h -+dict_mysql.o: ../../include/dict.h -+dict_mysql.o: ../../include/events.h -+dict_mysql.o: ../../include/find_inet.h -+dict_mysql.o: ../../include/match_list.h -+dict_mysql.o: ../../include/match_ops.h -+dict_mysql.o: ../../include/msg.h -+dict_mysql.o: ../../include/mymalloc.h -+dict_mysql.o: ../../include/myrand.h -+dict_mysql.o: ../../include/split_at.h -+dict_mysql.o: ../../include/stringops.h -+dict_mysql.o: ../../include/sys_defs.h -+dict_mysql.o: ../../include/vbuf.h -+dict_mysql.o: ../../include/vstream.h -+dict_mysql.o: ../../include/vstring.h -+dict_mysql.o: cfg_parser.h -+dict_mysql.o: db_common.h -+dict_mysql.o: dict_mysql.c -+dict_mysql.o: dict_mysql.h -+dict_mysql.o: string_list.h -+dict_pgsql.o: ../../include/argv.h -+dict_pgsql.o: ../../include/dict.h -+dict_pgsql.o: ../../include/events.h -+dict_pgsql.o: ../../include/find_inet.h -+dict_pgsql.o: ../../include/match_list.h -+dict_pgsql.o: ../../include/match_ops.h -+dict_pgsql.o: ../../include/msg.h -+dict_pgsql.o: ../../include/mymalloc.h -+dict_pgsql.o: ../../include/myrand.h -+dict_pgsql.o: ../../include/split_at.h -+dict_pgsql.o: ../../include/stringops.h -+dict_pgsql.o: ../../include/sys_defs.h -+dict_pgsql.o: ../../include/vbuf.h -+dict_pgsql.o: ../../include/vstream.h -+dict_pgsql.o: ../../include/vstring.h -+dict_pgsql.o: cfg_parser.h -+dict_pgsql.o: db_common.h -+dict_pgsql.o: dict_pgsql.c -+dict_pgsql.o: dict_pgsql.h -+dict_pgsql.o: string_list.h -+dict_proxy.o: ../../include/argv.h -+dict_proxy.o: ../../include/attr.h -+dict_proxy.o: ../../include/dict.h -+dict_proxy.o: ../../include/iostuff.h -+dict_proxy.o: ../../include/msg.h -+dict_proxy.o: ../../include/mymalloc.h -+dict_proxy.o: ../../include/stringops.h -+dict_proxy.o: ../../include/sys_defs.h -+dict_proxy.o: ../../include/vbuf.h -+dict_proxy.o: ../../include/vstream.h -+dict_proxy.o: ../../include/vstring.h -+dict_proxy.o: clnt_stream.h -+dict_proxy.o: dict_proxy.c -+dict_proxy.o: dict_proxy.h -+dict_proxy.o: mail_params.h -+dict_proxy.o: mail_proto.h -+domain_list.o: ../../include/match_list.h -+domain_list.o: ../../include/match_ops.h -+domain_list.o: ../../include/sys_defs.h -+domain_list.o: domain_list.c -+domain_list.o: domain_list.h -+dot_lockfile.o: ../../include/iostuff.h -+dot_lockfile.o: ../../include/mymalloc.h -+dot_lockfile.o: ../../include/stringops.h -+dot_lockfile.o: ../../include/sys_defs.h -+dot_lockfile.o: ../../include/vbuf.h -+dot_lockfile.o: ../../include/vstring.h -+dot_lockfile.o: dot_lockfile.c -+dot_lockfile.o: dot_lockfile.h -+dot_lockfile.o: mail_params.h -+dot_lockfile_as.o: ../../include/msg.h -+dot_lockfile_as.o: ../../include/set_eugid.h -+dot_lockfile_as.o: ../../include/sys_defs.h -+dot_lockfile_as.o: ../../include/vbuf.h -+dot_lockfile_as.o: ../../include/vstring.h -+dot_lockfile_as.o: dot_lockfile.h -+dot_lockfile_as.o: dot_lockfile_as.c -+dot_lockfile_as.o: dot_lockfile_as.h -+dsb_scan.o: ../../include/attr.h -+dsb_scan.o: ../../include/iostuff.h -+dsb_scan.o: ../../include/sys_defs.h -+dsb_scan.o: ../../include/vbuf.h -+dsb_scan.o: ../../include/vstream.h -+dsb_scan.o: ../../include/vstring.h -+dsb_scan.o: dsb_scan.c -+dsb_scan.o: dsb_scan.h -+dsb_scan.o: dsn.h -+dsb_scan.o: dsn_buf.h -+dsb_scan.o: mail_proto.h -+dsn.o: ../../include/msg.h -+dsn.o: ../../include/mymalloc.h -+dsn.o: ../../include/sys_defs.h -+dsn.o: dsn.c -+dsn.o: dsn.h -+dsn_buf.o: ../../include/msg.h -+dsn_buf.o: ../../include/mymalloc.h -+dsn_buf.o: ../../include/sys_defs.h -+dsn_buf.o: ../../include/vbuf.h -+dsn_buf.o: ../../include/vstring.h -+dsn_buf.o: dsn.h -+dsn_buf.o: dsn_buf.c -+dsn_buf.o: dsn_buf.h -+dsn_mask.o: ../../include/msg.h -+dsn_mask.o: ../../include/name_code.h -+dsn_mask.o: ../../include/name_mask.h -+dsn_mask.o: ../../include/sys_defs.h -+dsn_mask.o: ../../include/vbuf.h -+dsn_mask.o: ../../include/vstring.h -+dsn_mask.o: dsn_mask.c -+dsn_mask.o: dsn_mask.h -+dsn_print.o: ../../include/attr.h -+dsn_print.o: ../../include/iostuff.h -+dsn_print.o: ../../include/sys_defs.h -+dsn_print.o: ../../include/vbuf.h -+dsn_print.o: ../../include/vstream.h -+dsn_print.o: dsn.h -+dsn_print.o: dsn_print.c -+dsn_print.o: dsn_print.h -+dsn_print.o: mail_proto.h -+dsn_util.o: ../../include/msg.h -+dsn_util.o: ../../include/mymalloc.h -+dsn_util.o: ../../include/stringops.h -+dsn_util.o: ../../include/sys_defs.h -+dsn_util.o: ../../include/vbuf.h -+dsn_util.o: ../../include/vstring.h -+dsn_util.o: dsn_util.c -+dsn_util.o: dsn_util.h -+ehlo_mask.o: ../../include/name_mask.h -+ehlo_mask.o: ../../include/sys_defs.h -+ehlo_mask.o: ../../include/vbuf.h -+ehlo_mask.o: ../../include/vstring.h -+ehlo_mask.o: ehlo_mask.c -+ehlo_mask.o: ehlo_mask.h -+ext_prop.o: ../../include/name_mask.h -+ext_prop.o: ../../include/sys_defs.h -+ext_prop.o: ../../include/vbuf.h -+ext_prop.o: ../../include/vstring.h -+ext_prop.o: ext_prop.c -+ext_prop.o: ext_prop.h -+ext_prop.o: mail_params.h -+file_id.o: ../../include/msg.h -+file_id.o: ../../include/sys_defs.h -+file_id.o: ../../include/vbuf.h -+file_id.o: ../../include/vstring.h -+file_id.o: file_id.c -+file_id.o: file_id.h -+flush_clnt.o: ../../include/attr.h -+flush_clnt.o: ../../include/iostuff.h -+flush_clnt.o: ../../include/match_list.h -+flush_clnt.o: ../../include/match_ops.h -+flush_clnt.o: ../../include/msg.h -+flush_clnt.o: ../../include/sys_defs.h -+flush_clnt.o: ../../include/vbuf.h -+flush_clnt.o: ../../include/vstream.h -+flush_clnt.o: domain_list.h -+flush_clnt.o: flush_clnt.c -+flush_clnt.o: flush_clnt.h -+flush_clnt.o: mail_flush.h -+flush_clnt.o: mail_params.h -+flush_clnt.o: mail_proto.h -+flush_clnt.o: match_parent_style.h -+fold_addr.o: ../../include/stringops.h -+fold_addr.o: ../../include/sys_defs.h -+fold_addr.o: ../../include/vbuf.h -+fold_addr.o: ../../include/vstring.h -+fold_addr.o: fold_addr.c -+fold_addr.o: fold_addr.h -+header_body_checks.o: ../../include/argv.h -+header_body_checks.o: ../../include/dict.h -+header_body_checks.o: ../../include/msg.h -+header_body_checks.o: ../../include/mymalloc.h -+header_body_checks.o: ../../include/sys_defs.h -+header_body_checks.o: ../../include/vbuf.h -+header_body_checks.o: ../../include/vstream.h -+header_body_checks.o: ../../include/vstring.h -+header_body_checks.o: cleanup_user.h -+header_body_checks.o: dsn_util.h -+header_body_checks.o: header_body_checks.c -+header_body_checks.o: header_body_checks.h -+header_body_checks.o: header_opts.h -+header_body_checks.o: is_header.h -+header_body_checks.o: maps.h -+header_body_checks.o: mime_state.h -+header_body_checks.o: rec_type.h -+header_opts.o: ../../include/htable.h -+header_opts.o: ../../include/msg.h -+header_opts.o: ../../include/stringops.h -+header_opts.o: ../../include/sys_defs.h -+header_opts.o: ../../include/vbuf.h -+header_opts.o: ../../include/vstring.h -+header_opts.o: header_opts.c -+header_opts.o: header_opts.h -+header_token.o: ../../include/msg.h -+header_token.o: ../../include/sys_defs.h -+header_token.o: ../../include/vbuf.h -+header_token.o: ../../include/vstring.h -+header_token.o: header_token.c -+header_token.o: header_token.h -+header_token.o: lex_822.h -+input_transp.o: ../../include/msg.h -+input_transp.o: ../../include/name_mask.h -+input_transp.o: ../../include/sys_defs.h -+input_transp.o: ../../include/vbuf.h -+input_transp.o: ../../include/vstring.h -+input_transp.o: cleanup_user.h -+input_transp.o: input_transp.c -+input_transp.o: input_transp.h -+input_transp.o: mail_params.h -+int_filt.o: ../../include/msg.h -+int_filt.o: ../../include/name_mask.h -+int_filt.o: ../../include/sys_defs.h -+int_filt.o: ../../include/vbuf.h -+int_filt.o: ../../include/vstring.h -+int_filt.o: cleanup_user.h -+int_filt.o: int_filt.c -+int_filt.o: int_filt.h -+int_filt.o: mail_params.h -+is_header.o: ../../include/sys_defs.h -+is_header.o: is_header.c -+is_header.o: is_header.h -+log_adhoc.o: ../../include/attr.h -+log_adhoc.o: ../../include/format_tv.h -+log_adhoc.o: ../../include/msg.h -+log_adhoc.o: ../../include/sys_defs.h -+log_adhoc.o: ../../include/vbuf.h -+log_adhoc.o: ../../include/vstream.h -+log_adhoc.o: ../../include/vstring.h -+log_adhoc.o: dsn.h -+log_adhoc.o: log_adhoc.c -+log_adhoc.o: log_adhoc.h -+log_adhoc.o: mail_params.h -+log_adhoc.o: msg_stats.h -+log_adhoc.o: recipient_list.h -+mail_addr.o: ../../include/stringops.h -+mail_addr.o: ../../include/sys_defs.h -+mail_addr.o: ../../include/vbuf.h -+mail_addr.o: ../../include/vstring.h -+mail_addr.o: mail_addr.c -+mail_addr.o: mail_addr.h -+mail_addr.o: mail_params.h -+mail_addr_crunch.o: ../../include/argv.h -+mail_addr_crunch.o: ../../include/mymalloc.h -+mail_addr_crunch.o: ../../include/sys_defs.h -+mail_addr_crunch.o: ../../include/vbuf.h -+mail_addr_crunch.o: ../../include/vstring.h -+mail_addr_crunch.o: canon_addr.h -+mail_addr_crunch.o: mail_addr_crunch.c -+mail_addr_crunch.o: mail_addr_crunch.h -+mail_addr_crunch.o: resolve_clnt.h -+mail_addr_crunch.o: tok822.h -+mail_addr_find.o: ../../include/argv.h -+mail_addr_find.o: ../../include/dict.h -+mail_addr_find.o: ../../include/msg.h -+mail_addr_find.o: ../../include/mymalloc.h -+mail_addr_find.o: ../../include/stringops.h -+mail_addr_find.o: ../../include/sys_defs.h -+mail_addr_find.o: ../../include/vbuf.h -+mail_addr_find.o: ../../include/vstream.h -+mail_addr_find.o: ../../include/vstring.h -+mail_addr_find.o: mail_addr_find.c -+mail_addr_find.o: mail_addr_find.h -+mail_addr_find.o: mail_params.h -+mail_addr_find.o: maps.h -+mail_addr_find.o: resolve_local.h -+mail_addr_find.o: strip_addr.h -+mail_addr_map.o: ../../include/argv.h -+mail_addr_map.o: ../../include/dict.h -+mail_addr_map.o: ../../include/msg.h -+mail_addr_map.o: ../../include/mymalloc.h -+mail_addr_map.o: ../../include/sys_defs.h -+mail_addr_map.o: ../../include/vbuf.h -+mail_addr_map.o: ../../include/vstream.h -+mail_addr_map.o: ../../include/vstring.h -+mail_addr_map.o: mail_addr_crunch.h -+mail_addr_map.o: mail_addr_find.h -+mail_addr_map.o: mail_addr_map.c -+mail_addr_map.o: mail_addr_map.h -+mail_addr_map.o: maps.h -+mail_command_client.o: ../../include/attr.h -+mail_command_client.o: ../../include/iostuff.h -+mail_command_client.o: ../../include/sys_defs.h -+mail_command_client.o: ../../include/vbuf.h -+mail_command_client.o: ../../include/vstream.h -+mail_command_client.o: mail_command_client.c -+mail_command_client.o: mail_proto.h -+mail_command_server.o: ../../include/attr.h -+mail_command_server.o: ../../include/iostuff.h -+mail_command_server.o: ../../include/sys_defs.h -+mail_command_server.o: ../../include/vbuf.h -+mail_command_server.o: ../../include/vstream.h -+mail_command_server.o: mail_command_server.c -+mail_command_server.o: mail_proto.h -+mail_conf.o: ../../include/argv.h -+mail_conf.o: ../../include/dict.h -+mail_conf.o: ../../include/msg.h -+mail_conf.o: ../../include/mymalloc.h -+mail_conf.o: ../../include/readlline.h -+mail_conf.o: ../../include/safe.h -+mail_conf.o: ../../include/stringops.h -+mail_conf.o: ../../include/sys_defs.h -+mail_conf.o: ../../include/vbuf.h -+mail_conf.o: ../../include/vstream.h -+mail_conf.o: ../../include/vstring.h -+mail_conf.o: mail_conf.c -+mail_conf.o: mail_conf.h -+mail_conf.o: mail_params.h -+mail_conf_bool.o: ../../include/argv.h -+mail_conf_bool.o: ../../include/dict.h -+mail_conf_bool.o: ../../include/msg.h -+mail_conf_bool.o: ../../include/sys_defs.h -+mail_conf_bool.o: ../../include/vbuf.h -+mail_conf_bool.o: ../../include/vstream.h -+mail_conf_bool.o: ../../include/vstring.h -+mail_conf_bool.o: mail_conf.h -+mail_conf_bool.o: mail_conf_bool.c -+mail_conf_int.o: ../../include/argv.h -+mail_conf_int.o: ../../include/dict.h -+mail_conf_int.o: ../../include/msg.h -+mail_conf_int.o: ../../include/mymalloc.h -+mail_conf_int.o: ../../include/stringops.h -+mail_conf_int.o: ../../include/sys_defs.h -+mail_conf_int.o: ../../include/vbuf.h -+mail_conf_int.o: ../../include/vstream.h -+mail_conf_int.o: ../../include/vstring.h -+mail_conf_int.o: mail_conf.h -+mail_conf_int.o: mail_conf_int.c -+mail_conf_long.o: ../../include/argv.h -+mail_conf_long.o: ../../include/dict.h -+mail_conf_long.o: ../../include/msg.h -+mail_conf_long.o: ../../include/mymalloc.h -+mail_conf_long.o: ../../include/stringops.h -+mail_conf_long.o: ../../include/sys_defs.h -+mail_conf_long.o: ../../include/vbuf.h -+mail_conf_long.o: ../../include/vstream.h -+mail_conf_long.o: ../../include/vstring.h -+mail_conf_long.o: mail_conf.h -+mail_conf_long.o: mail_conf_long.c -+mail_conf_nint.o: ../../include/argv.h -+mail_conf_nint.o: ../../include/dict.h -+mail_conf_nint.o: ../../include/msg.h -+mail_conf_nint.o: ../../include/mymalloc.h -+mail_conf_nint.o: ../../include/stringops.h -+mail_conf_nint.o: ../../include/sys_defs.h -+mail_conf_nint.o: ../../include/vbuf.h -+mail_conf_nint.o: ../../include/vstream.h -+mail_conf_nint.o: ../../include/vstring.h -+mail_conf_nint.o: mail_conf.h -+mail_conf_nint.o: mail_conf_nint.c -+mail_conf_raw.o: ../../include/msg.h -+mail_conf_raw.o: ../../include/mymalloc.h -+mail_conf_raw.o: ../../include/sys_defs.h -+mail_conf_raw.o: mail_conf.h -+mail_conf_raw.o: mail_conf_raw.c -+mail_conf_str.o: ../../include/msg.h -+mail_conf_str.o: ../../include/mymalloc.h -+mail_conf_str.o: ../../include/stringops.h -+mail_conf_str.o: ../../include/sys_defs.h -+mail_conf_str.o: ../../include/vbuf.h -+mail_conf_str.o: ../../include/vstring.h -+mail_conf_str.o: mail_conf.h -+mail_conf_str.o: mail_conf_str.c -+mail_conf_time.o: ../../include/argv.h -+mail_conf_time.o: ../../include/dict.h -+mail_conf_time.o: ../../include/msg.h -+mail_conf_time.o: ../../include/mymalloc.h -+mail_conf_time.o: ../../include/stringops.h -+mail_conf_time.o: ../../include/sys_defs.h -+mail_conf_time.o: ../../include/vbuf.h -+mail_conf_time.o: ../../include/vstream.h -+mail_conf_time.o: ../../include/vstring.h -+mail_conf_time.o: conv_time.h -+mail_conf_time.o: mail_conf.h -+mail_conf_time.o: mail_conf_time.c -+mail_connect.o: ../../include/attr.h -+mail_connect.o: ../../include/connect.h -+mail_connect.o: ../../include/iostuff.h -+mail_connect.o: ../../include/msg.h -+mail_connect.o: ../../include/mymalloc.h -+mail_connect.o: ../../include/stringops.h -+mail_connect.o: ../../include/sys_defs.h -+mail_connect.o: ../../include/vbuf.h -+mail_connect.o: ../../include/vstream.h -+mail_connect.o: ../../include/vstring.h -+mail_connect.o: mail_connect.c -+mail_connect.o: mail_proto.h -+mail_connect.o: timed_ipc.h -+mail_copy.o: ../../include/htable.h -+mail_copy.o: ../../include/iostuff.h -+mail_copy.o: ../../include/msg.h -+mail_copy.o: ../../include/safe_open.h -+mail_copy.o: ../../include/stringops.h -+mail_copy.o: ../../include/sys_defs.h -+mail_copy.o: ../../include/vbuf.h -+mail_copy.o: ../../include/vstream.h -+mail_copy.o: ../../include/vstring.h -+mail_copy.o: ../../include/vstring_vstream.h -+mail_copy.o: dsn.h -+mail_copy.o: dsn_buf.h -+mail_copy.o: mail_addr.h -+mail_copy.o: mail_copy.c -+mail_copy.o: mail_copy.h -+mail_copy.o: mail_params.h -+mail_copy.o: mail_queue.h -+mail_copy.o: mark_corrupt.h -+mail_copy.o: mbox_open.h -+mail_copy.o: quote_822_local.h -+mail_copy.o: quote_flags.h -+mail_copy.o: rec_type.h -+mail_copy.o: record.h -+mail_copy.o: sys_exits.h -+mail_date.o: ../../include/msg.h -+mail_date.o: ../../include/sys_defs.h -+mail_date.o: ../../include/vbuf.h -+mail_date.o: ../../include/vstring.h -+mail_date.o: mail_date.c -+mail_date.o: mail_date.h -+mail_dict.o: ../../include/argv.h -+mail_dict.o: ../../include/dict.h -+mail_dict.o: ../../include/msg.h -+mail_dict.o: ../../include/sys_defs.h -+mail_dict.o: ../../include/vbuf.h -+mail_dict.o: ../../include/vstream.h -+mail_dict.o: ../../include/vstring.h -+mail_dict.o: dict_ldap.h -+mail_dict.o: dict_mysql.h -+mail_dict.o: dict_pgsql.h -+mail_dict.o: dict_proxy.h -+mail_dict.o: mail_dict.c -+mail_dict.o: mail_dict.h -+mail_error.o: ../../include/name_mask.h -+mail_error.o: ../../include/sys_defs.h -+mail_error.o: ../../include/vbuf.h -+mail_error.o: ../../include/vstring.h -+mail_error.o: mail_error.c -+mail_error.o: mail_error.h -+mail_flush.o: ../../include/attr.h -+mail_flush.o: ../../include/iostuff.h -+mail_flush.o: ../../include/sys_defs.h -+mail_flush.o: ../../include/vbuf.h -+mail_flush.o: ../../include/vstream.h -+mail_flush.o: mail_flush.c -+mail_flush.o: mail_flush.h -+mail_flush.o: mail_params.h -+mail_flush.o: mail_proto.h -+mail_open_ok.o: ../../include/msg.h -+mail_open_ok.o: ../../include/sys_defs.h -+mail_open_ok.o: ../../include/vbuf.h -+mail_open_ok.o: ../../include/vstream.h -+mail_open_ok.o: ../../include/vstring.h -+mail_open_ok.o: mail_open_ok.c -+mail_open_ok.o: mail_open_ok.h -+mail_open_ok.o: mail_queue.h -+mail_params.o: ../../include/argv.h -+mail_params.o: ../../include/attr.h -+mail_params.o: ../../include/dict.h -+mail_params.o: ../../include/dict_db.h -+mail_params.o: ../../include/get_hostname.h -+mail_params.o: ../../include/inet_addr_list.h -+mail_params.o: ../../include/inet_proto.h -+mail_params.o: ../../include/iostuff.h -+mail_params.o: ../../include/msg.h -+mail_params.o: ../../include/msg_syslog.h -+mail_params.o: ../../include/myaddrinfo.h -+mail_params.o: ../../include/mymalloc.h -+mail_params.o: ../../include/safe.h -+mail_params.o: ../../include/safe_open.h -+mail_params.o: ../../include/stringops.h -+mail_params.o: ../../include/sys_defs.h -+mail_params.o: ../../include/valid_hostname.h -+mail_params.o: ../../include/vbuf.h -+mail_params.o: ../../include/vstream.h -+mail_params.o: ../../include/vstring.h -+mail_params.o: ../../include/vstring_vstream.h -+mail_params.o: mail_conf.h -+mail_params.o: mail_params.c -+mail_params.o: mail_params.h -+mail_params.o: mail_proto.h -+mail_params.o: mail_version.h -+mail_params.o: mynetworks.h -+mail_params.o: own_inet_addr.h -+mail_params.o: recipient_list.h -+mail_params.o: verp_sender.h -+mail_pathname.o: ../../include/attr.h -+mail_pathname.o: ../../include/iostuff.h -+mail_pathname.o: ../../include/stringops.h -+mail_pathname.o: ../../include/sys_defs.h -+mail_pathname.o: ../../include/vbuf.h -+mail_pathname.o: ../../include/vstream.h -+mail_pathname.o: ../../include/vstring.h -+mail_pathname.o: mail_pathname.c -+mail_pathname.o: mail_proto.h -+mail_queue.o: ../../include/argv.h -+mail_queue.o: ../../include/dir_forest.h -+mail_queue.o: ../../include/make_dirs.h -+mail_queue.o: ../../include/msg.h -+mail_queue.o: ../../include/mymalloc.h -+mail_queue.o: ../../include/sane_fsops.h -+mail_queue.o: ../../include/split_at.h -+mail_queue.o: ../../include/sys_defs.h -+mail_queue.o: ../../include/valid_hostname.h -+mail_queue.o: ../../include/vbuf.h -+mail_queue.o: ../../include/vstream.h -+mail_queue.o: ../../include/vstring.h -+mail_queue.o: file_id.h -+mail_queue.o: mail_params.h -+mail_queue.o: mail_queue.c -+mail_queue.o: mail_queue.h -+mail_run.o: ../../include/msg.h -+mail_run.o: ../../include/mymalloc.h -+mail_run.o: ../../include/stringops.h -+mail_run.o: ../../include/sys_defs.h -+mail_run.o: ../../include/vbuf.h -+mail_run.o: ../../include/vstring.h -+mail_run.o: mail_params.h -+mail_run.o: mail_run.c -+mail_run.o: mail_run.h -+mail_scan_dir.o: ../../include/scan_dir.h -+mail_scan_dir.o: ../../include/sys_defs.h -+mail_scan_dir.o: mail_scan_dir.c -+mail_scan_dir.o: mail_scan_dir.h -+mail_stream.o: ../../include/argv.h -+mail_stream.o: ../../include/attr.h -+mail_stream.o: ../../include/iostuff.h -+mail_stream.o: ../../include/msg.h -+mail_stream.o: ../../include/mymalloc.h -+mail_stream.o: ../../include/sane_fsops.h -+mail_stream.o: ../../include/stringops.h -+mail_stream.o: ../../include/sys_defs.h -+mail_stream.o: ../../include/vbuf.h -+mail_stream.o: ../../include/vstream.h -+mail_stream.o: ../../include/vstring.h -+mail_stream.o: cleanup_user.h -+mail_stream.o: mail_params.h -+mail_stream.o: mail_proto.h -+mail_stream.o: mail_queue.h -+mail_stream.o: mail_stream.c -+mail_stream.o: mail_stream.h -+mail_stream.o: opened.h -+mail_task.o: ../../include/safe.h -+mail_task.o: ../../include/sys_defs.h -+mail_task.o: ../../include/vbuf.h -+mail_task.o: ../../include/vstring.h -+mail_task.o: mail_conf.h -+mail_task.o: mail_params.h -+mail_task.o: mail_task.c -+mail_task.o: mail_task.h -+mail_trigger.o: ../../include/attr.h -+mail_trigger.o: ../../include/iostuff.h -+mail_trigger.o: ../../include/msg.h -+mail_trigger.o: ../../include/mymalloc.h -+mail_trigger.o: ../../include/sys_defs.h -+mail_trigger.o: ../../include/trigger.h -+mail_trigger.o: ../../include/vbuf.h -+mail_trigger.o: ../../include/vstream.h -+mail_trigger.o: mail_params.h -+mail_trigger.o: mail_proto.h -+mail_trigger.o: mail_trigger.c -+mail_version.o: mail_version.c -+maps.o: ../../include/argv.h -+maps.o: ../../include/dict.h -+maps.o: ../../include/msg.h -+maps.o: ../../include/mymalloc.h -+maps.o: ../../include/split_at.h -+maps.o: ../../include/stringops.h -+maps.o: ../../include/sys_defs.h -+maps.o: ../../include/vbuf.h -+maps.o: ../../include/vstream.h -+maps.o: ../../include/vstring.h -+maps.o: mail_conf.h -+maps.o: maps.c -+maps.o: maps.h -+mark_corrupt.o: ../../include/attr.h -+mark_corrupt.o: ../../include/msg.h -+mark_corrupt.o: ../../include/set_eugid.h -+mark_corrupt.o: ../../include/sys_defs.h -+mark_corrupt.o: ../../include/vbuf.h -+mark_corrupt.o: ../../include/vstream.h -+mark_corrupt.o: ../../include/vstring.h -+mark_corrupt.o: deliver_request.h -+mark_corrupt.o: dsn.h -+mark_corrupt.o: mail_params.h -+mark_corrupt.o: mail_queue.h -+mark_corrupt.o: mark_corrupt.c -+mark_corrupt.o: mark_corrupt.h -+mark_corrupt.o: msg_stats.h -+mark_corrupt.o: recipient_list.h -+match_parent_style.o: ../../include/match_list.h -+match_parent_style.o: ../../include/match_ops.h -+match_parent_style.o: ../../include/sys_defs.h -+match_parent_style.o: mail_params.h -+match_parent_style.o: match_parent_style.c -+match_parent_style.o: match_parent_style.h -+match_parent_style.o: string_list.h -+match_service.o: ../../include/argv.h -+match_service.o: ../../include/msg.h -+match_service.o: ../../include/mymalloc.h -+match_service.o: ../../include/stringops.h -+match_service.o: ../../include/sys_defs.h -+match_service.o: ../../include/vbuf.h -+match_service.o: ../../include/vstring.h -+match_service.o: match_service.c -+match_service.o: match_service.h -+mbox_conf.o: ../../include/argv.h -+mbox_conf.o: ../../include/name_mask.h -+mbox_conf.o: ../../include/sys_defs.h -+mbox_conf.o: ../../include/vbuf.h -+mbox_conf.o: ../../include/vstring.h -+mbox_conf.o: mail_params.h -+mbox_conf.o: mbox_conf.c -+mbox_conf.o: mbox_conf.h -+mbox_open.o: ../../include/argv.h -+mbox_open.o: ../../include/iostuff.h -+mbox_open.o: ../../include/msg.h -+mbox_open.o: ../../include/myflock.h -+mbox_open.o: ../../include/mymalloc.h -+mbox_open.o: ../../include/safe_open.h -+mbox_open.o: ../../include/sys_defs.h -+mbox_open.o: ../../include/vbuf.h -+mbox_open.o: ../../include/vstream.h -+mbox_open.o: ../../include/vstring.h -+mbox_open.o: deliver_flock.h -+mbox_open.o: dot_lockfile.h -+mbox_open.o: dsn.h -+mbox_open.o: dsn_buf.h -+mbox_open.o: mbox_conf.h -+mbox_open.o: mbox_open.c -+mbox_open.o: mbox_open.h -+mime_state.o: ../../include/msg.h -+mime_state.o: ../../include/mymalloc.h -+mime_state.o: ../../include/sys_defs.h -+mime_state.o: ../../include/vbuf.h -+mime_state.o: ../../include/vstring.h -+mime_state.o: header_opts.h -+mime_state.o: header_token.h -+mime_state.o: is_header.h -+mime_state.o: lex_822.h -+mime_state.o: mail_params.h -+mime_state.o: mime_state.c -+mime_state.o: mime_state.h -+mime_state.o: rec_type.h -+mkmap_cdb.o: ../../include/argv.h -+mkmap_cdb.o: ../../include/dict.h -+mkmap_cdb.o: ../../include/dict_cdb.h -+mkmap_cdb.o: ../../include/mymalloc.h -+mkmap_cdb.o: ../../include/sys_defs.h -+mkmap_cdb.o: ../../include/vbuf.h -+mkmap_cdb.o: ../../include/vstream.h -+mkmap_cdb.o: ../../include/vstring.h -+mkmap_cdb.o: mkmap.h -+mkmap_cdb.o: mkmap_cdb.c -+mkmap_db.o: ../../include/argv.h -+mkmap_db.o: ../../include/dict.h -+mkmap_db.o: ../../include/dict_db.h -+mkmap_db.o: ../../include/msg.h -+mkmap_db.o: ../../include/myflock.h -+mkmap_db.o: ../../include/mymalloc.h -+mkmap_db.o: ../../include/stringops.h -+mkmap_db.o: ../../include/sys_defs.h -+mkmap_db.o: ../../include/vbuf.h -+mkmap_db.o: ../../include/vstream.h -+mkmap_db.o: ../../include/vstring.h -+mkmap_db.o: mail_params.h -+mkmap_db.o: mkmap.h -+mkmap_db.o: mkmap_db.c -+mkmap_dbm.o: ../../include/argv.h -+mkmap_dbm.o: ../../include/dict.h -+mkmap_dbm.o: ../../include/dict_dbm.h -+mkmap_dbm.o: ../../include/msg.h -+mkmap_dbm.o: ../../include/myflock.h -+mkmap_dbm.o: ../../include/mymalloc.h -+mkmap_dbm.o: ../../include/stringops.h -+mkmap_dbm.o: ../../include/sys_defs.h -+mkmap_dbm.o: ../../include/vbuf.h -+mkmap_dbm.o: ../../include/vstream.h -+mkmap_dbm.o: ../../include/vstring.h -+mkmap_dbm.o: mkmap.h -+mkmap_dbm.o: mkmap_dbm.c -+mkmap_open.o: ../../include/argv.h -+mkmap_open.o: ../../include/dict.h -+mkmap_open.o: ../../include/dict_cdb.h -+mkmap_open.o: ../../include/dict_db.h -+mkmap_open.o: ../../include/dict_dbm.h -+mkmap_open.o: ../../include/dict_sdbm.h -+mkmap_open.o: ../../include/msg.h -+mkmap_open.o: ../../include/mymalloc.h -+mkmap_open.o: ../../include/sigdelay.h -+mkmap_open.o: ../../include/sys_defs.h -+mkmap_open.o: ../../include/vbuf.h -+mkmap_open.o: ../../include/vstream.h -+mkmap_open.o: ../../include/vstring.h -+mkmap_open.o: dict_proxy.h -+mkmap_open.o: mkmap.h -+mkmap_open.o: mkmap_open.c -+mkmap_proxy.o: ../../include/argv.h -+mkmap_proxy.o: ../../include/dict.h -+mkmap_proxy.o: ../../include/mymalloc.h -+mkmap_proxy.o: ../../include/sys_defs.h -+mkmap_proxy.o: ../../include/vbuf.h -+mkmap_proxy.o: ../../include/vstream.h -+mkmap_proxy.o: ../../include/vstring.h -+mkmap_proxy.o: dict_proxy.h -+mkmap_proxy.o: mkmap.h -+mkmap_proxy.o: mkmap_proxy.c -+mkmap_sdbm.o: ../../include/argv.h -+mkmap_sdbm.o: ../../include/dict.h -+mkmap_sdbm.o: ../../include/dict_sdbm.h -+mkmap_sdbm.o: ../../include/msg.h -+mkmap_sdbm.o: ../../include/myflock.h -+mkmap_sdbm.o: ../../include/mymalloc.h -+mkmap_sdbm.o: ../../include/stringops.h -+mkmap_sdbm.o: ../../include/sys_defs.h -+mkmap_sdbm.o: ../../include/vbuf.h -+mkmap_sdbm.o: ../../include/vstream.h -+mkmap_sdbm.o: ../../include/vstring.h -+mkmap_sdbm.o: mkmap.h -+mkmap_sdbm.o: mkmap_sdbm.c -+msg_stats_print.o: ../../include/attr.h -+msg_stats_print.o: ../../include/iostuff.h -+msg_stats_print.o: ../../include/sys_defs.h -+msg_stats_print.o: ../../include/vbuf.h -+msg_stats_print.o: ../../include/vstream.h -+msg_stats_print.o: mail_proto.h -+msg_stats_print.o: msg_stats.h -+msg_stats_print.o: msg_stats_print.c -+msg_stats_scan.o: ../../include/attr.h -+msg_stats_scan.o: ../../include/iostuff.h -+msg_stats_scan.o: ../../include/msg.h -+msg_stats_scan.o: ../../include/sys_defs.h -+msg_stats_scan.o: ../../include/vbuf.h -+msg_stats_scan.o: ../../include/vstream.h -+msg_stats_scan.o: ../../include/vstring.h -+msg_stats_scan.o: mail_proto.h -+msg_stats_scan.o: msg_stats.h -+msg_stats_scan.o: msg_stats_scan.c -+mynetworks.o: ../../include/argv.h -+mynetworks.o: ../../include/inet_addr_list.h -+mynetworks.o: ../../include/mask_addr.h -+mynetworks.o: ../../include/msg.h -+mynetworks.o: ../../include/myaddrinfo.h -+mynetworks.o: ../../include/name_mask.h -+mynetworks.o: ../../include/sock_addr.h -+mynetworks.o: ../../include/sys_defs.h -+mynetworks.o: ../../include/vbuf.h -+mynetworks.o: ../../include/vstring.h -+mynetworks.o: been_here.h -+mynetworks.o: mail_params.h -+mynetworks.o: mynetworks.c -+mynetworks.o: mynetworks.h -+mynetworks.o: own_inet_addr.h -+mypwd.o: ../../include/binhash.h -+mypwd.o: ../../include/htable.h -+mypwd.o: ../../include/msg.h -+mypwd.o: ../../include/mymalloc.h -+mypwd.o: ../../include/sys_defs.h -+mypwd.o: mypwd.c -+mypwd.o: mypwd.h -+namadr_list.o: ../../include/match_list.h -+namadr_list.o: ../../include/match_ops.h -+namadr_list.o: ../../include/sys_defs.h -+namadr_list.o: namadr_list.c -+namadr_list.o: namadr_list.h -+off_cvt.o: ../../include/msg.h -+off_cvt.o: ../../include/sys_defs.h -+off_cvt.o: ../../include/vbuf.h -+off_cvt.o: ../../include/vstring.h -+off_cvt.o: off_cvt.c -+off_cvt.o: off_cvt.h -+opened.o: ../../include/msg.h -+opened.o: ../../include/sys_defs.h -+opened.o: ../../include/vbuf.h -+opened.o: ../../include/vstring.h -+opened.o: opened.c -+opened.o: opened.h -+own_inet_addr.o: ../../include/inet_addr_host.h -+own_inet_addr.o: ../../include/inet_addr_list.h -+own_inet_addr.o: ../../include/inet_addr_local.h -+own_inet_addr.o: ../../include/inet_proto.h -+own_inet_addr.o: ../../include/msg.h -+own_inet_addr.o: ../../include/myaddrinfo.h -+own_inet_addr.o: ../../include/mymalloc.h -+own_inet_addr.o: ../../include/sock_addr.h -+own_inet_addr.o: ../../include/stringops.h -+own_inet_addr.o: ../../include/sys_defs.h -+own_inet_addr.o: ../../include/vbuf.h -+own_inet_addr.o: ../../include/vstring.h -+own_inet_addr.o: mail_params.h -+own_inet_addr.o: own_inet_addr.c -+own_inet_addr.o: own_inet_addr.h -+pipe_command.o: ../../include/argv.h -+pipe_command.o: ../../include/chroot_uid.h -+pipe_command.o: ../../include/clean_env.h -+pipe_command.o: ../../include/exec_command.h -+pipe_command.o: ../../include/iostuff.h -+pipe_command.o: ../../include/msg.h -+pipe_command.o: ../../include/msg_vstream.h -+pipe_command.o: ../../include/set_eugid.h -+pipe_command.o: ../../include/set_ugid.h -+pipe_command.o: ../../include/stringops.h -+pipe_command.o: ../../include/sys_defs.h -+pipe_command.o: ../../include/timed_wait.h -+pipe_command.o: ../../include/vbuf.h -+pipe_command.o: ../../include/vstream.h -+pipe_command.o: ../../include/vstring.h -+pipe_command.o: dsn.h -+pipe_command.o: dsn_buf.h -+pipe_command.o: dsn_util.h -+pipe_command.o: mail_copy.h -+pipe_command.o: mail_params.h -+pipe_command.o: pipe_command.c -+pipe_command.o: pipe_command.h -+pipe_command.o: sys_exits.h -+post_mail.o: ../../include/attr.h -+post_mail.o: ../../include/events.h -+post_mail.o: ../../include/iostuff.h -+post_mail.o: ../../include/msg.h -+post_mail.o: ../../include/mymalloc.h -+post_mail.o: ../../include/sys_defs.h -+post_mail.o: ../../include/vbuf.h -+post_mail.o: ../../include/vstream.h -+post_mail.o: ../../include/vstring.h -+post_mail.o: cleanup_user.h -+post_mail.o: int_filt.h -+post_mail.o: mail_date.h -+post_mail.o: mail_params.h -+post_mail.o: mail_proto.h -+post_mail.o: post_mail.c -+post_mail.o: post_mail.h -+post_mail.o: rec_type.h -+post_mail.o: record.h -+quote_821_local.o: ../../include/sys_defs.h -+quote_821_local.o: ../../include/vbuf.h -+quote_821_local.o: ../../include/vstring.h -+quote_821_local.o: quote_821_local.c -+quote_821_local.o: quote_821_local.h -+quote_821_local.o: quote_flags.h -+quote_822_local.o: ../../include/sys_defs.h -+quote_822_local.o: ../../include/vbuf.h -+quote_822_local.o: ../../include/vstring.h -+quote_822_local.o: quote_822_local.c -+quote_822_local.o: quote_822_local.h -+quote_822_local.o: quote_flags.h -+rcpt_buf.o: ../../include/attr.h -+rcpt_buf.o: ../../include/iostuff.h -+rcpt_buf.o: ../../include/mymalloc.h -+rcpt_buf.o: ../../include/sys_defs.h -+rcpt_buf.o: ../../include/vbuf.h -+rcpt_buf.o: ../../include/vstream.h -+rcpt_buf.o: ../../include/vstring.h -+rcpt_buf.o: mail_proto.h -+rcpt_buf.o: rcpt_buf.c -+rcpt_buf.o: rcpt_buf.h -+rcpt_buf.o: recipient_list.h -+rcpt_print.o: ../../include/attr.h -+rcpt_print.o: ../../include/iostuff.h -+rcpt_print.o: ../../include/sys_defs.h -+rcpt_print.o: ../../include/vbuf.h -+rcpt_print.o: ../../include/vstream.h -+rcpt_print.o: mail_proto.h -+rcpt_print.o: rcpt_print.c -+rcpt_print.o: rcpt_print.h -+rcpt_print.o: recipient_list.h -+rec2stream.o: ../../include/sys_defs.h -+rec2stream.o: ../../include/vbuf.h -+rec2stream.o: ../../include/vstream.h -+rec2stream.o: ../../include/vstring.h -+rec2stream.o: rec2stream.c -+rec2stream.o: rec_streamlf.h -+rec2stream.o: rec_type.h -+rec2stream.o: record.h -+rec_attr_map.o: ../../include/attr.h -+rec_attr_map.o: ../../include/iostuff.h -+rec_attr_map.o: ../../include/sys_defs.h -+rec_attr_map.o: ../../include/vbuf.h -+rec_attr_map.o: ../../include/vstream.h -+rec_attr_map.o: mail_proto.h -+rec_attr_map.o: rec_attr_map.c -+rec_attr_map.o: rec_attr_map.h -+rec_attr_map.o: rec_type.h -+rec_streamlf.o: ../../include/sys_defs.h -+rec_streamlf.o: ../../include/vbuf.h -+rec_streamlf.o: ../../include/vstream.h -+rec_streamlf.o: ../../include/vstring.h -+rec_streamlf.o: rec_streamlf.c -+rec_streamlf.o: rec_streamlf.h -+rec_streamlf.o: rec_type.h -+rec_streamlf.o: record.h -+rec_type.o: rec_type.c -+rec_type.o: rec_type.h -+recdump.o: ../../include/msg_vstream.h -+recdump.o: ../../include/sys_defs.h -+recdump.o: ../../include/vbuf.h -+recdump.o: ../../include/vstream.h -+recdump.o: ../../include/vstring.h -+recdump.o: rec_streamlf.h -+recdump.o: rec_type.h -+recdump.o: recdump.c -+recdump.o: record.h -+recipient_list.o: ../../include/msg.h -+recipient_list.o: ../../include/mymalloc.h -+recipient_list.o: ../../include/sys_defs.h -+recipient_list.o: recipient_list.c -+recipient_list.o: recipient_list.h -+record.o: ../../include/msg.h -+record.o: ../../include/mymalloc.h -+record.o: ../../include/stringops.h -+record.o: ../../include/sys_defs.h -+record.o: ../../include/vbuf.h -+record.o: ../../include/vstream.h -+record.o: ../../include/vstring.h -+record.o: off_cvt.h -+record.o: rec_type.h -+record.o: record.c -+record.o: record.h -+remove.o: ../../include/sys_defs.h -+remove.o: ../../include/vbuf.h -+remove.o: ../../include/vstring.h -+remove.o: mail_params.h -+remove.o: remove.c -+resolve_clnt.o: ../../include/attr.h -+resolve_clnt.o: ../../include/events.h -+resolve_clnt.o: ../../include/iostuff.h -+resolve_clnt.o: ../../include/msg.h -+resolve_clnt.o: ../../include/sys_defs.h -+resolve_clnt.o: ../../include/vbuf.h -+resolve_clnt.o: ../../include/vstream.h -+resolve_clnt.o: ../../include/vstring.h -+resolve_clnt.o: ../../include/vstring_vstream.h -+resolve_clnt.o: clnt_stream.h -+resolve_clnt.o: mail_params.h -+resolve_clnt.o: mail_proto.h -+resolve_clnt.o: resolve_clnt.c -+resolve_clnt.o: resolve_clnt.h -+resolve_local.o: ../../include/inet_addr_list.h -+resolve_local.o: ../../include/match_list.h -+resolve_local.o: ../../include/match_ops.h -+resolve_local.o: ../../include/msg.h -+resolve_local.o: ../../include/myaddrinfo.h -+resolve_local.o: ../../include/mymalloc.h -+resolve_local.o: ../../include/sys_defs.h -+resolve_local.o: ../../include/valid_hostname.h -+resolve_local.o: mail_params.h -+resolve_local.o: own_inet_addr.h -+resolve_local.o: resolve_local.c -+resolve_local.o: resolve_local.h -+resolve_local.o: string_list.h -+resolve_local.o: valid_mailhost_addr.h -+rewrite_clnt.o: ../../include/attr.h -+rewrite_clnt.o: ../../include/events.h -+rewrite_clnt.o: ../../include/iostuff.h -+rewrite_clnt.o: ../../include/msg.h -+rewrite_clnt.o: ../../include/sys_defs.h -+rewrite_clnt.o: ../../include/vbuf.h -+rewrite_clnt.o: ../../include/vstream.h -+rewrite_clnt.o: ../../include/vstring.h -+rewrite_clnt.o: ../../include/vstring_vstream.h -+rewrite_clnt.o: clnt_stream.h -+rewrite_clnt.o: mail_params.h -+rewrite_clnt.o: mail_proto.h -+rewrite_clnt.o: quote_822_local.h -+rewrite_clnt.o: quote_flags.h -+rewrite_clnt.o: rewrite_clnt.c -+rewrite_clnt.o: rewrite_clnt.h -+scache.o: ../../include/argv.h -+scache.o: ../../include/events.h -+scache.o: ../../include/msg.h -+scache.o: ../../include/sys_defs.h -+scache.o: ../../include/vbuf.h -+scache.o: ../../include/vstream.h -+scache.o: ../../include/vstring.h -+scache.o: ../../include/vstring_vstream.h -+scache.o: scache.c -+scache.o: scache.h -+scache_clnt.o: ../../include/attr.h -+scache_clnt.o: ../../include/auto_clnt.h -+scache_clnt.o: ../../include/iostuff.h -+scache_clnt.o: ../../include/msg.h -+scache_clnt.o: ../../include/mymalloc.h -+scache_clnt.o: ../../include/stringops.h -+scache_clnt.o: ../../include/sys_defs.h -+scache_clnt.o: ../../include/vbuf.h -+scache_clnt.o: ../../include/vstream.h -+scache_clnt.o: ../../include/vstring.h -+scache_clnt.o: mail_params.h -+scache_clnt.o: mail_proto.h -+scache_clnt.o: scache.h -+scache_clnt.o: scache_clnt.c -+scache_multi.o: ../../include/events.h -+scache_multi.o: ../../include/htable.h -+scache_multi.o: ../../include/msg.h -+scache_multi.o: ../../include/mymalloc.h -+scache_multi.o: ../../include/ring.h -+scache_multi.o: ../../include/sys_defs.h -+scache_multi.o: ../../include/vbuf.h -+scache_multi.o: ../../include/vstring.h -+scache_multi.o: scache.h -+scache_multi.o: scache_multi.c -+scache_single.o: ../../include/events.h -+scache_single.o: ../../include/msg.h -+scache_single.o: ../../include/mymalloc.h -+scache_single.o: ../../include/sys_defs.h -+scache_single.o: ../../include/vbuf.h -+scache_single.o: ../../include/vstring.h -+scache_single.o: scache.h -+scache_single.o: scache_single.c -+sent.o: ../../include/attr.h -+sent.o: ../../include/msg.h -+sent.o: ../../include/sys_defs.h -+sent.o: ../../include/vbuf.h -+sent.o: ../../include/vstream.h -+sent.o: ../../include/vstring.h -+sent.o: bounce.h -+sent.o: defer.h -+sent.o: deliver_request.h -+sent.o: dsn.h -+sent.o: dsn_buf.h -+sent.o: dsn_mask.h -+sent.o: dsn_util.h -+sent.o: log_adhoc.h -+sent.o: mail_params.h -+sent.o: msg_stats.h -+sent.o: recipient_list.h -+sent.o: sent.c -+sent.o: sent.h -+sent.o: trace.h -+sent.o: verify.h -+smtp_stream.o: ../../include/iostuff.h -+smtp_stream.o: ../../include/msg.h -+smtp_stream.o: ../../include/sys_defs.h -+smtp_stream.o: ../../include/vbuf.h -+smtp_stream.o: ../../include/vstream.h -+smtp_stream.o: ../../include/vstring.h -+smtp_stream.o: ../../include/vstring_vstream.h -+smtp_stream.o: smtp_stream.c -+smtp_stream.o: smtp_stream.h -+split_addr.o: ../../include/split_at.h -+split_addr.o: ../../include/sys_defs.h -+split_addr.o: mail_addr.h -+split_addr.o: mail_params.h -+split_addr.o: split_addr.c -+split_addr.o: split_addr.h -+stream2rec.o: ../../include/sys_defs.h -+stream2rec.o: ../../include/vbuf.h -+stream2rec.o: ../../include/vstream.h -+stream2rec.o: ../../include/vstring.h -+stream2rec.o: rec_streamlf.h -+stream2rec.o: rec_type.h -+stream2rec.o: record.h -+stream2rec.o: stream2rec.c -+string_list.o: ../../include/match_list.h -+string_list.o: ../../include/match_ops.h -+string_list.o: ../../include/sys_defs.h -+string_list.o: string_list.c -+string_list.o: string_list.h -+strip_addr.o: ../../include/mymalloc.h -+strip_addr.o: ../../include/sys_defs.h -+strip_addr.o: split_addr.h -+strip_addr.o: strip_addr.c -+strip_addr.o: strip_addr.h -+sys_exits.o: ../../include/msg.h -+sys_exits.o: ../../include/sys_defs.h -+sys_exits.o: ../../include/vbuf.h -+sys_exits.o: ../../include/vstring.h -+sys_exits.o: sys_exits.c -+sys_exits.o: sys_exits.h -+timed_ipc.o: ../../include/msg.h -+timed_ipc.o: ../../include/sys_defs.h -+timed_ipc.o: ../../include/vbuf.h -+timed_ipc.o: ../../include/vstream.h -+timed_ipc.o: mail_params.h -+timed_ipc.o: timed_ipc.c -+timed_ipc.o: timed_ipc.h -+tok822_find.o: ../../include/sys_defs.h -+tok822_find.o: ../../include/vbuf.h -+tok822_find.o: ../../include/vstring.h -+tok822_find.o: resolve_clnt.h -+tok822_find.o: tok822.h -+tok822_find.o: tok822_find.c -+tok822_node.o: ../../include/mymalloc.h -+tok822_node.o: ../../include/sys_defs.h -+tok822_node.o: ../../include/vbuf.h -+tok822_node.o: ../../include/vstring.h -+tok822_node.o: resolve_clnt.h -+tok822_node.o: tok822.h -+tok822_node.o: tok822_node.c -+tok822_parse.o: ../../include/msg.h -+tok822_parse.o: ../../include/stringops.h -+tok822_parse.o: ../../include/sys_defs.h -+tok822_parse.o: ../../include/vbuf.h -+tok822_parse.o: ../../include/vstring.h -+tok822_parse.o: lex_822.h -+tok822_parse.o: quote_822_local.h -+tok822_parse.o: quote_flags.h -+tok822_parse.o: resolve_clnt.h -+tok822_parse.o: tok822.h -+tok822_parse.o: tok822_parse.c -+tok822_resolve.o: ../../include/msg.h -+tok822_resolve.o: ../../include/sys_defs.h -+tok822_resolve.o: ../../include/vbuf.h -+tok822_resolve.o: ../../include/vstring.h -+tok822_resolve.o: resolve_clnt.h -+tok822_resolve.o: tok822.h -+tok822_resolve.o: tok822_resolve.c -+tok822_rewrite.o: ../../include/attr.h -+tok822_rewrite.o: ../../include/iostuff.h -+tok822_rewrite.o: ../../include/msg.h -+tok822_rewrite.o: ../../include/sys_defs.h -+tok822_rewrite.o: ../../include/vbuf.h -+tok822_rewrite.o: ../../include/vstream.h -+tok822_rewrite.o: ../../include/vstring.h -+tok822_rewrite.o: mail_proto.h -+tok822_rewrite.o: resolve_clnt.h -+tok822_rewrite.o: rewrite_clnt.h -+tok822_rewrite.o: tok822.h -+tok822_rewrite.o: tok822_rewrite.c -+tok822_tree.o: ../../include/mymalloc.h -+tok822_tree.o: ../../include/sys_defs.h -+tok822_tree.o: ../../include/vbuf.h -+tok822_tree.o: ../../include/vstring.h -+tok822_tree.o: resolve_clnt.h -+tok822_tree.o: tok822.h -+tok822_tree.o: tok822_tree.c -+trace.o: ../../include/attr.h -+trace.o: ../../include/iostuff.h -+trace.o: ../../include/msg.h -+trace.o: ../../include/sys_defs.h -+trace.o: ../../include/vbuf.h -+trace.o: ../../include/vstream.h -+trace.o: ../../include/vstring.h -+trace.o: bounce.h -+trace.o: deliver_request.h -+trace.o: dsn.h -+trace.o: dsn_buf.h -+trace.o: dsn_print.h -+trace.o: log_adhoc.h -+trace.o: mail_params.h -+trace.o: mail_proto.h -+trace.o: msg_stats.h -+trace.o: rcpt_print.h -+trace.o: recipient_list.h -+trace.o: trace.c -+trace.o: trace.h -+user_acl.o: ../../include/match_list.h -+user_acl.o: ../../include/match_ops.h -+user_acl.o: ../../include/sys_defs.h -+user_acl.o: ../../include/vbuf.h -+user_acl.o: ../../include/vstring.h -+user_acl.o: mail_params.h -+user_acl.o: mypwd.h -+user_acl.o: string_list.h -+user_acl.o: user_acl.c -+user_acl.o: user_acl.h -+valid_mailhost_addr.o: ../../include/msg.h -+valid_mailhost_addr.o: ../../include/myaddrinfo.h -+valid_mailhost_addr.o: ../../include/sys_defs.h -+valid_mailhost_addr.o: ../../include/valid_hostname.h -+valid_mailhost_addr.o: valid_mailhost_addr.c -+valid_mailhost_addr.o: valid_mailhost_addr.h -+verify.o: ../../include/attr.h -+verify.o: ../../include/iostuff.h -+verify.o: ../../include/msg.h -+verify.o: ../../include/sys_defs.h -+verify.o: ../../include/vbuf.h -+verify.o: ../../include/vstream.h -+verify.o: ../../include/vstring.h -+verify.o: deliver_request.h -+verify.o: dsn.h -+verify.o: log_adhoc.h -+verify.o: mail_params.h -+verify.o: mail_proto.h -+verify.o: msg_stats.h -+verify.o: recipient_list.h -+verify.o: verify.c -+verify.o: verify.h -+verify.o: verify_clnt.h -+verify_clnt.o: ../../include/attr.h -+verify_clnt.o: ../../include/iostuff.h -+verify_clnt.o: ../../include/msg.h -+verify_clnt.o: ../../include/sys_defs.h -+verify_clnt.o: ../../include/vbuf.h -+verify_clnt.o: ../../include/vstream.h -+verify_clnt.o: ../../include/vstring.h -+verify_clnt.o: clnt_stream.h -+verify_clnt.o: deliver_request.h -+verify_clnt.o: dsn.h -+verify_clnt.o: mail_params.h -+verify_clnt.o: mail_proto.h -+verify_clnt.o: msg_stats.h -+verify_clnt.o: recipient_list.h -+verify_clnt.o: verify_clnt.c -+verify_clnt.o: verify_clnt.h -+verp_sender.o: ../../include/sys_defs.h -+verp_sender.o: ../../include/vbuf.h -+verp_sender.o: ../../include/vstring.h -+verp_sender.o: mail_params.h -+verp_sender.o: recipient_list.h -+verp_sender.o: verp_sender.c -+verp_sender.o: verp_sender.h -+wildcard_inet_addr.o: ../../include/inet_addr_host.h -+wildcard_inet_addr.o: ../../include/inet_addr_list.h -+wildcard_inet_addr.o: ../../include/msg.h -+wildcard_inet_addr.o: ../../include/myaddrinfo.h -+wildcard_inet_addr.o: ../../include/sys_defs.h -+wildcard_inet_addr.o: wildcard_inet_addr.c -+wildcard_inet_addr.o: wildcard_inet_addr.h -+xtext.o: ../../include/msg.h -+xtext.o: ../../include/sys_defs.h -+xtext.o: ../../include/vbuf.h -+xtext.o: ../../include/vstring.h -+xtext.o: xtext.c -+xtext.o: xtext.h -diff -ruN a/src/global/mail_conf.c b/src/global/mail_conf.c ---- a/src/global/mail_conf.c 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/mail_conf.c 2009-06-01 13:08:26.000000000 +0000 -@@ -182,6 +182,13 @@ - path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); - dict_load_file(CONFIG_DICT, path); - myfree(path); -+ -+#ifndef NO_DYNAMIC_MAPS -+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); -+ dict_open_dlinfo(path); -+ myfree(path); -+#endif -+ - } - - /* mail_conf_flush - discard configuration dictionary */ -diff -ruN a/src/global/mail_conf.c.orig b/src/global/mail_conf.c.orig ---- a/src/global/mail_conf.c.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/global/mail_conf.c.orig 2009-06-01 13:07:56.000000000 +0000 -@@ -0,0 +1,229 @@ -+/*++ -+/* NAME -+/* mail_conf 3 -+/* SUMMARY -+/* global configuration parameter management -+/* SYNOPSIS -+/* #include <mail_conf.h> -+/* -+/* void mail_conf_read() -+/* -+/* void mail_conf_suck() -+/* -+/* void mail_conf_flush() -+/* -+/* void mail_conf_update(name, value) -+/* const char *name; -+/* const char *value; -+/* -+/* const char *mail_conf_lookup(name) -+/* const char *name; -+/* -+/* const char *mail_conf_eval(string) -+/* const char *string; -+/* -+/* const char *mail_conf_lookup_eval(name) -+/* const char *name; -+/* DESCRIPTION -+/* mail_conf_suck() reads the global Postfix configuration file, and -+/* stores its values into a global configuration dictionary. -+/* -+/* mail_conf_read() invokes mail_conf_suck() and assigns the values -+/* to global variables by calling mail_params_init(). -+/* -+/* mail_conf_flush() discards the global configuration dictionary. -+/* This is needed in programs that read main.cf multiple times, to -+/* ensure that deleted parameter settings are handled properly. -+/* -+/* The following routines are wrappers around the generic dictionary -+/* access routines. -+/* -+/* mail_conf_update() updates the named global parameter. This has -+/* no effect on parameters whose value has already been looked up. -+/* The update succeeds or the program terminates with fatal error. -+/* -+/* mail_conf_lookup() looks up the value of the named parameter. -+/* A null pointer result means the parameter was not found. -+/* The result is volatile and should be copied if it is to be -+/* used for any appreciable amount of time. -+/* -+/* mail_conf_eval() recursively expands any $parameters in the -+/* string argument. The result is volatile and should be copied -+/* if it is to be used for any appreciable amount of time. -+/* -+/* mail_conf_lookup_eval() looks up the named parameter, and expands any -+/* $parameters in the result. The result is volatile and should be -+/* copied if it is to be used for any appreciable amount of time. -+/* DIAGNOSTICS -+/* Fatal errors: malformed numerical value. -+/* ENVIRONMENT -+/* MAIL_CONFIG, non-default configuration database -+/* MAIL_VERBOSE, enable verbose mode -+/* FILES -+/* /etc/postfix: default Postfix configuration directory. -+/* SEE ALSO -+/* dict(3) generic dictionary manager -+/* mail_conf_int(3) integer-valued parameters -+/* mail_conf_str(3) string-valued parameters -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System library. */ -+ -+#include <sys_defs.h> -+#include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+ -+/* Utility library. */ -+ -+#include <msg.h> -+#include <mymalloc.h> -+#include <vstream.h> -+#include <vstring.h> -+#include <dict.h> -+#include <safe.h> -+#include <stringops.h> -+#include <readlline.h> -+ -+/* Global library. */ -+ -+#include "mail_params.h" -+#include "mail_conf.h" -+ -+/* mail_conf_checkdir - authorize non-default directory */ -+ -+static void mail_conf_checkdir(const char *config_dir) -+{ -+ VSTRING *buf; -+ VSTREAM *fp; -+ char *path; -+ char *name; -+ char *value; -+ char *cp; -+ int found = 0; -+ -+ /* -+ * If running set-[ug]id, require that a non-default configuration -+ * directory name is blessed as a bona fide configuration directory in -+ * the default main.cf file. -+ */ -+ path = concatenate(DEF_CONFIG_DIR, "/", "main.cf", (char *) 0); -+ if ((fp = vstream_fopen(path, O_RDONLY, 0)) == 0) -+ msg_fatal("open file %s: %m", path); -+ -+ buf = vstring_alloc(1); -+ while (found == 0 && readlline(buf, fp, (int *) 0)) { -+ if (split_nameval(vstring_str(buf), &name, &value) == 0 -+ && (strcmp(name, VAR_CONFIG_DIRS) == 0 -+ || strcmp(name, VAR_MULTI_CONF_DIRS) == 0)) { -+ while (found == 0 && (cp = mystrtok(&value, ", \t\r\n")) != 0) -+ if (strcmp(cp, config_dir) == 0) -+ found = 1; -+ } -+ } -+ if (vstream_fclose(fp)) -+ msg_fatal("read file %s: %m", path); -+ vstring_free(buf); -+ -+ if (found == 0) { -+ msg_error("untrusted configuration directory name: %s", config_dir); -+ msg_fatal("specify \"%s = %s\" in %s", -+ VAR_CONFIG_DIRS, config_dir, path); -+ } -+ myfree(path); -+} -+ -+/* mail_conf_read - read global configuration file */ -+ -+void mail_conf_read(void) -+{ -+ mail_conf_suck(); -+ mail_params_init(); -+} -+ -+/* mail_conf_suck - suck in the global configuration file */ -+ -+void mail_conf_suck(void) -+{ -+ char *config_dir; -+ char *path; -+ -+ /* -+ * Permit references to unknown configuration variable names. We rely on -+ * a separate configuration checking tool to spot misspelled names and -+ * other kinds of trouble. Enter the configuration directory into the -+ * default dictionary. -+ */ -+ dict_unknown_allowed = 1; -+ if (var_config_dir) -+ myfree(var_config_dir); -+ if ((config_dir = getenv(CONF_ENV_PATH)) == 0) -+ config_dir = DEF_CONFIG_DIR; -+ var_config_dir = mystrdup(config_dir); -+ set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); -+ -+ /* -+ * If the configuration directory name comes from a different trust -+ * domain, require that it is listed in the default main.cf file. -+ */ -+ if (strcmp(var_config_dir, DEF_CONFIG_DIR) != 0 /* non-default */ -+ && safe_getenv(CONF_ENV_PATH) == 0 /* non-default */ -+ && geteuid() != 0) /* untrusted */ -+ mail_conf_checkdir(var_config_dir); -+ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); -+ dict_load_file(CONFIG_DICT, path); -+ myfree(path); -+} -+ -+/* mail_conf_flush - discard configuration dictionary */ -+ -+void mail_conf_flush(void) -+{ -+ if (dict_handle(CONFIG_DICT) != 0) -+ dict_unregister(CONFIG_DICT); -+} -+ -+/* mail_conf_eval - expand macros in string */ -+ -+const char *mail_conf_eval(const char *string) -+{ -+#define RECURSIVE 1 -+ -+ return (dict_eval(CONFIG_DICT, string, RECURSIVE)); -+} -+ -+/* mail_conf_lookup - lookup named variable */ -+ -+const char *mail_conf_lookup(const char *name) -+{ -+ return (dict_lookup(CONFIG_DICT, name)); -+} -+ -+/* mail_conf_lookup_eval - expand named variable */ -+ -+const char *mail_conf_lookup_eval(const char *name) -+{ -+ const char *value; -+ -+#define RECURSIVE 1 -+ -+ if ((value = dict_lookup(CONFIG_DICT, name)) != 0) -+ value = dict_eval(CONFIG_DICT, value, RECURSIVE); -+ return (value); -+} -+ -+/* mail_conf_update - update parameter */ -+ -+void mail_conf_update(const char *key, const char *value) -+{ -+ dict_update(CONFIG_DICT, key, value); -+} -diff -ruN a/src/global/mail_dict.c b/src/global/mail_dict.c ---- a/src/global/mail_dict.c 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/mail_dict.c 2009-06-01 13:08:26.000000000 +0000 -@@ -45,6 +45,7 @@ - - static const DICT_OPEN_INFO dict_open_info[] = { - DICT_TYPE_PROXY, dict_proxy_open, -+#ifdef NO_DYNAMIC_MAPS - #ifdef HAS_LDAP - DICT_TYPE_LDAP, dict_ldap_open, - #endif -@@ -54,6 +55,7 @@ - #ifdef HAS_PGSQL - DICT_TYPE_PGSQL, dict_pgsql_open, - #endif -+#endif /* NO_DYNAMIC_MAPS */ - 0, - }; - -diff -ruN a/src/global/mail_params.c b/src/global/mail_params.c ---- a/src/global/mail_params.c 2009-06-01 12:27:43.000000000 +0000 -+++ b/src/global/mail_params.c 2009-06-01 13:08:26.000000000 +0000 -@@ -79,6 +79,7 @@ - /* char *var_export_environ; - /* char *var_debug_peer_list; - /* int var_debug_peer_level; -+/* int var_command_maxtime; - /* int var_in_flow_delay; - /* int var_fault_inj_code; - /* char *var_bounce_service; -@@ -265,6 +266,7 @@ - char *var_export_environ; - char *var_debug_peer_list; - int var_debug_peer_level; -+int var_command_maxtime; - int var_fault_inj_code; - char *var_bounce_service; - char *var_cleanup_service; -@@ -276,6 +278,7 @@ - char *var_error_service; - char *var_flush_service; - char *var_verify_service; -+char *var_scache_service; - char *var_trace_service; - char *var_proxymap_service; - char *var_proxywrite_service; -diff -ruN a/src/global/mail_params.c.orig b/src/global/mail_params.c.orig ---- a/src/global/mail_params.c.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/global/mail_params.c.orig 2009-06-01 13:07:56.000000000 +0000 -@@ -0,0 +1,752 @@ -+/*++ -+/* NAME -+/* mail_params 3 -+/* SUMMARY -+/* global mail configuration parameters -+/* SYNOPSIS -+/* #include <mail_params.h> -+/* -+/* char *var_myhostname; -+/* char *var_mydomain; -+/* char *var_myorigin; -+/* char *var_mydest; -+/* char *var_relayhost; -+/* char *var_transit_origin; -+/* char *var_transit_dest; -+/* char *var_mail_name; -+/* int var_helpful_warnings; -+/* char *var_syslog_name; -+/* char *var_mail_owner; -+/* uid_t var_owner_uid; -+/* gid_t var_owner_gid; -+/* char *var_sgid_group; -+/* gid_t var_sgid_gid; -+/* char *var_default_privs; -+/* uid_t var_default_uid; -+/* gid_t var_default_gid; -+/* char *var_config_dir; -+/* char *var_daemon_dir; -+/* char *var_data_dir; -+/* char *var_command_dir; -+/* char *var_queue_dir; -+/* int var_use_limit; -+/* int var_idle_limit; -+/* int var_event_drain; -+/* int var_bundle_rcpt; -+/* char *var_procname; -+/* int var_pid; -+/* int var_ipc_timeout; -+/* char *var_pid_dir; -+/* int var_dont_remove; -+/* char *var_inet_interfaces; -+/* char *var_proxy_interfaces; -+/* char *var_inet_protocols; -+/* char *var_mynetworks; -+/* char *var_double_bounce_sender; -+/* int var_line_limit; -+/* char *var_alias_db_map; -+/* int var_message_limit; -+/* char *var_mail_release; -+/* char *var_mail_version; -+/* int var_ipc_idle_limit; -+/* int var_ipc_ttl_limit; -+/* char *var_db_type; -+/* char *var_hash_queue_names; -+/* int var_hash_queue_depth; -+/* int var_trigger_timeout; -+/* char *var_rcpt_delim; -+/* int var_fork_tries; -+/* int var_fork_delay; -+/* int var_flock_tries; -+/* int var_flock_delay; -+/* int var_flock_stale; -+/* int var_disable_dns; -+/* int var_soft_bounce; -+/* time_t var_starttime; -+/* int var_ownreq_special; -+/* int var_daemon_timeout; -+/* char *var_syslog_facility; -+/* char *var_relay_domains; -+/* char *var_fflush_domains; -+/* char *var_mynetworks_style; -+/* char *var_verp_delims; -+/* char *var_verp_filter; -+/* char *var_par_dom_match; -+/* char *var_config_dirs; -+/* -+/* int var_inet_windowsize; -+/* char *var_import_environ; -+/* char *var_export_environ; -+/* char *var_debug_peer_list; -+/* int var_debug_peer_level; -+/* int var_in_flow_delay; -+/* int var_fault_inj_code; -+/* char *var_bounce_service; -+/* char *var_cleanup_service; -+/* char *var_defer_service; -+/* char *var_pickup_service; -+/* char *var_queue_service; -+/* char *var_rewrite_service; -+/* char *var_showq_service; -+/* char *var_error_service; -+/* char *var_flush_service; -+/* char *var_verify_service; -+/* char *var_trace_service; -+/* char *var_proxymap_service; -+/* char *var_proxywrite_service; -+/* int var_db_create_buf; -+/* int var_db_read_buf; -+/* int var_mime_maxdepth; -+/* int var_mime_bound_len; -+/* int var_header_limit; -+/* int var_token_limit; -+/* int var_disable_mime_input; -+/* int var_disable_mime_oconv; -+/* int var_strict_8bitmime; -+/* int var_strict_7bit_hdrs; -+/* int var_strict_8bit_body; -+/* int var_strict_encoding; -+/* int var_verify_neg_cache; -+/* int var_oldlog_compat; -+/* int var_delay_max_res; -+/* char *var_int_filt_classes; -+/* int var_cyrus_sasl_authzid; -+/* -+/* char *var_multi_conf_dirs; -+/* char *var_multi_wrapper; -+/* char *var_multi_group; -+/* char *var_multi_name; -+/* bool var_multi_enable; -+/* -+/* void mail_params_init() -+/* -+/* const char null_format_string[1]; -+/* DESCRIPTION -+/* This module (actually the associated include file) define the names -+/* and defaults of all mail configuration parameters. -+/* -+/* mail_params_init() initializes the built-in parameters listed above. -+/* These parameters are relied upon by library routines, so they are -+/* initialized globally so as to avoid hard-to-find errors due to -+/* missing initialization. This routine must be called early, at -+/* least before entering a chroot jail. -+/* -+/* null_format_string is a workaround for gcc compilers that complain -+/* about empty or null format strings. -+/* DIAGNOSTICS -+/* Fatal errors: out of memory; null system or domain name. -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System library. */ -+ -+#include <sys_defs.h> -+#include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+#include <pwd.h> -+#include <grp.h> -+#include <time.h> -+#include <ctype.h> -+ -+#ifdef STRCASECMP_IN_STRINGS_H -+#include <strings.h> -+#endif -+ -+/* Utility library. */ -+ -+#include <msg.h> -+#include <msg_syslog.h> -+#include <get_hostname.h> -+#include <valid_hostname.h> -+#include <stringops.h> -+#include <safe.h> -+#include <safe_open.h> -+#include <mymalloc.h> -+#ifdef HAS_DB -+#include <dict_db.h> -+#endif -+#include <inet_proto.h> -+#include <vstring_vstream.h> -+#include <iostuff.h> -+ -+/* Global library. */ -+ -+#include <mynetworks.h> -+#include <mail_conf.h> -+#include <mail_version.h> -+#include <mail_proto.h> -+#include <verp_sender.h> -+#include <own_inet_addr.h> -+#include <mail_params.h> -+ -+ /* -+ * Special configuration variables. -+ */ -+char *var_myhostname; -+char *var_mydomain; -+char *var_myorigin; -+char *var_mydest; -+char *var_relayhost; -+char *var_transit_origin; -+char *var_transit_dest; -+char *var_mail_name; -+int var_helpful_warnings; -+char *var_syslog_name; -+char *var_mail_owner; -+uid_t var_owner_uid; -+gid_t var_owner_gid; -+char *var_sgid_group; -+gid_t var_sgid_gid; -+char *var_default_privs; -+uid_t var_default_uid; -+gid_t var_default_gid; -+char *var_config_dir; -+char *var_daemon_dir; -+char *var_data_dir; -+char *var_command_dir; -+char *var_queue_dir; -+int var_use_limit; -+int var_event_drain; -+int var_idle_limit; -+int var_bundle_rcpt; -+char *var_procname; -+int var_pid; -+int var_ipc_timeout; -+char *var_pid_dir; -+int var_dont_remove; -+char *var_inet_interfaces; -+char *var_proxy_interfaces; -+char *var_inet_protocols; -+char *var_mynetworks; -+char *var_double_bounce_sender; -+int var_line_limit; -+char *var_alias_db_map; -+int var_message_limit; -+char *var_mail_release; -+char *var_mail_version; -+int var_ipc_idle_limit; -+int var_ipc_ttl_limit; -+char *var_db_type; -+char *var_hash_queue_names; -+int var_hash_queue_depth; -+int var_trigger_timeout; -+char *var_rcpt_delim; -+int var_fork_tries; -+int var_fork_delay; -+int var_flock_tries; -+int var_flock_delay; -+int var_flock_stale; -+int var_disable_dns; -+int var_soft_bounce; -+time_t var_starttime; -+int var_ownreq_special; -+int var_daemon_timeout; -+char *var_syslog_facility; -+char *var_relay_domains; -+char *var_fflush_domains; -+char *var_mynetworks_style; -+char *var_verp_delims; -+char *var_verp_filter; -+int var_in_flow_delay; -+char *var_par_dom_match; -+char *var_config_dirs; -+ -+int var_inet_windowsize; -+char *var_import_environ; -+char *var_export_environ; -+char *var_debug_peer_list; -+int var_debug_peer_level; -+int var_fault_inj_code; -+char *var_bounce_service; -+char *var_cleanup_service; -+char *var_defer_service; -+char *var_pickup_service; -+char *var_queue_service; -+char *var_rewrite_service; -+char *var_showq_service; -+char *var_error_service; -+char *var_flush_service; -+char *var_verify_service; -+char *var_trace_service; -+char *var_proxymap_service; -+char *var_proxywrite_service; -+int var_db_create_buf; -+int var_db_read_buf; -+int var_mime_maxdepth; -+int var_mime_bound_len; -+int var_header_limit; -+int var_token_limit; -+int var_disable_mime_input; -+int var_disable_mime_oconv; -+int var_strict_8bitmime; -+int var_strict_7bit_hdrs; -+int var_strict_8bit_body; -+int var_strict_encoding; -+int var_verify_neg_cache; -+int var_oldlog_compat; -+int var_delay_max_res; -+char *var_int_filt_classes; -+int var_cyrus_sasl_authzid; -+ -+char *var_multi_conf_dirs; -+char *var_multi_wrapper; -+char *var_multi_group; -+char *var_multi_name; -+bool var_multi_enable; -+ -+const char null_format_string[1] = ""; -+ -+/* check_myhostname - lookup hostname and validate */ -+ -+static const char *check_myhostname(void) -+{ -+ static const char *name; -+ const char *dot; -+ const char *domain; -+ -+ /* -+ * Use cached result. -+ */ -+ if (name) -+ return (name); -+ -+ /* -+ * If the local machine name is not in FQDN form, try to append the -+ * contents of $mydomain. Use a default domain as a final workaround. -+ */ -+ name = get_hostname(); -+ if ((dot = strchr(name, '.')) == 0) { -+ if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) -+ domain = DEF_MYDOMAIN; -+ name = concatenate(name, ".", domain, (char *) 0); -+ } -+ return (name); -+} -+ -+/* check_mydomainname - lookup domain name and validate */ -+ -+static const char *check_mydomainname(void) -+{ -+ char *dot; -+ -+ /* -+ * Use a default domain when the hostname is not a FQDN ("foo"). -+ */ -+ if ((dot = strchr(var_myhostname, '.')) == 0) -+ return (DEF_MYDOMAIN); -+ return (dot + 1); -+} -+ -+/* check_default_privs - lookup default user attributes and validate */ -+ -+static void check_default_privs(void) -+{ -+ struct passwd *pwd; -+ -+ if ((pwd = getpwnam(var_default_privs)) == 0) -+ msg_fatal("file %s/%s: parameter %s: unknown user name value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, var_default_privs); -+ if ((var_default_uid = pwd->pw_uid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged user ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, var_default_privs); -+ if ((var_default_gid = pwd->pw_gid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged group ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, var_default_privs); -+} -+ -+/* check_mail_owner - lookup owner user attributes and validate */ -+ -+static void check_mail_owner(void) -+{ -+ struct passwd *pwd; -+ -+ if ((pwd = getpwnam(var_mail_owner)) == 0) -+ msg_fatal("file %s/%s: parameter %s: unknown user name value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner); -+ if ((var_owner_uid = pwd->pw_uid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged user ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner); -+ if ((var_owner_gid = pwd->pw_gid) == 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has privileged group ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner); -+ -+ /* -+ * This detects only some forms of sharing. Enumerating the entire -+ * password file name space could be expensive. The purpose of this code -+ * is to discourage user ID sharing by developers and package -+ * maintainers. -+ */ -+ if ((pwd = getpwuid(var_owner_uid)) != 0 -+ && strcmp(pwd->pw_name, var_mail_owner) != 0) -+ msg_fatal("file %s/%s: parameter %s: user %s has same user ID as %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, var_mail_owner, pwd->pw_name); -+} -+ -+/* check_sgid_group - lookup setgid group attributes and validate */ -+ -+static void check_sgid_group(void) -+{ -+ struct group *grp; -+ -+ if ((grp = getgrnam(var_sgid_group)) == 0) -+ msg_fatal("file %s/%s: parameter %s: unknown group name: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SGID_GROUP, var_sgid_group); -+ if ((var_sgid_gid = grp->gr_gid) == 0) -+ msg_fatal("file %s/%s: parameter %s: group %s has privileged group ID", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SGID_GROUP, var_sgid_group); -+ -+ /* -+ * This detects only some forms of sharing. Enumerating the entire group -+ * file name space could be expensive. The purpose of this code is to -+ * discourage group ID sharing by developers and package maintainers. -+ */ -+ if ((grp = getgrgid(var_sgid_gid)) != 0 -+ && strcmp(grp->gr_name, var_sgid_group) != 0) -+ msg_fatal("file %s/%s: parameter %s: group %s has same group ID as %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SGID_GROUP, var_sgid_group, grp->gr_name); -+} -+ -+/* check_overlap - disallow UID or GID sharing */ -+ -+static void check_overlap(void) -+{ -+ if (strcmp(var_default_privs, var_mail_owner) == 0) -+ msg_fatal("file %s/%s: parameters %s and %s specify the same user %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, -+ var_default_privs); -+ if (var_default_uid == var_owner_uid) -+ msg_fatal("file %s/%s: parameters %s and %s: users %s and %s have the same user ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, -+ var_default_privs, var_mail_owner, -+ (long) var_owner_uid); -+ if (var_default_gid == var_owner_gid) -+ msg_fatal("file %s/%s: parameters %s and %s: users %s and %s have the same group ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_MAIL_OWNER, -+ var_default_privs, var_mail_owner, -+ (long) var_owner_gid); -+ if (var_default_gid == var_sgid_gid) -+ msg_fatal("file %s/%s: parameters %s and %s: user %s and group %s have the same group ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_DEFAULT_PRIVS, VAR_SGID_GROUP, -+ var_default_privs, var_sgid_group, -+ (long) var_sgid_gid); -+ if (var_owner_gid == var_sgid_gid) -+ msg_fatal("file %s/%s: parameters %s and %s: user %s and group %s have the same group ID: %ld", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MAIL_OWNER, VAR_SGID_GROUP, -+ var_mail_owner, var_sgid_group, -+ (long) var_sgid_gid); -+} -+ -+#ifdef MYORIGIN_FROM_FILE -+ -+/* read_param_from_file - read parameter value from file */ -+ -+static char *read_param_from_file(const char *path) -+{ -+ VSTRING *why = vstring_alloc(100); -+ VSTRING *buf = vstring_alloc(100); -+ VSTREAM *fp; -+ char *bp; -+ char *result; -+ -+ /* -+ * Ugly macros to make complex expressions less unreadable. -+ */ -+#define SKIP(start, var, cond) \ -+ for (var = start; *var && (cond); var++); -+ -+#define TRIM(s) { \ -+ char *p; \ -+ for (p = (s) + strlen(s); p > (s) && ISSPACE(p[-1]); p--); \ -+ *p = 0; \ -+ } -+ -+ fp = safe_open(path, O_RDONLY, 0, (struct stat *) 0, -1, -1, why); -+ if (fp == 0) -+ msg_fatal("%s: %s", path, vstring_str(why)); -+ vstring_get_nonl(buf, fp); -+ if (vstream_ferror(fp)) /* FIX 20070501 */ -+ msg_fatal("%s: read error: %m", path); -+ vstream_fclose(fp); -+ SKIP(vstring_str(buf), bp, ISSPACE(*bp)); -+ TRIM(bp); -+ result = mystrdup(bp); -+ -+ vstring_free(why); -+ vstring_free(buf); -+ return (result); -+} -+ -+#endif -+ -+/* mail_params_init - configure built-in parameters */ -+ -+void mail_params_init() -+{ -+ static const CONFIG_STR_TABLE first_str_defaults[] = { -+ VAR_SYSLOG_FACILITY, DEF_SYSLOG_FACILITY, &var_syslog_facility, 1, 0, -+ VAR_INET_PROTOCOLS, DEF_INET_PROTOCOLS, &var_inet_protocols, 1, 0, -+ VAR_MULTI_CONF_DIRS, DEF_MULTI_CONF_DIRS, &var_multi_conf_dirs, 0, 0, -+ VAR_MULTI_WRAPPER, DEF_MULTI_WRAPPER, &var_multi_wrapper, 0, 0, -+ VAR_MULTI_GROUP, DEF_MULTI_GROUP, &var_multi_group, 0, 0, -+ VAR_MULTI_NAME, DEF_MULTI_NAME, &var_multi_name, 0, 0, -+ 0, -+ }; -+ static const CONFIG_STR_FN_TABLE function_str_defaults[] = { -+ VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0, -+ VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0, -+ 0, -+ }; -+ static const CONFIG_STR_TABLE other_str_defaults[] = { -+ VAR_MAIL_NAME, DEF_MAIL_NAME, &var_mail_name, 1, 0, -+ VAR_SYSLOG_NAME, DEF_SYSLOG_NAME, &var_syslog_name, 1, 0, -+ VAR_MAIL_OWNER, DEF_MAIL_OWNER, &var_mail_owner, 1, 0, -+ VAR_SGID_GROUP, DEF_SGID_GROUP, &var_sgid_group, 1, 0, -+ VAR_MYDEST, DEF_MYDEST, &var_mydest, 0, 0, -+ VAR_MYORIGIN, DEF_MYORIGIN, &var_myorigin, 1, 0, -+ VAR_RELAYHOST, DEF_RELAYHOST, &var_relayhost, 0, 0, -+ VAR_DAEMON_DIR, DEF_DAEMON_DIR, &var_daemon_dir, 1, 0, -+ VAR_DATA_DIR, DEF_DATA_DIR, &var_data_dir, 1, 0, -+ VAR_COMMAND_DIR, DEF_COMMAND_DIR, &var_command_dir, 1, 0, -+ VAR_QUEUE_DIR, DEF_QUEUE_DIR, &var_queue_dir, 1, 0, -+ VAR_PID_DIR, DEF_PID_DIR, &var_pid_dir, 1, 0, -+ VAR_INET_INTERFACES, DEF_INET_INTERFACES, &var_inet_interfaces, 1, 0, -+ VAR_PROXY_INTERFACES, DEF_PROXY_INTERFACES, &var_proxy_interfaces, 0, 0, -+ VAR_DOUBLE_BOUNCE, DEF_DOUBLE_BOUNCE, &var_double_bounce_sender, 1, 0, -+ VAR_DEFAULT_PRIVS, DEF_DEFAULT_PRIVS, &var_default_privs, 1, 0, -+ VAR_ALIAS_DB_MAP, DEF_ALIAS_DB_MAP, &var_alias_db_map, 0, 0, -+ VAR_MAIL_RELEASE, DEF_MAIL_RELEASE, &var_mail_release, 1, 0, -+ VAR_MAIL_VERSION, DEF_MAIL_VERSION, &var_mail_version, 1, 0, -+ VAR_DB_TYPE, DEF_DB_TYPE, &var_db_type, 1, 0, -+ VAR_HASH_QUEUE_NAMES, DEF_HASH_QUEUE_NAMES, &var_hash_queue_names, 1, 0, -+ VAR_RCPT_DELIM, DEF_RCPT_DELIM, &var_rcpt_delim, 0, 1, -+ VAR_RELAY_DOMAINS, DEF_RELAY_DOMAINS, &var_relay_domains, 0, 0, -+ VAR_FFLUSH_DOMAINS, DEF_FFLUSH_DOMAINS, &var_fflush_domains, 0, 0, -+ VAR_EXPORT_ENVIRON, DEF_EXPORT_ENVIRON, &var_export_environ, 0, 0, -+ VAR_IMPORT_ENVIRON, DEF_IMPORT_ENVIRON, &var_import_environ, 0, 0, -+ VAR_MYNETWORKS_STYLE, DEF_MYNETWORKS_STYLE, &var_mynetworks_style, 1, 0, -+ VAR_DEBUG_PEER_LIST, DEF_DEBUG_PEER_LIST, &var_debug_peer_list, 0, 0, -+ VAR_VERP_DELIMS, DEF_VERP_DELIMS, &var_verp_delims, 2, 2, -+ VAR_VERP_FILTER, DEF_VERP_FILTER, &var_verp_filter, 1, 0, -+ VAR_PAR_DOM_MATCH, DEF_PAR_DOM_MATCH, &var_par_dom_match, 0, 0, -+ VAR_CONFIG_DIRS, DEF_CONFIG_DIRS, &var_config_dirs, 0, 0, -+ VAR_BOUNCE_SERVICE, DEF_BOUNCE_SERVICE, &var_bounce_service, 1, 0, -+ VAR_CLEANUP_SERVICE, DEF_CLEANUP_SERVICE, &var_cleanup_service, 1, 0, -+ VAR_DEFER_SERVICE, DEF_DEFER_SERVICE, &var_defer_service, 1, 0, -+ VAR_PICKUP_SERVICE, DEF_PICKUP_SERVICE, &var_pickup_service, 1, 0, -+ VAR_QUEUE_SERVICE, DEF_QUEUE_SERVICE, &var_queue_service, 1, 0, -+ VAR_REWRITE_SERVICE, DEF_REWRITE_SERVICE, &var_rewrite_service, 1, 0, -+ VAR_SHOWQ_SERVICE, DEF_SHOWQ_SERVICE, &var_showq_service, 1, 0, -+ VAR_ERROR_SERVICE, DEF_ERROR_SERVICE, &var_error_service, 1, 0, -+ VAR_FLUSH_SERVICE, DEF_FLUSH_SERVICE, &var_flush_service, 1, 0, -+ VAR_VERIFY_SERVICE, DEF_VERIFY_SERVICE, &var_verify_service, 1, 0, -+ VAR_TRACE_SERVICE, DEF_TRACE_SERVICE, &var_trace_service, 1, 0, -+ VAR_PROXYMAP_SERVICE, DEF_PROXYMAP_SERVICE, &var_proxymap_service, 1, 0, -+ VAR_PROXYWRITE_SERVICE, DEF_PROXYWRITE_SERVICE, &var_proxywrite_service, 1, 0, -+ VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0, -+ 0, -+ }; -+ static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = { -+ VAR_MYNETWORKS, mynetworks, &var_mynetworks, 0, 0, -+ 0, -+ }; -+ static const CONFIG_INT_TABLE other_int_defaults[] = { -+ VAR_MAX_USE, DEF_MAX_USE, &var_use_limit, 1, 0, -+ VAR_DONT_REMOVE, DEF_DONT_REMOVE, &var_dont_remove, 0, 0, -+ VAR_LINE_LIMIT, DEF_LINE_LIMIT, &var_line_limit, 512, 0, -+ VAR_MESSAGE_LIMIT, DEF_MESSAGE_LIMIT, &var_message_limit, 0, 0, -+ VAR_HASH_QUEUE_DEPTH, DEF_HASH_QUEUE_DEPTH, &var_hash_queue_depth, 1, 0, -+ VAR_FORK_TRIES, DEF_FORK_TRIES, &var_fork_tries, 1, 0, -+ VAR_FLOCK_TRIES, DEF_FLOCK_TRIES, &var_flock_tries, 1, 0, -+ VAR_DEBUG_PEER_LEVEL, DEF_DEBUG_PEER_LEVEL, &var_debug_peer_level, 1, 0, -+ VAR_FAULT_INJ_CODE, DEF_FAULT_INJ_CODE, &var_fault_inj_code, 0, 0, -+ VAR_DB_CREATE_BUF, DEF_DB_CREATE_BUF, &var_db_create_buf, 1, 0, -+ VAR_DB_READ_BUF, DEF_DB_READ_BUF, &var_db_read_buf, 1, 0, -+ VAR_HEADER_LIMIT, DEF_HEADER_LIMIT, &var_header_limit, 1, 0, -+ VAR_TOKEN_LIMIT, DEF_TOKEN_LIMIT, &var_token_limit, 1, 0, -+ VAR_MIME_MAXDEPTH, DEF_MIME_MAXDEPTH, &var_mime_maxdepth, 1, 0, -+ VAR_MIME_BOUND_LEN, DEF_MIME_BOUND_LEN, &var_mime_bound_len, 1, 0, -+ VAR_DELAY_MAX_RES, DEF_DELAY_MAX_RES, &var_delay_max_res, MIN_DELAY_MAX_RES, MAX_DELAY_MAX_RES, -+ VAR_INET_WINDOW, DEF_INET_WINDOW, &var_inet_windowsize, 0, 0, -+ 0, -+ }; -+ static const CONFIG_TIME_TABLE time_defaults[] = { -+ VAR_EVENT_DRAIN, DEF_EVENT_DRAIN, &var_event_drain, 1, 0, -+ VAR_MAX_IDLE, DEF_MAX_IDLE, &var_idle_limit, 1, 0, -+ VAR_IPC_TIMEOUT, DEF_IPC_TIMEOUT, &var_ipc_timeout, 1, 0, -+ VAR_IPC_IDLE, DEF_IPC_IDLE, &var_ipc_idle_limit, 1, 0, -+ VAR_IPC_TTL, DEF_IPC_TTL, &var_ipc_ttl_limit, 1, 0, -+ VAR_TRIGGER_TIMEOUT, DEF_TRIGGER_TIMEOUT, &var_trigger_timeout, 1, 0, -+ VAR_FORK_DELAY, DEF_FORK_DELAY, &var_fork_delay, 1, 0, -+ VAR_FLOCK_DELAY, DEF_FLOCK_DELAY, &var_flock_delay, 1, 0, -+ VAR_FLOCK_STALE, DEF_FLOCK_STALE, &var_flock_stale, 1, 0, -+ VAR_DAEMON_TIMEOUT, DEF_DAEMON_TIMEOUT, &var_daemon_timeout, 1, 0, -+ VAR_IN_FLOW_DELAY, DEF_IN_FLOW_DELAY, &var_in_flow_delay, 0, 10, -+ 0, -+ }; -+ static const CONFIG_BOOL_TABLE bool_defaults[] = { -+ VAR_DISABLE_DNS, DEF_DISABLE_DNS, &var_disable_dns, -+ VAR_SOFT_BOUNCE, DEF_SOFT_BOUNCE, &var_soft_bounce, -+ VAR_OWNREQ_SPECIAL, DEF_OWNREQ_SPECIAL, &var_ownreq_special, -+ VAR_STRICT_8BITMIME, DEF_STRICT_8BITMIME, &var_strict_8bitmime, -+ VAR_STRICT_7BIT_HDRS, DEF_STRICT_7BIT_HDRS, &var_strict_7bit_hdrs, -+ VAR_STRICT_8BIT_BODY, DEF_STRICT_8BIT_BODY, &var_strict_8bit_body, -+ VAR_STRICT_ENCODING, DEF_STRICT_ENCODING, &var_strict_encoding, -+ VAR_DISABLE_MIME_INPUT, DEF_DISABLE_MIME_INPUT, &var_disable_mime_input, -+ VAR_DISABLE_MIME_OCONV, DEF_DISABLE_MIME_OCONV, &var_disable_mime_oconv, -+ VAR_VERIFY_NEG_CACHE, DEF_VERIFY_NEG_CACHE, &var_verify_neg_cache, -+ VAR_OLDLOG_COMPAT, DEF_OLDLOG_COMPAT, &var_oldlog_compat, -+ VAR_HELPFUL_WARNINGS, DEF_HELPFUL_WARNINGS, &var_helpful_warnings, -+ VAR_CYRUS_SASL_AUTHZID, DEF_CYRUS_SASL_AUTHZID, &var_cyrus_sasl_authzid, -+ VAR_MULTI_ENABLE, DEF_MULTI_ENABLE, &var_multi_enable, -+ 0, -+ }; -+ const char *cp; -+ INET_PROTO_INFO *proto_info; -+ -+ /* -+ * Extract syslog_facility early, so that from here on all errors are -+ * logged with the proper facility. -+ */ -+ get_mail_conf_str_table(first_str_defaults); -+ -+ if (!msg_syslog_facility(var_syslog_facility)) -+ msg_fatal("file %s/%s: parameter %s: unrecognized value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_SYSLOG_FACILITY, var_syslog_facility); -+ -+ /* -+ * What protocols should we attempt to support? The result is stored in -+ * the global inet_proto_table variable. -+ */ -+ proto_info = inet_proto_init(VAR_INET_PROTOCOLS, var_inet_protocols); -+ -+ /* -+ * Variables whose defaults are determined at runtime. Some sites use -+ * short hostnames in the host table; some sites name their system after -+ * the domain. -+ */ -+ get_mail_conf_str_fn_table(function_str_defaults); -+ if (!valid_hostname(var_myhostname, DO_GRIPE)) -+ msg_fatal("file %s/%s: parameter %s: bad parameter value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MYHOSTNAME, var_myhostname); -+ if (!valid_hostname(var_mydomain, DO_GRIPE)) -+ msg_fatal("file %s/%s: parameter %s: bad parameter value: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_MYDOMAIN, var_mydomain); -+ -+ /* -+ * Variables that are needed by almost every program. -+ * -+ * XXX Reading the myorigin value from file is originally a Debian Linux -+ * feature. This code is not enabled by default because of problems: 1) -+ * it re-implements its own parameter syntax checks, and 2) it does not -+ * implement $name expansions. -+ */ -+ get_mail_conf_str_table(other_str_defaults); -+#ifdef MYORIGIN_FROM_FILE -+ if (*var_myorigin == '/') { -+ char *origin = read_param_from_file(var_myorigin); -+ -+ if (*origin == 0) -+ msg_fatal("%s file %s is empty", VAR_MYORIGIN, var_myorigin); -+ myfree(var_myorigin); /* FIX 20070501 */ -+ var_myorigin = origin; -+ } -+#endif -+ get_mail_conf_int_table(other_int_defaults); -+ get_mail_conf_bool_table(bool_defaults); -+ get_mail_conf_time_table(time_defaults); -+ check_default_privs(); -+ check_mail_owner(); -+ check_sgid_group(); -+ check_overlap(); -+#ifdef HAS_DB -+ dict_db_cache_size = var_db_read_buf; -+#endif -+ inet_windowsize = var_inet_windowsize; -+ -+ /* -+ * Variables whose defaults are determined at runtime, after other -+ * variables have been set. This dependency is admittedly a bit tricky. -+ * XXX Perhaps we should just register variables, and let the evaluator -+ * figure out in what order to evaluate things. -+ */ -+ get_mail_conf_str_fn_table(function_str_defaults_2); -+ -+ /* -+ * FIX 200412 The IPv6 patch did not call own_inet_addr_list() before -+ * entering the chroot jail on Linux IPv6 systems. Linux has the IPv6 -+ * interface list in /proc, which is not available after chrooting. -+ */ -+ (void) own_inet_addr_list(); -+ -+ /* -+ * The PID variable cannot be set from the configuration file!! -+ */ -+ set_mail_conf_int(VAR_PID, var_pid = getpid()); -+ -+ /* -+ * Neither can the start time variable. It isn't even visible. -+ */ -+ time(&var_starttime); -+ -+ /* -+ * Export the syslog name so children can inherit and use it before they -+ * have initialized. -+ */ -+ if ((cp = safe_getenv(CONF_ENV_LOGTAG)) == 0 -+ || strcmp(cp, var_syslog_name) != 0) -+ if (setenv(CONF_ENV_LOGTAG, var_syslog_name, 1) < 0) -+ msg_fatal("setenv %s %s: %m", CONF_ENV_LOGTAG, var_syslog_name); -+ -+ /* -+ * I have seen this happen just too often. -+ */ -+ if (strcasecmp(var_myhostname, var_relayhost) == 0) -+ msg_fatal("%s and %s parameter settings must not be identical: %s", -+ VAR_MYHOSTNAME, VAR_RELAYHOST, var_myhostname); -+ -+ /* -+ * XXX These should be caught by a proper parameter parsing algorithm. -+ */ -+ if (var_myorigin[strcspn(var_myorigin, ", \t\r\n")]) -+ msg_fatal("%s parameter setting must not contain multiple values: %s", -+ VAR_MYORIGIN, var_myorigin); -+ -+ if (var_relayhost[strcspn(var_relayhost, ", \t\r\n")]) -+ msg_fatal("%s parameter setting must not contain multiple values: %s", -+ VAR_RELAYHOST, var_relayhost); -+ -+ /* -+ * One more sanity check. -+ */ -+ if ((cp = verp_delims_verify(var_verp_delims)) != 0) -+ msg_fatal("file %s/%s: parameters %s and %s: %s", -+ var_config_dir, MAIN_CONF_FILE, -+ VAR_VERP_DELIMS, VAR_VERP_FILTER, cp); -+} -diff -ruN a/src/global/mkmap_open.c b/src/global/mkmap_open.c ---- a/src/global/mkmap_open.c 2009-06-01 12:27:44.000000000 +0000 -+++ b/src/global/mkmap_open.c 2009-06-01 13:08:26.000000000 +0000 -@@ -81,7 +81,7 @@ - * We use a different table (in dict_open.c) when querying maps. - */ - typedef struct { -- char *type; -+ const char *type; - MKMAP *(*before_open) (const char *); - } MKMAP_OPEN_INFO; - -@@ -156,7 +156,16 @@ - */ - for (mp = mkmap_types; /* void */ ; mp++) { - if (mp->type == 0) -+#ifndef NO_DYNAMIC_MAPS -+ { -+ static MKMAP_OPEN_INFO oi; -+ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); -+ oi.type=type; -+ mp=&oi; -+ } -+#else - msg_fatal("unsupported map type: %s", type); -+#endif - if (strcmp(type, mp->type) == 0) - break; - } -diff -ruN a/src/master/Makefile.in b/src/master/Makefile.in ---- a/src/master/Makefile.in 2009-06-01 12:27:44.000000000 +0000 -+++ b/src/master/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -20,7 +20,7 @@ - INC_DIR = ../../include - BIN_DIR = ../../libexec - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c - - all: $(PROG) $(LIB) - -@@ -39,12 +39,10 @@ - root_tests: - - $(LIB): $(LIB_OBJ) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR)/$(LIB) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - $(BIN_DIR)/$(PROG): $(PROG) - cp $(PROG) $(BIN_DIR) -diff -ruN a/src/milter/Makefile.in b/src/milter/Makefile.in ---- a/src/milter/Makefile.in 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/milter/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -14,7 +14,7 @@ - INC_DIR = ../../include - MAKES = - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -30,12 +30,10 @@ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -ruN a/src/postconf/postconf.c b/src/postconf/postconf.c ---- a/src/postconf/postconf.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/postconf/postconf.c 2009-06-01 13:08:26.000000000 +0000 -@@ -962,6 +962,16 @@ - { - ARGV *maps_argv; - int i; -+#ifndef NO_DYNAMIC_MAPS -+ char *path; -+ char *config_dir; -+ -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); -+ dict_open_dlinfo(path); -+ myfree(path); -+#endif - - maps_argv = dict_mapnames(); - for (i = 0; i < maps_argv->argc; i++) -diff -ruN a/src/postconf/postconf.c.orig b/src/postconf/postconf.c.orig ---- a/src/postconf/postconf.c.orig 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/postconf/postconf.c.orig 2009-06-01 13:07:57.000000000 +0000 -@@ -0,0 +1,1218 @@ -+/*++ -+/* NAME -+/* postconf 1 -+/* SUMMARY -+/* Postfix configuration utility -+/* SYNOPSIS -+/* .fi -+/* \fBpostconf\fR [\fB-dhnv\fR] [\fB-c \fIconfig_dir\fR] -+/* [\fIparameter ...\fR] -+/* -+/* \fBpostconf\fR [\fB-aAmlv\fR] [\fB-c \fIconfig_dir\fR] -+/* -+/* \fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR] -+/* [\fIparameter=value ...\fR] -+/* -+/* \fBpostconf\fR [\fB-#v\fR] [\fB-c \fIconfig_dir\fR] -+/* [\fIparameter ...\fR] -+/* -+/* \fBpostconf\fR [\fB-btv\fR] [\fB-c \fIconfig_dir\fR] [\fItemplate_file\fR] -+/* DESCRIPTION -+/* The \fBpostconf\fR(1) command displays the actual values -+/* of configuration parameters, changes configuration parameter -+/* values, or displays other configuration information about -+/* the Postfix mail system. -+/* -+/* Options: -+/* .IP \fB-a\fR -+/* List the available SASL server plug-in types. The SASL -+/* plug-in type is selected with the \fBsmtpd_sasl_type\fR -+/* configuration parameter by specifying one of the names -+/* listed below. -+/* .RS -+/* .IP \fBcyrus\fR -+/* This server plug-in is available when Postfix is built with -+/* Cyrus SASL support. -+/* .IP \fBdovecot\fR -+/* This server plug-in uses the Dovecot authentication server, -+/* and is available when Postfix is built with any form of SASL -+/* support. -+/* .RE -+/* .IP -+/* This feature is available with Postfix 2.3 and later. -+/* .IP \fB-A\fR -+/* List the available SASL client plug-in types. The SASL -+/* plug-in type is selected with the \fBsmtp_sasl_type\fR or -+/* \fBlmtp_sasl_type\fR configuration parameters by specifying -+/* one of the names listed below. -+/* .RS -+/* .IP \fBcyrus\fR -+/* This client plug-in is available when Postfix is built with -+/* Cyrus SASL support. -+/* .RE -+/* .IP -+/* This feature is available with Postfix 2.3 and later. -+/* .IP "\fB-b\fR [\fItemplate_file\fR]" -+/* Display the message text that appears at the beginning of -+/* delivery status notification (DSN) messages, with $\fBname\fR -+/* expressions replaced by actual values. To override the -+/* built-in message text, specify a template file at the end -+/* of the command line, or specify a template file in main.cf -+/* with the \fBbounce_template_file\fR parameter. -+/* To force selection of the built-in message text templates, -+/* specify an empty template file name (in shell language: ""). -+/* -+/* This feature is available with Postfix 2.3 and later. -+/* .IP "\fB-c \fIconfig_dir\fR" -+/* The \fBmain.cf\fR configuration file is in the named directory -+/* instead of the default configuration directory. -+/* .IP \fB-d\fR -+/* Print default parameter settings instead of actual settings. -+/* .IP \fB-e\fR -+/* Edit the \fBmain.cf\fR configuration file. The file is copied -+/* to a temporary file then renamed into place. Parameters and -+/* values are specified on the command line. Use quotes in order -+/* to protect shell metacharacters and whitespace. -+/* .IP \fB-h\fR -+/* Show parameter values only, not the ``name = '' label -+/* that normally precedes the value. -+/* .IP \fB-l\fR -+/* List the names of all supported mailbox locking methods. -+/* Postfix supports the following methods: -+/* .RS -+/* .IP \fBflock\fR -+/* A kernel-based advisory locking method for local files only. -+/* This locking method is available on systems with a BSD -+/* compatible library. -+/* .IP \fBfcntl\fR -+/* A kernel-based advisory locking method for local and remote files. -+/* .IP \fBdotlock\fR -+/* An application-level locking method. An application locks a file -+/* named \fIfilename\fR by creating a file named \fIfilename\fB.lock\fR. -+/* The application is expected to remove its own lock file, as well as -+/* stale lock files that were left behind after abnormal termination. -+/* .RE -+/* .IP \fB-m\fR -+/* List the names of all supported lookup table types. In Postfix -+/* configuration files, -+/* lookup tables are specified as \fItype\fB:\fIname\fR, where -+/* \fItype\fR is one of the types listed below. The table \fIname\fR -+/* syntax depends on the lookup table type as described in the -+/* DATABASE_README document. -+/* .RS -+/* .IP \fBbtree\fR -+/* A sorted, balanced tree structure. -+/* This is available on systems with support for Berkeley DB -+/* databases. -+/* .IP \fBcdb\fR -+/* A read-optimized structure with no support for incremental updates. -+/* This is available on systems with support for CDB databases. -+/* .IP \fBcidr\fR -+/* A table that associates values with Classless Inter-Domain Routing -+/* (CIDR) patterns. This is described in \fBcidr_table\fR(5). -+/* .IP \fBdbm\fR -+/* An indexed file type based on hashing. -+/* This is available on systems with support for DBM databases. -+/* .IP \fBenviron\fR -+/* The UNIX process environment array. The lookup key is the variable -+/* name. Originally implemented for testing, someone may find this -+/* useful someday. -+/* .IP \fBhash\fR -+/* An indexed file type based on hashing. -+/* This is available on systems with support for Berkeley DB -+/* databases. -+/* .IP "\fBldap\fR (read-only)" -+/* Perform lookups using the LDAP protocol. This is described -+/* in \fBldap_table\fR(5). -+/* .IP "\fBmysql\fR (read-only)" -+/* Perform lookups using the MYSQL protocol. This is described -+/* in \fBmysql_table\fR(5). -+/* .IP "\fBpcre\fR (read-only)" -+/* A lookup table based on Perl Compatible Regular Expressions. The -+/* file format is described in \fBpcre_table\fR(5). -+/* .IP "\fBpgsql\fR (read-only)" -+/* Perform lookups using the PostgreSQL protocol. This is described -+/* in \fBpgsql_table\fR(5). -+/* .IP "\fBproxy\fR (read-only)" -+/* A lookup table that is implemented via the Postfix -+/* \fBproxymap\fR(8) service. The table name syntax is -+/* \fItype\fB:\fIname\fR. -+/* .IP "\fBregexp\fR (read-only)" -+/* A lookup table based on regular expressions. The file format is -+/* described in \fBregexp_table\fR(5). -+/* .IP \fBsdbm\fR -+/* An indexed file type based on hashing. -+/* This is available on systems with support for SDBM databases. -+/* .IP "\fBstatic\fR (read-only)" -+/* A table that always returns its name as lookup result. For example, -+/* \fBstatic:foobar\fR always returns the string \fBfoobar\fR as lookup -+/* result. -+/* .IP "\fBtcp\fR (read-only)" -+/* Perform lookups using a simple request-reply protocol that is -+/* described in \fBtcp_table\fR(5). -+/* This feature is not included with the stable Postfix release. -+/* .IP "\fBunix\fR (read-only)" -+/* A limited way to query the UNIX authentication database. The -+/* following tables are implemented: -+/* .RS -+/*. IP \fBunix:passwd.byname\fR -+/* The table is the UNIX password database. The key is a login name. -+/* The result is a password file entry in \fBpasswd\fR(5) format. -+/* .IP \fBunix:group.byname\fR -+/* The table is the UNIX group database. The key is a group name. -+/* The result is a group file entry in \fBgroup\fR(5) format. -+/* .RE -+/* .RE -+/* .IP -+/* Other table types may exist depending on how Postfix was built. -+/* .IP \fB-n\fR -+/* Print parameter settings that are not left at their built-in -+/* default value, because they are explicitly specified in main.cf. -+/* .IP "\fB-t\fR [\fItemplate_file\fR]" -+/* Display the templates for delivery status notification (DSN) -+/* messages. To override the built-in templates, specify a -+/* template file at the end of the command line, or specify a -+/* template file in main.cf with the \fBbounce_template_file\fR -+/* parameter. To force selection of the built-in templates, -+/* specify an empty template file name (in shell language: -+/* ""). -+/* -+/* This feature is available with Postfix 2.3 and later. -+/* .IP \fB-v\fR -+/* Enable verbose logging for debugging purposes. Multiple \fB-v\fR -+/* options make the software increasingly verbose. -+/* .IP \fB-#\fR -+/* Edit the \fBmain.cf\fR configuration file. The file is copied -+/* to a temporary file then renamed into place. The parameters -+/* specified on the command line are commented-out, so that they -+/* revert to their default values. Specify a list of parameter -+/* names, not name=value pairs. There is no \fBpostconf\fR command -+/* to perform the reverse operation. -+/* -+/* This feature is available with Postfix 2.6 and later. -+/* DIAGNOSTICS -+/* Problems are reported to the standard error stream. -+/* ENVIRONMENT -+/* .ad -+/* .fi -+/* .IP \fBMAIL_CONFIG\fR -+/* Directory with Postfix configuration files. -+/* CONFIGURATION PARAMETERS -+/* .ad -+/* .fi -+/* The following \fBmain.cf\fR parameters are especially relevant to -+/* this program. -+/* -+/* The text below provides only a parameter summary. See -+/* \fBpostconf\fR(5) for more details including examples. -+/* .IP "\fBconfig_directory (see 'postconf -d' output)\fR" -+/* The default location of the Postfix main.cf and master.cf -+/* configuration files. -+/* .IP "\fBbounce_template_file (empty)\fR" -+/* Pathname of a configuration file with bounce message templates. -+/* FILES -+/* /etc/postfix/main.cf, Postfix configuration parameters -+/* SEE ALSO -+/* bounce(5), bounce template file format -+/* postconf(5), configuration parameters -+/* README FILES -+/* .ad -+/* .fi -+/* Use "\fBpostconf readme_directory\fR" or -+/* "\fBpostconf html_directory\fR" to locate this information. -+/* .na -+/* .nf -+/* DATABASE_README, Postfix lookup table overview -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System library. */ -+ -+#include <sys_defs.h> -+#include <sys/stat.h> -+#include <stdio.h> /* rename() */ -+#include <pwd.h> -+#include <string.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <ctype.h> -+ -+#ifdef USE_PATHS_H -+#include <paths.h> -+#endif -+ -+/* Utility library. */ -+ -+#include <msg.h> -+#include <vstream.h> -+#include <msg_vstream.h> -+#include <get_hostname.h> -+#include <stringops.h> -+#include <htable.h> -+#include <dict.h> -+#include <safe.h> -+#include <mymalloc.h> -+#include <argv.h> -+#include <split_at.h> -+#include <vstring_vstream.h> -+#include <myflock.h> -+#include <inet_proto.h> -+#include <argv.h> -+#include <edit_file.h> -+ -+/* Global library. */ -+ -+#include <mynetworks.h> -+#include <mail_conf.h> -+#include <mail_dict.h> -+#include <mail_proto.h> -+#include <mail_version.h> -+#include <mail_params.h> -+#include <mail_addr.h> -+#include <mbox_conf.h> -+#include <mail_run.h> -+ -+/* XSASL library. */ -+ -+#include <xsasl.h> -+ -+ /* -+ * What we're supposed to be doing. -+ */ -+#define SHOW_NONDEF (1<<0) /* show non-default settings */ -+#define SHOW_DEFS (1<<1) /* show default setting */ -+#define SHOW_NAME (1<<2) /* show parameter name */ -+#define SHOW_MAPS (1<<3) /* show map types */ -+#define EDIT_MAIN (1<<4) /* edit main.cf */ -+#define SHOW_LOCKS (1<<5) /* show mailbox lock methods */ -+#define SHOW_EVAL (1<<6) /* expand right-hand sides */ -+#define SHOW_SASL_SERV (1<<7) /* show server auth plugin types */ -+#define SHOW_SASL_CLNT (1<<8) /* show client auth plugin types */ -+#define COMMENT_OUT (1<<9) /* #-out selected main.cf entries */ -+ -+ /* -+ * Lookup table for in-core parameter info. -+ */ -+HTABLE *param_table; -+ -+ /* -+ * Lookup table for external parameter info. -+ */ -+DICT *text_table; -+ -+ /* -+ * Declarations generated by scanning actual C source files. -+ */ -+#include "time_vars.h" -+#include "bool_vars.h" -+#include "int_vars.h" -+#include "str_vars.h" -+#include "raw_vars.h" -+#include "nint_vars.h" -+ -+ /* -+ * Manually extracted. -+ */ -+#include "auto_vars.h" -+#include "install_vars.h" -+ -+ /* -+ * Lookup tables generated by scanning actual C source files. -+ */ -+static const CONFIG_TIME_TABLE time_table[] = { -+#include "time_table.h" -+ 0, -+}; -+ -+static const CONFIG_BOOL_TABLE bool_table[] = { -+#include "bool_table.h" -+ 0, -+}; -+ -+static const CONFIG_INT_TABLE int_table[] = { -+#include "int_table.h" -+ 0, -+}; -+ -+static const CONFIG_STR_TABLE str_table[] = { -+#include "str_table.h" -+#include "auto_table.h" /* XXX */ -+#include "install_table.h" -+ 0, -+}; -+ -+static const CONFIG_RAW_TABLE raw_table[] = { -+#include "raw_table.h" -+ 0, -+}; -+ -+static const CONFIG_NINT_TABLE nint_table[] = { -+#include "nint_table.h" -+ 0, -+}; -+ -+ /* -+ * Parameters with default values obtained via function calls. -+ */ -+char *var_myhostname; -+char *var_mydomain; -+char *var_mynetworks; -+ -+static const char *check_myhostname(void); -+static const char *check_mydomainname(void); -+static const char *check_mynetworks(void); -+ -+static const CONFIG_STR_FN_TABLE str_fn_table[] = { -+ VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0, -+ VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0, -+ 0, -+}; -+static const CONFIG_STR_FN_TABLE str_fn_table_2[] = { -+ VAR_MYNETWORKS, check_mynetworks, &var_mynetworks, 1, 0, -+ 0, -+}; -+ -+ /* -+ * XXX Global so that call-backs can see it. -+ */ -+static int cmd_mode = SHOW_NAME; -+ -+/* check_myhostname - lookup hostname and validate */ -+ -+static const char *check_myhostname(void) -+{ -+ static const char *name; -+ const char *dot; -+ const char *domain; -+ -+ /* -+ * Use cached result. -+ */ -+ if (name) -+ return (name); -+ -+ /* -+ * If the local machine name is not in FQDN form, try to append the -+ * contents of $mydomain. -+ */ -+ name = get_hostname(); -+ if ((dot = strchr(name, '.')) == 0) { -+ if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) -+ domain = DEF_MYDOMAIN; -+ name = concatenate(name, ".", domain, (char *) 0); -+ } -+ return (name); -+} -+ -+/* get_myhostname - look up and store my hostname */ -+ -+static void get_myhostname(void) -+{ -+ const char *name; -+ -+ if ((name = mail_conf_lookup_eval(VAR_MYHOSTNAME)) == 0) -+ name = check_myhostname(); -+ var_myhostname = mystrdup(name); -+} -+ -+/* check_mydomainname - lookup domain name and validate */ -+ -+static const char *check_mydomainname(void) -+{ -+ char *dot; -+ -+ /* -+ * Use the hostname when it is not a FQDN ("foo"), or when the hostname -+ * actually is a domain name ("foo.com"). -+ */ -+ if (var_myhostname == 0) -+ get_myhostname(); -+ if ((dot = strchr(var_myhostname, '.')) == 0 || strchr(dot + 1, '.') == 0) -+ return (DEF_MYDOMAIN); -+ return (dot + 1); -+} -+ -+/* check_mynetworks - lookup network address list */ -+ -+static const char *check_mynetworks(void) -+{ -+ INET_PROTO_INFO *proto_info; -+ const char *junk; -+ -+ if (var_inet_interfaces == 0) { -+ if ((cmd_mode & SHOW_DEFS) -+ || (junk = mail_conf_lookup_eval(VAR_INET_INTERFACES)) == 0) -+ junk = DEF_INET_INTERFACES; -+ var_inet_interfaces = mystrdup(junk); -+ } -+ if (var_mynetworks_style == 0) { -+ if ((cmd_mode & SHOW_DEFS) -+ || (junk = mail_conf_lookup_eval(VAR_MYNETWORKS_STYLE)) == 0) -+ junk = DEF_MYNETWORKS_STYLE; -+ var_mynetworks_style = mystrdup(junk); -+ } -+ if (var_inet_protocols == 0) { -+ if ((cmd_mode & SHOW_DEFS) -+ || (junk = mail_conf_lookup_eval(VAR_INET_PROTOCOLS)) == 0) -+ junk = DEF_INET_PROTOCOLS; -+ var_inet_protocols = mystrdup(junk); -+ proto_info = inet_proto_init(VAR_INET_PROTOCOLS, var_inet_protocols); -+ } -+ return (mynetworks()); -+} -+ -+/* edit_parameters - edit parameter file */ -+ -+static void edit_parameters(int cmd_mode, int argc, char **argv) -+{ -+ char *config_dir; -+ char *path; -+ EDIT_FILE *ep; -+ VSTREAM *src; -+ VSTREAM *dst; -+ VSTRING *buf = vstring_alloc(100); -+ VSTRING *key = vstring_alloc(10); -+ char *cp; -+ char *edit_key; -+ char *edit_val; -+ HTABLE *table; -+ struct cvalue { -+ char *value; -+ int found; -+ }; -+ struct cvalue *cvalue; -+ HTABLE_INFO **ht_info; -+ HTABLE_INFO **ht; -+ int interesting; -+ const char *err; -+ -+ /* -+ * Store command-line parameters for quick lookup. -+ */ -+ table = htable_create(argc); -+ while ((cp = *argv++) != 0) { -+ if (strchr(cp, '\n') != 0) -+ msg_fatal("-e or -# accepts no multi-line input"); -+ while (ISSPACE(*cp)) -+ cp++; -+ if (*cp == '#') -+ msg_fatal("-e or -# accepts no comment input"); -+ if (cmd_mode & EDIT_MAIN) { -+ if ((err = split_nameval(cp, &edit_key, &edit_val)) != 0) -+ msg_fatal("%s: \"%s\"", err, cp); -+ } else if (cmd_mode & COMMENT_OUT) { -+ if (*cp == 0) -+ msg_fatal("-# requires non-blank parameter names"); -+ if (strchr(cp, '=') != 0) -+ msg_fatal("-# requires parameter names only"); -+ edit_key = mystrdup(cp); -+ trimblanks(edit_key, 0); -+ edit_val = 0; -+ } else { -+ msg_panic("edit_parameters: unknown mode %d", cmd_mode); -+ } -+ cvalue = (struct cvalue *) mymalloc(sizeof(*cvalue)); -+ cvalue->value = edit_val; -+ cvalue->found = 0; -+ htable_enter(table, edit_key, (char *) cvalue); -+ } -+ -+ /* -+ * XXX Avoid code duplication by better code decomposition. -+ */ -+ if (var_config_dir) -+ myfree(var_config_dir); -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); -+ -+ /* -+ * Open a temp file for the result. This uses a deterministic name so we -+ * don't leave behind thrash with random names. -+ */ -+ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); -+ if ((ep = edit_file_open(path, O_CREAT | O_WRONLY, 0644)) == 0) -+ msg_fatal("open %s%s: %m", path, EDIT_FILE_SUFFIX); -+ dst = ep->tmp_fp; -+ -+ /* -+ * Open the original file for input. -+ */ -+ if ((src = vstream_fopen(path, O_RDONLY, 0)) == 0) { -+ /* OK to delete, since we control the temp file name exclusively. */ -+ (void) unlink(ep->tmp_path); -+ msg_fatal("open %s for reading: %m", path); -+ } -+ -+ /* -+ * Copy original file to temp file, while replacing parameters on the -+ * fly. Issue warnings for names found multiple times. -+ */ -+#define STR(x) vstring_str(x) -+ -+ interesting = 0; -+ while (vstring_get(buf, src) != VSTREAM_EOF) { -+ for (cp = STR(buf); ISSPACE(*cp) /* including newline */ ; cp++) -+ /* void */ ; -+ /* Copy comment, all-whitespace, or empty line. */ -+ if (*cp == '#' || *cp == 0) { -+ vstream_fputs(STR(buf), dst); -+ } -+ /* Copy, skip or replace continued text. */ -+ else if (cp > STR(buf)) { -+ if (interesting == 0) -+ vstream_fputs(STR(buf), dst); -+ else if (cmd_mode & COMMENT_OUT) -+ vstream_fprintf(dst, "#%s", STR(buf)); -+ } -+ /* Copy or replace start of logical line. */ -+ else { -+ vstring_strncpy(key, cp, strcspn(cp, " \t\r\n=")); -+ cvalue = (struct cvalue *) htable_find(table, STR(key)); -+ if ((interesting = !!cvalue) != 0) { -+ if (cvalue->found++ == 1) -+ msg_warn("%s: multiple entries for \"%s\"", path, STR(key)); -+ if (cmd_mode & EDIT_MAIN) -+ vstream_fprintf(dst, "%s = %s\n", STR(key), cvalue->value); -+ else if (cmd_mode & COMMENT_OUT) -+ vstream_fprintf(dst, "#%s", cp); -+ else -+ msg_panic("edit_parameters: unknown mode %d", cmd_mode); -+ } else { -+ vstream_fputs(STR(buf), dst); -+ } -+ } -+ } -+ -+ /* -+ * Generate new entries for parameters that were not found. -+ */ -+ if (cmd_mode & EDIT_MAIN) { -+ for (ht_info = ht = htable_list(table); *ht; ht++) { -+ cvalue = (struct cvalue *) ht[0]->value; -+ if (cvalue->found == 0) -+ vstream_fprintf(dst, "%s = %s\n", ht[0]->key, cvalue->value); -+ } -+ myfree((char *) ht_info); -+ } -+ -+ /* -+ * When all is well, rename the temp file to the original one. -+ */ -+ if (vstream_fclose(src)) -+ msg_fatal("read %s: %m", path); -+ if (edit_file_close(ep) != 0) -+ msg_fatal("close %s%s: %m", path, EDIT_FILE_SUFFIX); -+ -+ /* -+ * Cleanup. -+ */ -+ myfree(path); -+ vstring_free(buf); -+ vstring_free(key); -+ htable_free(table, myfree); -+} -+ -+/* read_parameters - read parameter info from file */ -+ -+static void read_parameters(void) -+{ -+ char *config_dir; -+ char *path; -+ -+ /* -+ * A direct rip-off of mail_conf_read(). XXX Avoid code duplication by -+ * better code decomposition. -+ */ -+ dict_unknown_allowed = 1; -+ if (var_config_dir) -+ myfree(var_config_dir); -+ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? -+ config_dir : DEF_CONFIG_DIR); /* XXX */ -+ set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir); -+ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); -+ dict_load_file(CONFIG_DICT, path); -+ myfree(path); -+} -+ -+/* set_parameters - set parameter values from default or explicit setting */ -+ -+static void set_parameters(void) -+{ -+ -+ /* -+ * Populate the configuration parameter dictionary with default settings -+ * or with actual settings. -+ * -+ * Iterate over each entry in str_fn_table, str_fn_table_2, time_table, -+ * bool_table, int_table, str_table, and raw_table. Look up each -+ * parameter name in the configuration parameter dictionary. If the -+ * parameter is not set, take the default value, or take the value from -+ * main.cf, without doing $name expansions. This includes converting -+ * default values from numeric/boolean internal forms to external string -+ * form. -+ * -+ * Once the configuration parameter dictionary is populated, printing a -+ * parameter setting is a matter of querying the configuration parameter -+ * dictionary, optionally expanding of $name values, and printing the -+ * result. -+ */ -+} -+ -+/* hash_parameters - hash all parameter names so we can find and sort them */ -+ -+static void hash_parameters(void) -+{ -+ const CONFIG_TIME_TABLE *ctt; -+ const CONFIG_BOOL_TABLE *cbt; -+ const CONFIG_INT_TABLE *cit; -+ const CONFIG_STR_TABLE *cst; -+ const CONFIG_STR_FN_TABLE *csft; -+ const CONFIG_RAW_TABLE *rst; -+ const CONFIG_NINT_TABLE *nst; -+ -+ param_table = htable_create(100); -+ -+ for (ctt = time_table; ctt->name; ctt++) -+ htable_enter(param_table, ctt->name, (char *) ctt); -+ for (cbt = bool_table; cbt->name; cbt++) -+ htable_enter(param_table, cbt->name, (char *) cbt); -+ for (cit = int_table; cit->name; cit++) -+ htable_enter(param_table, cit->name, (char *) cit); -+ for (cst = str_table; cst->name; cst++) -+ htable_enter(param_table, cst->name, (char *) cst); -+ for (csft = str_fn_table; csft->name; csft++) -+ htable_enter(param_table, csft->name, (char *) csft); -+ for (csft = str_fn_table_2; csft->name; csft++) -+ htable_enter(param_table, csft->name, (char *) csft); -+ for (rst = raw_table; rst->name; rst++) -+ htable_enter(param_table, rst->name, (char *) rst); -+ for (nst = nint_table; nst->name; nst++) -+ htable_enter(param_table, nst->name, (char *) nst); -+} -+ -+/* show_strval - show string-valued parameter */ -+ -+static void show_strval(int mode, const char *name, const char *value) -+{ -+ if (mode & SHOW_EVAL) -+ value = mail_conf_eval(value); -+ -+ if (mode & SHOW_NAME) { -+ vstream_printf("%s = %s\n", name, value); -+ } else { -+ vstream_printf("%s\n", value); -+ } -+} -+ -+/* show_intval - show integer-valued parameter */ -+ -+static void show_intval(int mode, const char *name, int value) -+{ -+ if (mode & SHOW_NAME) { -+ vstream_printf("%s = %d\n", name, value); -+ } else { -+ vstream_printf("%d\n", value); -+ } -+} -+ -+/* print_bool - print boolean parameter */ -+ -+static void print_bool(int mode, CONFIG_BOOL_TABLE *cbt) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, cbt->name, cbt->defval ? "yes" : "no"); -+ } else { -+ value = dict_lookup(CONFIG_DICT, cbt->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, cbt->name, cbt->defval ? "yes" : "no"); -+ } else { -+ show_strval(mode, cbt->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, cbt->name, value); -+ } -+ } -+} -+ -+/* print_time - print relative time parameter */ -+ -+static void print_time(int mode, CONFIG_TIME_TABLE *ctt) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, ctt->name, ctt->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, ctt->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, ctt->name, ctt->defval); -+ } else { -+ show_strval(mode, ctt->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, ctt->name, value); -+ } -+ } -+} -+ -+/* print_int - print integer parameter */ -+ -+static void print_int(int mode, CONFIG_INT_TABLE *cit) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_intval(mode, cit->name, cit->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, cit->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_intval(mode, cit->name, cit->defval); -+ } else { -+ show_strval(mode, cit->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, cit->name, value); -+ } -+ } -+} -+ -+/* print_str - print string parameter */ -+ -+static void print_str(int mode, CONFIG_STR_TABLE *cst) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, cst->name, cst->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, cst->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, cst->name, cst->defval); -+ } else { -+ show_strval(mode, cst->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, cst->name, value); -+ } -+ } -+} -+ -+/* print_str_fn - print string-function parameter */ -+ -+static void print_str_fn(int mode, CONFIG_STR_FN_TABLE *csft) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ value = dict_lookup(CONFIG_DICT, csft->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ show_strval(mode, csft->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, csft->name, value); -+ } -+ } -+} -+ -+/* print_str_fn_2 - print string-function parameter */ -+ -+static void print_str_fn_2(int mode, CONFIG_STR_FN_TABLE *csft) -+{ -+ const char *value; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ value = dict_lookup(CONFIG_DICT, csft->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, csft->name, csft->defval()); -+ } else { -+ show_strval(mode, csft->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, csft->name, value); -+ } -+ } -+} -+ -+/* print_raw - print raw string parameter */ -+ -+static void print_raw(int mode, CONFIG_RAW_TABLE * rst) -+{ -+ const char *value; -+ -+ if (mode & SHOW_EVAL) -+ msg_warn("parameter %s expands at run-time", rst->name); -+ mode &= ~SHOW_EVAL; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, rst->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ show_strval(mode, rst->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, rst->name, value); -+ } -+ } -+} -+ -+/* print_nint - print new integer parameter */ -+ -+static void print_nint(int mode, CONFIG_NINT_TABLE * rst) -+{ -+ const char *value; -+ -+ if (mode & SHOW_EVAL) -+ msg_warn("parameter %s expands at run-time", rst->name); -+ mode &= ~SHOW_EVAL; -+ -+ if (mode & SHOW_DEFS) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ value = dict_lookup(CONFIG_DICT, rst->name); -+ if ((mode & SHOW_NONDEF) == 0) { -+ if (value == 0) { -+ show_strval(mode, rst->name, rst->defval); -+ } else { -+ show_strval(mode, rst->name, value); -+ } -+ } else { -+ if (value != 0) -+ show_strval(mode, rst->name, value); -+ } -+ } -+} -+ -+/* print_parameter - show specific parameter */ -+ -+static void print_parameter(int mode, char *ptr) -+{ -+ -+#define INSIDE(p,t) (ptr >= (char *) t && ptr < ((char *) t) + sizeof(t)) -+ -+ /* -+ * This is gross, but the best we can do on short notice. -+ */ -+ if (INSIDE(ptr, time_table)) -+ print_time(mode, (CONFIG_TIME_TABLE *) ptr); -+ if (INSIDE(ptr, bool_table)) -+ print_bool(mode, (CONFIG_BOOL_TABLE *) ptr); -+ if (INSIDE(ptr, int_table)) -+ print_int(mode, (CONFIG_INT_TABLE *) ptr); -+ if (INSIDE(ptr, str_table)) -+ print_str(mode, (CONFIG_STR_TABLE *) ptr); -+ if (INSIDE(ptr, str_fn_table)) -+ print_str_fn(mode, (CONFIG_STR_FN_TABLE *) ptr); -+ if (INSIDE(ptr, str_fn_table_2)) -+ print_str_fn_2(mode, (CONFIG_STR_FN_TABLE *) ptr); -+ if (INSIDE(ptr, raw_table)) -+ print_raw(mode, (CONFIG_RAW_TABLE *) ptr); -+ if (INSIDE(ptr, nint_table)) -+ print_nint(mode, (CONFIG_NINT_TABLE *) ptr); -+ if (msg_verbose) -+ vstream_fflush(VSTREAM_OUT); -+} -+ -+/* comp_names - qsort helper */ -+ -+static int comp_names(const void *a, const void *b) -+{ -+ HTABLE_INFO **ap = (HTABLE_INFO **) a; -+ HTABLE_INFO **bp = (HTABLE_INFO **) b; -+ -+ return (strcmp(ap[0]->key, bp[0]->key)); -+} -+ -+/* show_maps - show available maps */ -+ -+static void show_maps(void) -+{ -+ ARGV *maps_argv; -+ int i; -+ -+ maps_argv = dict_mapnames(); -+ for (i = 0; i < maps_argv->argc; i++) -+ vstream_printf("%s\n", maps_argv->argv[i]); -+ argv_free(maps_argv); -+} -+ -+/* show_locks - show available mailbox locking methods */ -+ -+static void show_locks(void) -+{ -+ ARGV *locks_argv; -+ int i; -+ -+ locks_argv = mbox_lock_names(); -+ for (i = 0; i < locks_argv->argc; i++) -+ vstream_printf("%s\n", locks_argv->argv[i]); -+ argv_free(locks_argv); -+} -+ -+/* show_sasl - show SASL plug-in types */ -+ -+static void show_sasl(int what) -+{ -+ ARGV *sasl_argv; -+ int i; -+ -+ sasl_argv = (what & SHOW_SASL_SERV) ? xsasl_server_types() : -+ xsasl_client_types(); -+ for (i = 0; i < sasl_argv->argc; i++) -+ vstream_printf("%s\n", sasl_argv->argv[i]); -+ argv_free(sasl_argv); -+} -+ -+/* show_parameters - show parameter info */ -+ -+static void show_parameters(int mode, char **names) -+{ -+ HTABLE_INFO **list; -+ HTABLE_INFO **ht; -+ char **namep; -+ char *value; -+ -+ /* -+ * Show all parameters. -+ */ -+ if (*names == 0) { -+ list = htable_list(param_table); -+ qsort((char *) list, param_table->used, sizeof(*list), comp_names); -+ for (ht = list; *ht; ht++) -+ print_parameter(mode, ht[0]->value); -+ myfree((char *) list); -+ return; -+ } -+ -+ /* -+ * Show named parameters. -+ */ -+ for (namep = names; *namep; namep++) { -+ if ((value = htable_find(param_table, *namep)) == 0) { -+ msg_warn("%s: unknown parameter", *namep); -+ } else { -+ print_parameter(mode, value); -+ } -+ } -+} -+ -+MAIL_VERSION_STAMP_DECLARE; -+ -+/* main */ -+ -+int main(int argc, char **argv) -+{ -+ int ch; -+ int fd; -+ struct stat st; -+ int junk; -+ ARGV *ext_argv = 0; -+ -+ /* -+ * Fingerprint executables and core dumps. -+ */ -+ MAIL_VERSION_STAMP_ALLOCATE; -+ -+ /* -+ * Be consistent with file permissions. -+ */ -+ umask(022); -+ -+ /* -+ * To minimize confusion, make sure that the standard file descriptors -+ * are open before opening anything else. XXX Work around for 44BSD where -+ * fstat can return EBADF on an open file descriptor. -+ */ -+ for (fd = 0; fd < 3; fd++) -+ if (fstat(fd, &st) == -1 -+ && (close(fd), open("/dev/null", O_RDWR, 0)) != fd) -+ msg_fatal("open /dev/null: %m"); -+ -+ /* -+ * Set up logging. -+ */ -+ msg_vstream_init(argv[0], VSTREAM_ERR); -+ -+ /* -+ * Parse JCL. -+ */ -+ while ((ch = GETOPT(argc, argv, "aAbc:deE#hmlntv")) > 0) { -+ switch (ch) { -+ case 'a': -+ cmd_mode |= SHOW_SASL_SERV; -+ break; -+ case 'A': -+ cmd_mode |= SHOW_SASL_CLNT; -+ break; -+ case 'b': -+ if (ext_argv) -+ msg_fatal("specify one of -b and -t"); -+ ext_argv = argv_alloc(2); -+ argv_add(ext_argv, "bounce", "-SVnexpand_templates", (char *) 0); -+ break; -+ case 'c': -+ if (setenv(CONF_ENV_PATH, optarg, 1) < 0) -+ msg_fatal("out of memory"); -+ break; -+ case 'd': -+ cmd_mode |= SHOW_DEFS; -+ break; -+ case 'e': -+ cmd_mode |= EDIT_MAIN; -+ break; -+ -+ /* -+ * People, this does not work unless you properly handle default -+ * settings. For example, fast_flush_domains = $relay_domains -+ * must not evaluate to the empty string when relay_domains is -+ * left at its default setting of $mydestination. -+ */ -+#if 0 -+ case 'E': -+ cmd_mode |= SHOW_EVAL; -+ break; -+#endif -+ case '#': -+ cmd_mode = COMMENT_OUT; -+ break; -+ -+ case 'h': -+ cmd_mode &= ~SHOW_NAME; -+ break; -+ case 'l': -+ cmd_mode |= SHOW_LOCKS; -+ break; -+ case 'm': -+ cmd_mode |= SHOW_MAPS; -+ break; -+ case 'n': -+ cmd_mode |= SHOW_NONDEF; -+ break; -+ case 't': -+ if (ext_argv) -+ msg_fatal("specify one of -b and -t"); -+ ext_argv = argv_alloc(2); -+ argv_add(ext_argv, "bounce", "-SVndump_templates", (char *) 0); -+ break; -+ case 'v': -+ msg_verbose++; -+ break; -+ default: -+ msg_fatal("usage: %s [-a (server SASL types)] [-A (client SASL types)] [-b (bounce templates)] [-c config_dir] [-d (defaults)] [-e (edit)] [-# (comment-out)] [-h (no names)] [-l (lock types)] [-m (map types)] [-n (non-defaults)] [-v] [name...]", argv[0]); -+ } -+ } -+ -+ /* -+ * Sanity check. -+ */ -+ junk = (cmd_mode & (SHOW_DEFS | SHOW_NONDEF | SHOW_MAPS | SHOW_LOCKS | EDIT_MAIN | SHOW_SASL_SERV | SHOW_SASL_CLNT | COMMENT_OUT)); -+ if (junk != 0 && ((junk != SHOW_DEFS && junk != SHOW_NONDEF -+ && junk != SHOW_MAPS && junk != SHOW_LOCKS && junk != EDIT_MAIN -+ && junk != SHOW_SASL_SERV && junk != SHOW_SASL_CLNT -+ && junk != COMMENT_OUT) -+ || ext_argv != 0)) -+ msg_fatal("specify one of -a, -A, -b, -d, -e, -#, -m, -l and -n"); -+ -+ /* -+ * Display bounce template information and exit. -+ */ -+ if (ext_argv) { -+ if (argv[optind]) { -+ if (argv[optind + 1]) -+ msg_fatal("options -b and -t require at most one template file"); -+ argv_add(ext_argv, "-o", -+ concatenate(VAR_BOUNCE_TMPL, "=", -+ argv[optind], (char *) 0), -+ (char *) 0); -+ } -+ /* Grr... */ -+ argv_add(ext_argv, "-o", -+ concatenate(VAR_QUEUE_DIR, "=", ".", (char *) 0), -+ (char *) 0); -+ mail_conf_read(); -+ mail_run_replace(var_daemon_dir, ext_argv->argv); -+ /* NOTREACHED */ -+ } -+ -+ /* -+ * If showing map types, show them and exit -+ */ -+ if (cmd_mode & SHOW_MAPS) { -+ mail_dict_init(); -+ show_maps(); -+ } -+ -+ /* -+ * If showing locking methods, show them and exit -+ */ -+ else if (cmd_mode & SHOW_LOCKS) { -+ show_locks(); -+ } -+ -+ /* -+ * If showing SASL plug-in types, show them and exit -+ */ -+ else if (cmd_mode & SHOW_SASL_SERV) { -+ show_sasl(SHOW_SASL_SERV); -+ } else if (cmd_mode & SHOW_SASL_CLNT) { -+ show_sasl(SHOW_SASL_CLNT); -+ } -+ -+ /* -+ * Edit main.cf. -+ */ -+ else if (cmd_mode & (EDIT_MAIN | COMMENT_OUT)) { -+ edit_parameters(cmd_mode, argc - optind, argv + optind); -+ } -+ -+ /* -+ * If showing non-default values, read main.cf. -+ */ -+ else { -+ if ((cmd_mode & SHOW_DEFS) == 0) { -+ read_parameters(); -+ set_parameters(); -+ } -+ -+ /* -+ * Throw together all parameters and show the asked values. -+ */ -+ hash_parameters(); -+ show_parameters(cmd_mode, argv + optind); -+ } -+ vstream_fflush(VSTREAM_OUT); -+ exit(0); -+} -diff -ruN a/src/postmap/postmap.c b/src/postmap/postmap.c ---- a/src/postmap/postmap.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/postmap/postmap.c 2009-06-01 13:08:26.000000000 +0000 -@@ -5,7 +5,7 @@ - /* Postfix lookup table management - /* SYNOPSIS - /* .fi --/* \fBpostmap\fR [\fB-Nbfhimnoprsvw\fR] [\fB-c \fIconfig_dir\fR] -+/* \fBpostmap\fR [\fB-Nbfhimnoprsuvw\fR] [\fB-c \fIconfig_dir\fR] - /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] - /* [\fIfile_type\fR:]\fIfile_name\fR ... - /* DESCRIPTION -@@ -151,6 +151,8 @@ - /* .sp - /* This feature is available in Postfix version 2.2 and later, - /* and is not available for all database types. -+/* .IP \fB-u\fR -+/* Upgrade the database to the current version. - /* .IP \fB-v\fR - /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR - /* options make the software increasingly verbose. -@@ -723,6 +725,18 @@ - dict_close(dict); - } - -+/* postmap_upgrade - upgrade a map */ -+ -+static int postmap_upgrade(const char *map_type, const char *map_name) -+{ -+ DICT *dict; -+ -+ dict = dict_open3(map_type, map_name, O_RDWR, -+ DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); -+ dict_close(dict); -+ return (dict != 0); -+} -+ - /* usage - explain */ - - static NORETURN usage(char *myname) -@@ -743,6 +757,7 @@ - int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; - int open_flags = O_RDWR | O_CREAT | O_TRUNC; - int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; -+ int upgrade = 0; - char *query = 0; - char *delkey = 0; - int sequence = 0; -@@ -787,7 +802,7 @@ - /* - * Parse JCL. - */ -- while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsvw")) > 0) { -+ while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsuvw")) > 0) { - switch (ch) { - default: - usage(argv[0]); -@@ -804,8 +819,8 @@ - msg_fatal("out of memory"); - break; - case 'd': -- if (sequence || query || delkey) -- msg_fatal("specify only one of -s -q or -d"); -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); - delkey = optarg; - break; - case 'f': -@@ -831,8 +846,8 @@ - postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; - break; - case 'q': -- if (sequence || query || delkey) -- msg_fatal("specify only one of -s -q or -d"); -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); - query = optarg; - break; - case 'r': -@@ -840,10 +855,15 @@ - dict_flags |= DICT_FLAG_DUP_REPLACE; - break; - case 's': -- if (query || delkey) -- msg_fatal("specify only one of -s or -q or -d"); -+ if (query || delkey || upgrade) -+ msg_fatal("specify only one of -s or -q or -u or -d"); - sequence = 1; - break; -+ case 'u': -+ if (sequence || query || delkey || upgrade) -+ msg_fatal("specify only one of -s -q -u or -d"); -+ upgrade=1; -+ break; - case 'v': - msg_verbose++; - break; -@@ -914,6 +934,21 @@ - exit(0); - } - exit(1); -+ } else if (upgrade) { /* Upgrade the map(s) */ -+ int success = 1; -+ if (optind + 1 > argc) -+ usage(argv[0]); -+ while (optind < argc) { -+ if ((path_name = split_at(argv[optind], ':')) != 0) { -+ success &= postmap_upgrade(argv[optind], path_name); -+ } else { -+ success &= postmap_upgrade(var_db_type, path_name); -+ } -+ if (!success) -+ exit(1); -+ optind++; -+ } -+ exit(0); - } else { /* create/update map(s) */ - if (optind + 1 > argc) - usage(argv[0]); -diff -ruN a/src/tls/Makefile.in b/src/tls/Makefile.in ---- a/src/tls/Makefile.in 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/tls/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -22,7 +22,7 @@ - INC_DIR = ../../include - MAKES = - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - - all: $(LIB) - -@@ -38,12 +38,10 @@ - root_tests: - - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - - update: $(LIB_DIR)/$(LIB) $(HDRS) - -for i in $(HDRS); \ -diff -ruN a/src/util/Makefile.in b/src/util/Makefile.in ---- a/src/util/Makefile.in 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/Makefile.in 2009-06-01 13:08:26.000000000 +0000 -@@ -31,21 +31,23 @@ - vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ - write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ - allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ -- upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c -+ upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ -+ load_lib.c - OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ - attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ - attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ - chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ - ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ - dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ -- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ -- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ -+ dict_nisplus.o dict_open.o dict_regexp.o \ -+ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ - dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ - fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ - fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ - host_port.o htable.o inet_addr_host.o inet_addr_list.o \ - inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ - inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ -+ load_lib.o \ - mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ - msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ - mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ -@@ -78,7 +80,7 @@ - msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ - mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ - open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ -- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ -+ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ - sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ - sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ - stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ -@@ -91,6 +93,7 @@ - CFLAGS = $(DEBUG) $(OPT) $(DEFS) - FILES = Makefile $(SRCS) $(HDRS) - INCL = -+PCRESO = dict_pcre.so - LIB = libutil.a - TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ - fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ -@@ -105,10 +108,11 @@ - - LIB_DIR = ../../lib - INC_DIR = ../../include -+LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) - --.c.o:; $(CC) $(CFLAGS) -c $*.c -+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c - --all: $(LIB) -+all: $(LIB) $(PCRESO) - - $(OBJS): ../../conf/makedefs.out - -@@ -117,15 +121,19 @@ - - test: $(TESTPROG) - -+$(PCRESO): dict_pcre.o libutil.a -+ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil -+ - $(LIB): $(OBJS) -- $(AR) $(ARFL) $(LIB) $? -- $(RANLIB) $(LIB) -+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) - - $(LIB_DIR)/$(LIB): $(LIB) - cp $(LIB) $(LIB_DIR) -- $(RANLIB) $(LIB_DIR)/$(LIB) - --update: $(LIB_DIR)/$(LIB) $(HDRS) -+../../libexec/$(PCRESO): $(PCRESO) -+ cp $(PCRESO) ../../libexec -+ -+update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) - -for i in $(HDRS); \ - do \ - cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ -@@ -147,7 +155,8 @@ - lint $(SRCS) - - clean: -- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp -+ rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ -+ junk $(MAKES) *.tmp - rm -rf printfck - - tidy: clean -diff -ruN a/src/util/dict.h b/src/util/dict.h ---- a/src/util/dict.h 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict.h 2009-06-01 13:08:26.000000000 +0000 -@@ -66,6 +66,7 @@ - #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ - #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ - #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ -+#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ - #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) - - /* IMPORTANT: Update the dict_mask[] table when the above changes */ -@@ -138,6 +139,11 @@ - extern DICT *dict_open(const char *, int, int); - extern DICT *dict_open3(const char *, const char *, int, int); - extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); -+#ifndef NO_DYNAMIC_MAPS -+extern void dict_open_dlinfo(const char *path); -+typedef void* (*dict_mkmap_func_t)(const char *); -+dict_mkmap_func_t dict_mkmap_func(const char *dict_type); -+#endif - - #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) - #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) -diff -ruN a/src/util/dict_db.c b/src/util/dict_db.c ---- a/src/util/dict_db.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict_db.c 2009-06-01 13:08:26.000000000 +0000 -@@ -664,6 +664,12 @@ - msg_fatal("set DB cache size %d: %m", dict_db_cache_size); - if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) - msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); -+ if (dict_flags & DICT_FLAG_UPGRADE) { -+ if (msg_verbose) -+ msg_info("upgrading database %s",db_path); -+ if ((errno = db->upgrade(db,db_path,0)) != 0) -+ msg_fatal("upgrade of database %s: %m",db_path); -+ } - #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) - if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) - msg_fatal("open database %s: %m", db_path); -diff -ruN a/src/util/dict_dbm.c b/src/util/dict_dbm.c ---- a/src/util/dict_dbm.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict_dbm.c 2009-06-01 13:08:26.000000000 +0000 -@@ -407,6 +407,10 @@ - char *dbm_path; - int lock_fd; - -+#ifdef HAVE_GDBM -+ msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", -+ path); -+#endif - /* - * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in - * the time domain) locking while accessing individual database records. -diff -ruN a/src/util/dict_open.c b/src/util/dict_open.c ---- a/src/util/dict_open.c 2009-06-01 12:27:45.000000000 +0000 -+++ b/src/util/dict_open.c 2009-06-01 13:08:26.000000000 +0000 -@@ -44,6 +44,8 @@ - /* DICT *(*open) (const char *, int, int); - /* - /* ARGV *dict_mapnames() -+/* -+/* void (*)() dict_mkmap_func(const char *dict_type) - /* DESCRIPTION - /* This module implements a low-level interface to multiple - /* physical dictionary types. -@@ -159,6 +161,9 @@ - /* - /* dict_mapnames() returns a sorted list with the names of all available - /* dictionary types. -+/* -+/* dict_mkmap_func() returns a pointer to the mkmap setup function -+/* for the given map type, as given in /etc/dynamicmaps.cf - /* DIAGNOSTICS - /* Fatal error: open error, unsupported dictionary type, attempt to - /* update non-writable dictionary. -@@ -183,6 +188,9 @@ - #include <strings.h> - #endif - -+#include <sys/stat.h> -+#include <unistd.h> -+ - /* Utility library. */ - - #include <argv.h> -@@ -207,6 +215,27 @@ - #include <split_at.h> - #include <htable.h> - -+#ifndef NO_DYNAMIC_MAPS -+#include <load_lib.h> -+#include <vstring.h> -+#include <vstream.h> -+#include <vstring_vstream.h> -+#include <mvect.h> -+ -+ /* -+ * Interface for dynamic map loading. -+ */ -+typedef struct { -+ const char *pattern; -+ const char *soname; -+ const char *openfunc; -+ const char *mkmapfunc; -+} DLINFO; -+ -+static DLINFO *dict_dlinfo; -+static DLINFO *dict_open_dlfind(const char *type); -+#endif -+ - /* - * lookup table for available map types. - */ -@@ -221,9 +250,11 @@ - #endif - DICT_TYPE_ENVIRON, dict_env_open, - DICT_TYPE_UNIX, dict_unix_open, -+#ifdef NO_DYNAMIC_MAPS - #ifdef SNAPSHOT - DICT_TYPE_TCP, dict_tcp_open, - #endif -+#endif - #ifdef HAS_SDBM - DICT_TYPE_SDBM, dict_sdbm_open, - #endif -@@ -243,9 +274,11 @@ - #ifdef HAS_NETINFO - DICT_TYPE_NETINFO, dict_ni_open, - #endif -+#ifdef NO_DYNAMIC_MAPS - #ifdef HAS_PCRE - DICT_TYPE_PCRE, dict_pcre_open, - #endif -+#endif /* NO_DYNAMIC_MAPS */ - #ifdef HAS_POSIX_REGEXP - DICT_TYPE_REGEXP, dict_regexp_open, - #endif -@@ -303,8 +336,31 @@ - dict_type, dict_name); - if (dict_open_hash == 0) - dict_open_init(); -- if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) -- msg_fatal("unsupported dictionary type: %s", dict_type); -+ if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { -+#ifdef NO_DYNAMIC_MAPS -+ msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); -+#else -+ struct stat st; -+ LIB_FN fn[2]; -+ DICT *(*open) (const char *, int, int); -+ DLINFO *dl=dict_open_dlfind(dict_type); -+ if (!dl) -+ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); -+ if (stat(dl->soname,&st) < 0) { -+ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", -+ myname, dict_type, dl->soname, dict_type); -+ } -+ fn[0].name = dl->openfunc; -+ fn[0].ptr = (void**)&open; -+ fn[1].name = NULL; -+ load_library_symbols(dl->soname, fn, NULL); -+ dict_open_register(dict_type, open); -+ dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); -+#endif -+ } -+ if (msg_verbose>1) { -+ msg_info("%s: calling %s open routine",myname,dict_type); -+ } - if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) - msg_fatal("opening %s:%s %m", dict_type, dict_name); - if (msg_verbose) -@@ -312,6 +368,36 @@ - return (dict); - } - -+dict_mkmap_func_t dict_mkmap_func(const char *dict_type) -+{ -+ char *myname="dict_mkmap_func"; -+ struct stat st; -+ LIB_FN fn[2]; -+ dict_mkmap_func_t mkmap; -+ DLINFO *dl; -+#ifndef NO_DYNAMIC_MAPS -+ if (!dict_dlinfo) -+ msg_fatal("dlinfo==NULL"); -+ dl=dict_open_dlfind(dict_type); -+ if (!dl) -+ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); -+ if (stat(dl->soname,&st) < 0) { -+ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", -+ myname, dict_type, dl->soname, dict_type); -+ } -+ if (!dl->mkmapfunc) -+ msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); -+ -+ fn[0].name = dl->mkmapfunc; -+ fn[0].ptr = (void**)&mkmap; -+ fn[1].name = NULL; -+ load_library_symbols(dl->soname, fn, NULL); -+ return mkmap; -+#else -+ return (void(*)())NULL; -+#endif -+} -+ - /* dict_open_register - register dictionary type */ - - void dict_open_register(const char *type, -@@ -345,6 +431,9 @@ - HTABLE_INFO **ht; - DICT_OPEN_INFO *dp; - ARGV *mapnames; -+#ifndef NO_DYNAMIC_MAPS -+ DLINFO *dlp; -+#endif - - if (dict_open_hash == 0) - dict_open_init(); -@@ -353,6 +442,13 @@ - dp = (DICT_OPEN_INFO *) ht[0]->value; - argv_add(mapnames, dp->type, ARGV_END); - } -+#ifndef NO_DYNAMIC_MAPS -+ if (!dict_dlinfo) -+ msg_fatal("dlinfo==NULL"); -+ for (dlp=dict_dlinfo; dlp->pattern; dlp++) { -+ argv_add(mapnames, dlp->pattern, ARGV_END); -+ } -+#endif - qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), - dict_sort_alpha_cpp); - myfree((char *) ht_info); -@@ -360,6 +456,87 @@ - return mapnames; - } - -+#ifndef NO_DYNAMIC_MAPS -+#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) -+ -+void dict_open_dlinfo(const char *path) -+{ -+ char *myname="dict_open_dlinfo"; -+ VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); -+ VSTRING *buf = vstring_alloc(100); -+ char *cp; -+ ARGV *argv; -+ MVECT vector; -+ int nelm=0; -+ int linenum=0; -+ -+ dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); -+ -+ if (!conf_fp) { -+ msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", -+ myname, path); -+ } else { -+ while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { -+ cp = vstring_str(buf); -+ linenum++; -+ if (*cp == '#' || *cp == '\0') -+ continue; -+ argv = argv_split(cp, " \t"); -+ if (argv->argc != 3 && argv->argc != 4) { -+ msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", -+ myname, linenum); -+ } -+ if (STREQ(argv->argv[0],"*")) { -+ msg_warn("%s: wildcard dynamic map entry no longer supported.", -+ myname); -+ continue; -+ } -+ if (argv->argv[1][0] != '/') { -+ msg_fatal("%s: .so name must begin with a \"/\" at line %d", -+ myname, linenum); -+ } -+ if (nelm >= vector.nelm) { -+ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); -+ } -+ dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); -+ dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); -+ dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); -+ if (argv->argc==4) -+ dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); -+ else -+ dict_dlinfo[nelm].mkmapfunc = NULL; -+ nelm++; -+ argv_free(argv); -+ } -+ } -+ if (nelm >= vector.nelm) { -+ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); -+ } -+ dict_dlinfo[nelm].pattern = NULL; -+ dict_dlinfo[nelm].soname = NULL; -+ dict_dlinfo[nelm].openfunc = NULL; -+ dict_dlinfo[nelm].mkmapfunc = NULL; -+ if (conf_fp) -+ vstream_fclose(conf_fp); -+ vstring_free(buf); -+} -+ -+static DLINFO *dict_open_dlfind(const char *type) -+{ -+ DLINFO *dp; -+ -+ if (!dict_dlinfo) -+ return NULL; -+ -+ for (dp=dict_dlinfo; dp->pattern; dp++) { -+ if (STREQ(dp->pattern,type)) -+ return dp; -+ } -+ return NULL; -+} -+ -+#endif /* !NO_DYNAMIC_MAPS */ -+ - #ifdef TEST - - /* -diff -ruN a/src/util/load_lib.c b/src/util/load_lib.c ---- a/src/util/load_lib.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/util/load_lib.c 2009-06-01 13:08:26.000000000 +0000 -@@ -0,0 +1,135 @@ -+/*++ -+/* NAME -+/* load_lib 3 -+/* SUMMARY -+/* library loading wrappers -+/* SYNOPSIS -+/* #include <load_lib.h> -+/* -+/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); -+/* const char *libname; -+/* LIB_FN *libfuncs; -+/* LIB_FN *libdata; -+/* -+/* DESCRIPTION -+/* This module loads functions from libraries, returnine pointers -+/* to the named functions. -+/* -+/* load_library_symbols() loads all of the desired functions, and -+/* returns zero for success, or exits via msg_fatal(). -+/* -+/* SEE ALSO -+/* msg(3) diagnostics interface -+/* DIAGNOSTICS -+/* Problems are reported via the msg(3) diagnostics routines: -+/* library not found, symbols not found, other fatal errors. -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* LaMont Jones -+/* Hewlett-Packard Company -+/* 3404 Harmony Road -+/* Fort Collins, CO 80528, USA -+/* -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+/* System libraries. */ -+ -+#include "sys_defs.h" -+#include <stdlib.h> -+#include <stddef.h> -+#include <string.h> -+#if defined(HAS_DLOPEN) -+#include <dlfcn.h> -+#elif defined(HAS_SHL_LOAD) -+#include <dl.h> -+#endif -+ -+/* Application-specific. */ -+ -+#include "msg.h" -+#include "load_lib.h" -+ -+extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) -+{ -+ char *myname = "load_library_symbols"; -+ LIB_FN *fn; -+ -+#if defined(HAS_DLOPEN) -+ void *handle; -+ char *emsg; -+ -+ handle=dlopen(libname,RTLD_NOW); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); -+ } -+ -+ if (libfuncs) { -+ for (fn=libfuncs; fn->name; fn++) { -+ *(fn->ptr) = dlsym(handle,fn->name); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, -+ fn->name, libname, emsg); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+ if (libdata) { -+ for (fn=libdata; fn->name; fn++) { -+ *(fn->ptr) = dlsym(handle,fn->name); -+ emsg=dlerror(); -+ if (emsg) { -+ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, -+ fn->name, libname, emsg); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+#elif defined(HAS_SHL_LOAD) -+ shl_t handle; -+ -+ handle = shl_load(libname,BIND_IMMEDIATE,0); -+ -+ if (libfuncs) { -+ for (fn=libfuncs; fn->name; fn++) { -+ if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { -+ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", -+ myname, fn->name, libname); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+ if (libdata) { -+ for (fn=libdata; fn->name; fn++) { -+ if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { -+ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", -+ myname, fn->name, libname); -+ } -+ if (msg_verbose>1) { -+ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); -+ } -+ } -+ } -+ -+#else -+ msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", -+ myname); -+#endif -+ return 0; -+} -diff -ruN a/src/util/load_lib.h b/src/util/load_lib.h ---- a/src/util/load_lib.h 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/util/load_lib.h 2009-06-01 13:08:26.000000000 +0000 -@@ -0,0 +1,41 @@ -+#ifndef _LOAD_LIB_H_INCLUDED_ -+#define _LOAD_LIB_H_INCLUDED_ -+ -+/*++ -+/* NAME -+/* load_lib 3h -+/* SUMMARY -+/* library loading wrappers -+/* SYNOPSIS -+/* #include "load_lib.h" -+/* DESCRIPTION -+/* .nf -+ -+ /* -+ * External interface. -+ */ -+/* NULL name terminates list */ -+typedef struct LIB_FN { -+ const char *name; -+ void **ptr; -+} LIB_FN; -+ -+extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); -+ -+/* LICENSE -+/* .ad -+/* .fi -+/* The Secure Mailer license must be distributed with this software. -+/* AUTHOR(S) -+/* LaMont Jones -+/* Hewlett-Packard Company -+/* 3404 Harmony Road -+/* Fort Collins, CO 80528, USA -+/* -+/* Wietse Venema -+/* IBM T.J. Watson Research -+/* P.O. Box 704 -+/* Yorktown Heights, NY 10598, USA -+/*--*/ -+ -+#endif diff --git a/main/postfix/postfix-2.7.0-dynamic-maps.patch b/main/postfix/postfix-2.7.0-dynamic-maps.patch new file mode 100644 index 0000000000..da1c799bec --- /dev/null +++ b/main/postfix/postfix-2.7.0-dynamic-maps.patch @@ -0,0 +1,1064 @@ +commit 98599e6387147a26d8433e85a4a61ef5c4240e83 +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon May 31 14:49:38 2010 +0000 + + added dynamic maps + +diff --git a/conf/postfix-files b/conf/postfix-files +index 7ff93ea..7cae109 100644 +--- a/conf/postfix-files ++++ b/conf/postfix-files +@@ -65,6 +65,10 @@ $queue_directory/saved:d:$mail_owner:-:700:ucr + $queue_directory/trace:d:$mail_owner:-:700:ucr + $daemon_directory/anvil:f:root:-:755 + $daemon_directory/bounce:f:root:-:755 ++$daemon_directory/dict_ldap.so:f:root:-:755 ++$daemon_directory/dict_pcre.so:f:root:-:755 ++$daemon_directory/dict_mysql.so:f:root:-:755 ++$daemon_directory/dict_pgsql.so:f:root:-:755 + $daemon_directory/cleanup:f:root:-:755 + $daemon_directory/discard:f:root:-:755 + $daemon_directory/error:f:root:-:755 +@@ -94,6 +98,11 @@ $daemon_directory/tlsmgr:f:root:-:755 + $daemon_directory/trivial-rewrite:f:root:-:755 + $daemon_directory/verify:f:root:-:755 + $daemon_directory/virtual:f:root:-:755 ++/usr/lib/libpostfix-dns.so.1:f:root:-:755 ++/usr/lib/libpostfix-global.so.1:f:root:-:755 ++/usr/lib/libpostfix-tls.so.1:f:root:-:755 ++/usr/lib/libpostfix-master.so.1:f:root:-:755 ++/usr/lib/libpostfix-util.so.1:f:root:-:755 + $daemon_directory/nqmgr:h:$daemon_directory/qmgr + $daemon_directory/lmtp:h:$daemon_directory/smtp + $command_directory/postalias:f:root:-:755 +@@ -117,6 +126,7 @@ $config_directory/access:f:root:-:644:p1 + $config_directory/aliases:f:root:-:644:p1 + $config_directory/bounce.cf.default:f:root:-:644:1 + $config_directory/canonical:f:root:-:644:p1 ++$config_directory/dynamicmaps.cf:f:root:-:644:p + $config_directory/cidr_table:f:root:-:644:o + $config_directory/generic:f:root:-:644:p1 + $config_directory/generics:f:root:-:644:o +diff --git a/src/dns/Makefile.in b/src/dns/Makefile.in +index bbc5e98..f70cb96 100644 +--- a/src/dns/Makefile.in ++++ b/src/dns/Makefile.in +@@ -14,7 +14,7 @@ LIBS = ../../lib/libutil.a + LIB_DIR = ../../lib + INC_DIR = ../../include + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + + all: $(LIB) + +@@ -31,12 +31,10 @@ tests: test dns_rr_to_pa_test dns_rr_to_sa_test dns_sa_to_rr_test \ + root_tests: + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-dns.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + update: $(LIB_DIR)/$(LIB) $(HDRS) + -for i in $(HDRS); \ +diff --git a/src/global/Makefile.in b/src/global/Makefile.in +index 56c9b6c..b0c83d6 100644 +--- a/src/global/Makefile.in ++++ b/src/global/Makefile.in +@@ -34,7 +34,7 @@ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ + canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ + clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ + defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ +- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ ++ deliver_request.o \ + dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ + dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ + ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ +@@ -104,10 +104,13 @@ LIBS = ../../lib/libutil.a + LIB_DIR = ../../lib + INC_DIR = ../../include + MAKES = ++LDAPSO = dict_ldap.so ++MYSQLSO = dict_mysql.so ++PGSQLSO = dict_pgsql.so + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + +-all: $(LIB) ++all: $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) + + $(OBJS): ../../conf/makedefs.out + +@@ -117,14 +120,30 @@ Makefile: Makefile.in + test: $(TESTPROG) + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) ++ ++$(LDAPSO): dict_ldap.o $(LIB) ../../lib/libglobal.a ++ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal ++ ++$(MYSQLSO): dict_mysql.o $(LIB) ../../lib/libglobal.a ++ gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil -lglobal ++ ++$(PGSQLSO): dict_pgsql.o $(LIB) ../../lib/libglobal.a ++ gcc -shared -Wl,-soname,dict_pgsql.so -o $@ $? -lpq -L. -lutil -lglobal + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + +-update: $(LIB_DIR)/$(LIB) $(HDRS) ++../../libexec/$(LDAPSO): $(LDAPSO) ++ cp $(LDAPSO) ../../libexec ++ ++../../libexec/$(MYSQLSO): $(MYSQLSO) ++ cp $(MYSQLSO) ../../libexec ++ ++../../libexec/$(PGSQLSO): $(PGSQLSO) ++ cp $(PGSQLSO) ../../libexec ++ ++update: $(LIB_DIR)/$(LIB) ../../libexec/$(LDAPSO) ../../libexec/$(MYSQLSO) ../../libexec/$(PGSQLSO) $(HDRS) + -for i in $(HDRS); \ + do \ + cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ +@@ -492,7 +511,7 @@ lint: + lint $(DEFS) $(SRCS) $(LINTFIX) + + clean: +- rm -f *.o $(LIB) *core $(TESTPROG) junk ++ rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk + rm -rf printfck + + tidy: clean +diff --git a/src/global/mail_conf.c b/src/global/mail_conf.c +index c5d3d43..feb7d66 100644 +--- a/src/global/mail_conf.c ++++ b/src/global/mail_conf.c +@@ -182,6 +182,13 @@ void mail_conf_suck(void) + path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); + dict_load_file(CONFIG_DICT, path); + myfree(path); ++ ++#ifndef NO_DYNAMIC_MAPS ++ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); ++ dict_open_dlinfo(path); ++ myfree(path); ++#endif ++ + } + + /* mail_conf_flush - discard configuration dictionary */ +diff --git a/src/global/mail_dict.c b/src/global/mail_dict.c +index 35ecffb..c1ff165 100644 +--- a/src/global/mail_dict.c ++++ b/src/global/mail_dict.c +@@ -45,6 +45,7 @@ typedef struct { + + static const DICT_OPEN_INFO dict_open_info[] = { + DICT_TYPE_PROXY, dict_proxy_open, ++#ifdef NO_DYNAMIC_MAPS + #ifdef HAS_LDAP + DICT_TYPE_LDAP, dict_ldap_open, + #endif +@@ -54,6 +55,7 @@ static const DICT_OPEN_INFO dict_open_info[] = { + #ifdef HAS_PGSQL + DICT_TYPE_PGSQL, dict_pgsql_open, + #endif ++#endif /* NO_DYNAMIC_MAPS */ + 0, + }; + +diff --git a/src/global/mail_params.c b/src/global/mail_params.c +index f5350a1..1bbad7a 100644 +--- a/src/global/mail_params.c ++++ b/src/global/mail_params.c +@@ -79,6 +79,7 @@ + /* char *var_export_environ; + /* char *var_debug_peer_list; + /* int var_debug_peer_level; ++/* int var_command_maxtime; + /* int var_in_flow_delay; + /* int var_fault_inj_code; + /* char *var_bounce_service; +@@ -265,6 +266,7 @@ char *var_import_environ; + char *var_export_environ; + char *var_debug_peer_list; + int var_debug_peer_level; ++int var_command_maxtime; + int var_fault_inj_code; + char *var_bounce_service; + char *var_cleanup_service; +@@ -276,6 +278,7 @@ char *var_showq_service; + char *var_error_service; + char *var_flush_service; + char *var_verify_service; ++char *var_scache_service; + char *var_trace_service; + char *var_proxymap_service; + char *var_proxywrite_service; +diff --git a/src/global/mkmap_open.c b/src/global/mkmap_open.c +index 69a0d57..eb8de71 100644 +--- a/src/global/mkmap_open.c ++++ b/src/global/mkmap_open.c +@@ -81,7 +81,7 @@ + * We use a different table (in dict_open.c) when querying maps. + */ + typedef struct { +- char *type; ++ const char *type; + MKMAP *(*before_open) (const char *); + } MKMAP_OPEN_INFO; + +@@ -156,7 +156,16 @@ MKMAP *mkmap_open(const char *type, const char *path, + */ + for (mp = mkmap_types; /* void */ ; mp++) { + if (mp->type == 0) ++#ifndef NO_DYNAMIC_MAPS ++ { ++ static MKMAP_OPEN_INFO oi; ++ oi.before_open=(MKMAP*(*)(const char*))dict_mkmap_func(type); ++ oi.type=type; ++ mp=&oi; ++ } ++#else + msg_fatal("unsupported map type: %s", type); ++#endif + if (strcmp(type, mp->type) == 0) + break; + } +diff --git a/src/master/Makefile.in b/src/master/Makefile.in +index 53f65bd..48ca35e 100644 +--- a/src/master/Makefile.in ++++ b/src/master/Makefile.in +@@ -20,7 +20,7 @@ LIB_DIR = ../../lib + INC_DIR = ../../include + BIN_DIR = ../../libexec + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c + + all: $(PROG) $(LIB) + +@@ -39,12 +39,10 @@ tests: + root_tests: + + $(LIB): $(LIB_OBJ) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR)/$(LIB) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + $(BIN_DIR)/$(PROG): $(PROG) + cp $(PROG) $(BIN_DIR) +diff --git a/src/milter/Makefile.in b/src/milter/Makefile.in +index c28263a..549b868 100644 +--- a/src/milter/Makefile.in ++++ b/src/milter/Makefile.in +@@ -14,7 +14,7 @@ LIB_DIR = ../../lib + INC_DIR = ../../include + MAKES = + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + + all: $(LIB) + +@@ -30,12 +30,10 @@ tests: + root_tests: + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-milter.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + update: $(LIB_DIR)/$(LIB) $(HDRS) + -for i in $(HDRS); \ +diff --git a/src/postconf/postconf.c b/src/postconf/postconf.c +index d1ae434..dd604bb 100644 +--- a/src/postconf/postconf.c ++++ b/src/postconf/postconf.c +@@ -965,6 +965,16 @@ static void show_maps(void) + { + ARGV *maps_argv; + int i; ++#ifndef NO_DYNAMIC_MAPS ++ char *path; ++ char *config_dir; ++ ++ var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0 ? ++ config_dir : DEF_CONFIG_DIR); /* XXX */ ++ path = concatenate(var_config_dir, "/", "dynamicmaps.cf", (char *) 0); ++ dict_open_dlinfo(path); ++ myfree(path); ++#endif + + maps_argv = dict_mapnames(); + for (i = 0; i < maps_argv->argc; i++) +diff --git a/src/postmap/postmap.c b/src/postmap/postmap.c +index e956aed..712d041 100644 +--- a/src/postmap/postmap.c ++++ b/src/postmap/postmap.c +@@ -5,7 +5,7 @@ + /* Postfix lookup table management + /* SYNOPSIS + /* .fi +-/* \fBpostmap\fR [\fB-Nbfhimnoprsvw\fR] [\fB-c \fIconfig_dir\fR] ++/* \fBpostmap\fR [\fB-Nbfhimnoprsuvw\fR] [\fB-c \fIconfig_dir\fR] + /* [\fB-d \fIkey\fR] [\fB-q \fIkey\fR] + /* [\fIfile_type\fR:]\fIfile_name\fR ... + /* DESCRIPTION +@@ -151,6 +151,8 @@ + /* .sp + /* This feature is available in Postfix version 2.2 and later, + /* and is not available for all database types. ++/* .IP \fB-u\fR ++/* Upgrade the database to the current version. + /* .IP \fB-v\fR + /* Enable verbose logging for debugging purposes. Multiple \fB-v\fR + /* options make the software increasingly verbose. +@@ -723,6 +725,18 @@ static void postmap_seq(const char *map_type, const char *map_name, + dict_close(dict); + } + ++/* postmap_upgrade - upgrade a map */ ++ ++static int postmap_upgrade(const char *map_type, const char *map_name) ++{ ++ DICT *dict; ++ ++ dict = dict_open3(map_type, map_name, O_RDWR, ++ DICT_FLAG_LOCK|DICT_FLAG_UPGRADE); ++ dict_close(dict); ++ return (dict != 0); ++} ++ + /* usage - explain */ + + static NORETURN usage(char *myname) +@@ -743,6 +757,7 @@ int main(int argc, char **argv) + int postmap_flags = POSTMAP_FLAG_AS_OWNER | POSTMAP_FLAG_SAVE_PERM; + int open_flags = O_RDWR | O_CREAT | O_TRUNC; + int dict_flags = DICT_FLAG_DUP_WARN | DICT_FLAG_FOLD_FIX; ++ int upgrade = 0; + char *query = 0; + char *delkey = 0; + int sequence = 0; +@@ -787,7 +802,7 @@ int main(int argc, char **argv) + /* + * Parse JCL. + */ +- while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsvw")) > 0) { ++ while ((ch = GETOPT(argc, argv, "Nbc:d:fhimnopq:rsuvw")) > 0) { + switch (ch) { + default: + usage(argv[0]); +@@ -804,8 +819,8 @@ int main(int argc, char **argv) + msg_fatal("out of memory"); + break; + case 'd': +- if (sequence || query || delkey) +- msg_fatal("specify only one of -s -q or -d"); ++ if (sequence || query || delkey || upgrade) ++ msg_fatal("specify only one of -s -q -u or -d"); + delkey = optarg; + break; + case 'f': +@@ -831,8 +846,8 @@ int main(int argc, char **argv) + postmap_flags &= ~POSTMAP_FLAG_SAVE_PERM; + break; + case 'q': +- if (sequence || query || delkey) +- msg_fatal("specify only one of -s -q or -d"); ++ if (sequence || query || delkey || upgrade) ++ msg_fatal("specify only one of -s -q -u or -d"); + query = optarg; + break; + case 'r': +@@ -840,10 +855,15 @@ int main(int argc, char **argv) + dict_flags |= DICT_FLAG_DUP_REPLACE; + break; + case 's': +- if (query || delkey) +- msg_fatal("specify only one of -s or -q or -d"); ++ if (query || delkey || upgrade) ++ msg_fatal("specify only one of -s or -q or -u or -d"); + sequence = 1; + break; ++ case 'u': ++ if (sequence || query || delkey || upgrade) ++ msg_fatal("specify only one of -s -q -u or -d"); ++ upgrade=1; ++ break; + case 'v': + msg_verbose++; + break; +@@ -914,6 +934,21 @@ int main(int argc, char **argv) + exit(0); + } + exit(1); ++ } else if (upgrade) { /* Upgrade the map(s) */ ++ int success = 1; ++ if (optind + 1 > argc) ++ usage(argv[0]); ++ while (optind < argc) { ++ if ((path_name = split_at(argv[optind], ':')) != 0) { ++ success &= postmap_upgrade(argv[optind], path_name); ++ } else { ++ success &= postmap_upgrade(var_db_type, path_name); ++ } ++ if (!success) ++ exit(1); ++ optind++; ++ } ++ exit(0); + } else { /* create/update map(s) */ + if (optind + 1 > argc) + usage(argv[0]); +diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in +index 1a8e26d..1f26fd8 100644 +--- a/src/tls/Makefile.in ++++ b/src/tls/Makefile.in +@@ -22,7 +22,7 @@ LIB_DIR = ../../lib + INC_DIR = ../../include + MAKES = + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + + all: $(LIB) + +@@ -38,12 +38,10 @@ tests: + root_tests: + + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-tls.so.1 -o $(LIB) $(OBJS) $(LIBS) $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + + update: $(LIB_DIR)/$(LIB) $(HDRS) + -for i in $(HDRS); \ +diff --git a/src/util/Makefile.in b/src/util/Makefile.in +index 653919c..21e918a 100644 +--- a/src/util/Makefile.in ++++ b/src/util/Makefile.in +@@ -32,21 +32,22 @@ SRCS = alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \ + write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ + allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \ + upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \ +- unix_pass_fd_fix.c dict_cache.c ++ unix_pass_fd_fix.c dict_cache.c load_lib.c + OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ + attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ + attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ + chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \ + ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \ + dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \ +- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \ +- dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \ ++ dict_nisplus.o dict_open.o dict_regexp.o \ ++ dict_static.o dict_unix.o dir_forest.o doze.o dummy_read.o \ + dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \ + fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \ + fullname.o get_domainname.o get_hostname.o hex_code.o hex_quote.o \ + host_port.o htable.o inet_addr_host.o inet_addr_list.o \ + inet_addr_local.o inet_connect.o inet_listen.o inet_proto.o \ + inet_trigger.o line_wrap.o lowercase.o lstat_as.o mac_expand.o \ ++ load_lib.o \ + mac_parse.o make_dirs.o mask_addr.o match_list.o match_ops.o msg.o \ + msg_output.o msg_syslog.o msg_vstream.o mvect.o myaddrinfo.o myflock.o \ + mymalloc.o myrand.o mystrtok.o name_code.o name_mask.o netstring.o \ +@@ -80,7 +81,7 @@ HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \ + msg_output.h msg_syslog.h msg_vstream.h mvect.h myaddrinfo.h myflock.h \ + mymalloc.h myrand.h name_code.h name_mask.h netstring.h nvtable.h \ + open_as.h open_lock.h percentm.h posix_signals.h readlline.h ring.h \ +- safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h \ ++ safe.h safe_open.h sane_accept.h sane_connect.h sane_fsops.h load_lib.h \ + sane_socketpair.h sane_time.h scan_dir.h set_eugid.h set_ugid.h \ + sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ + stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ +@@ -93,6 +94,7 @@ DEFS = -I. -D$(SYSTYPE) + CFLAGS = $(DEBUG) $(OPT) $(DEFS) + FILES = Makefile $(SRCS) $(HDRS) + INCL = ++PCRESO = dict_pcre.so + LIB = libutil.a + TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ + fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \ +@@ -108,10 +110,11 @@ TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \ + + LIB_DIR = ../../lib + INC_DIR = ../../include ++LIBS = $(LIB_DIR)/$(LIB) $(PCRESO) + +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c + +-all: $(LIB) ++all: $(LIB) $(PCRESO) + + $(OBJS): ../../conf/makedefs.out + +@@ -120,15 +123,19 @@ Makefile: Makefile.in + + test: $(TESTPROG) + ++$(PCRESO): dict_pcre.o libutil.a ++ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil ++ + $(LIB): $(OBJS) +- $(AR) $(ARFL) $(LIB) $? +- $(RANLIB) $(LIB) ++ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl $(SYSLIBS) + + $(LIB_DIR)/$(LIB): $(LIB) + cp $(LIB) $(LIB_DIR) +- $(RANLIB) $(LIB_DIR)/$(LIB) + +-update: $(LIB_DIR)/$(LIB) $(HDRS) ++../../libexec/$(PCRESO): $(PCRESO) ++ cp $(PCRESO) ../../libexec ++ ++update: $(LIBS) ../../libexec/$(PCRESO) $(HDRS) + -for i in $(HDRS); \ + do \ + cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \ +@@ -150,7 +157,8 @@ lint: + lint $(SRCS) + + clean: +- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp ++ rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \ ++ junk $(MAKES) *.tmp + rm -rf printfck + + tidy: clean +diff --git a/src/util/dict.h b/src/util/dict.h +index 9829d28..d7dc53c 100644 +--- a/src/util/dict.h ++++ b/src/util/dict.h +@@ -66,6 +66,7 @@ extern DICT *dict_debug(DICT *); + #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ + #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ + #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ ++#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ + #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) + + /* IMPORTANT: Update the dict_mask[] table when the above changes */ +@@ -138,6 +139,11 @@ extern const char *dict_eval(const char *, const char *, int); + extern DICT *dict_open(const char *, int, int); + extern DICT *dict_open3(const char *, const char *, int, int); + extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); ++#ifndef NO_DYNAMIC_MAPS ++extern void dict_open_dlinfo(const char *path); ++typedef void* (*dict_mkmap_func_t)(const char *); ++dict_mkmap_func_t dict_mkmap_func(const char *dict_type); ++#endif + + #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) + #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) +diff --git a/src/util/dict_db.c b/src/util/dict_db.c +index e4b301d..8dc9c9d 100644 +--- a/src/util/dict_db.c ++++ b/src/util/dict_db.c +@@ -675,6 +675,12 @@ static DICT *dict_db_open(const char *class, const char *path, int open_flags, + msg_fatal("set DB cache size %d: %m", dict_db_cache_size); + if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) + msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); ++ if (dict_flags & DICT_FLAG_UPGRADE) { ++ if (msg_verbose) ++ msg_info("upgrading database %s",db_path); ++ if ((errno = db->upgrade(db,db_path,0)) != 0) ++ msg_fatal("upgrade of database %s: %m",db_path); ++ } + #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) + if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) + msg_fatal("open database %s: %m", db_path); +diff --git a/src/util/dict_dbm.c b/src/util/dict_dbm.c +index 3603e44..adc5258 100644 +--- a/src/util/dict_dbm.c ++++ b/src/util/dict_dbm.c +@@ -409,6 +409,10 @@ DICT *dict_dbm_open(const char *path, int open_flags, int dict_flags) + char *dbm_path; + int lock_fd; + ++#ifdef HAVE_GDBM ++ msg_fatal("%s: gdbm maps use locking that is incompatible with postfix. Use a hash map instead.", ++ path); ++#endif + /* + * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in + * the time domain) locking while accessing individual database records. +diff --git a/src/util/dict_open.c b/src/util/dict_open.c +index b807bc2..0f4e382 100644 +--- a/src/util/dict_open.c ++++ b/src/util/dict_open.c +@@ -44,6 +44,8 @@ + /* DICT *(*open) (const char *, int, int); + /* + /* ARGV *dict_mapnames() ++/* ++/* void (*)() dict_mkmap_func(const char *dict_type) + /* DESCRIPTION + /* This module implements a low-level interface to multiple + /* physical dictionary types. +@@ -159,6 +161,9 @@ + /* + /* dict_mapnames() returns a sorted list with the names of all available + /* dictionary types. ++/* ++/* dict_mkmap_func() returns a pointer to the mkmap setup function ++/* for the given map type, as given in /etc/dynamicmaps.cf + /* DIAGNOSTICS + /* Fatal error: open error, unsupported dictionary type, attempt to + /* update non-writable dictionary. +@@ -183,6 +188,9 @@ + #include <strings.h> + #endif + ++#include <sys/stat.h> ++#include <unistd.h> ++ + /* Utility library. */ + + #include <argv.h> +@@ -208,6 +216,27 @@ + #include <split_at.h> + #include <htable.h> + ++#ifndef NO_DYNAMIC_MAPS ++#include <load_lib.h> ++#include <vstring.h> ++#include <vstream.h> ++#include <vstring_vstream.h> ++#include <mvect.h> ++ ++ /* ++ * Interface for dynamic map loading. ++ */ ++typedef struct { ++ const char *pattern; ++ const char *soname; ++ const char *openfunc; ++ const char *mkmapfunc; ++} DLINFO; ++ ++static DLINFO *dict_dlinfo; ++static DLINFO *dict_open_dlfind(const char *type); ++#endif ++ + /* + * lookup table for available map types. + */ +@@ -223,7 +252,9 @@ static const DICT_OPEN_INFO dict_open_info[] = { + DICT_TYPE_ENVIRON, dict_env_open, + DICT_TYPE_HT, dict_ht_open, + DICT_TYPE_UNIX, dict_unix_open, ++#ifdef NO_DYNAMIC_MAPS + DICT_TYPE_TCP, dict_tcp_open, ++#endif + #ifdef HAS_SDBM + DICT_TYPE_SDBM, dict_sdbm_open, + #endif +@@ -243,9 +274,11 @@ static const DICT_OPEN_INFO dict_open_info[] = { + #ifdef HAS_NETINFO + DICT_TYPE_NETINFO, dict_ni_open, + #endif ++#ifdef NO_DYNAMIC_MAPS + #ifdef HAS_PCRE + DICT_TYPE_PCRE, dict_pcre_open, + #endif ++#endif /* NO_DYNAMIC_MAPS */ + #ifdef HAS_POSIX_REGEXP + DICT_TYPE_REGEXP, dict_regexp_open, + #endif +@@ -303,8 +336,31 @@ DICT *dict_open3(const char *dict_type, const char *dict_name, + dict_type, dict_name); + if (dict_open_hash == 0) + dict_open_init(); +- if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) +- msg_fatal("unsupported dictionary type: %s", dict_type); ++ if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) { ++#ifdef NO_DYNAMIC_MAPS ++ msg_fatal("%s: unsupported dictionary type: %s", myname, dict_type); ++#else ++ struct stat st; ++ LIB_FN fn[2]; ++ DICT *(*open) (const char *, int, int); ++ DLINFO *dl=dict_open_dlfind(dict_type); ++ if (!dl) ++ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); ++ if (stat(dl->soname,&st) < 0) { ++ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", ++ myname, dict_type, dl->soname, dict_type); ++ } ++ fn[0].name = dl->openfunc; ++ fn[0].ptr = (void**)&open; ++ fn[1].name = NULL; ++ load_library_symbols(dl->soname, fn, NULL); ++ dict_open_register(dict_type, open); ++ dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type); ++#endif ++ } ++ if (msg_verbose>1) { ++ msg_info("%s: calling %s open routine",myname,dict_type); ++ } + if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) + msg_fatal("opening %s:%s %m", dict_type, dict_name); + if (msg_verbose) +@@ -312,6 +368,36 @@ DICT *dict_open3(const char *dict_type, const char *dict_name, + return (dict); + } + ++dict_mkmap_func_t dict_mkmap_func(const char *dict_type) ++{ ++ char *myname="dict_mkmap_func"; ++ struct stat st; ++ LIB_FN fn[2]; ++ dict_mkmap_func_t mkmap; ++ DLINFO *dl; ++#ifndef NO_DYNAMIC_MAPS ++ if (!dict_dlinfo) ++ msg_fatal("dlinfo==NULL"); ++ dl=dict_open_dlfind(dict_type); ++ if (!dl) ++ msg_fatal("%s: unsupported dictionary type: %s: Is the postfix-%s package installed?", myname, dict_type, dict_type); ++ if (stat(dl->soname,&st) < 0) { ++ msg_fatal("%s: unsupported dictionary type: %s (%s not found. Is the postfix-%s package installed?)", ++ myname, dict_type, dl->soname, dict_type); ++ } ++ if (!dl->mkmapfunc) ++ msg_fatal("%s: unsupported dictionary type: %s does not allow map creation.", myname, dict_type); ++ ++ fn[0].name = dl->mkmapfunc; ++ fn[0].ptr = (void**)&mkmap; ++ fn[1].name = NULL; ++ load_library_symbols(dl->soname, fn, NULL); ++ return mkmap; ++#else ++ return (void(*)())NULL; ++#endif ++} ++ + /* dict_open_register - register dictionary type */ + + void dict_open_register(const char *type, +@@ -345,6 +431,9 @@ ARGV *dict_mapnames() + HTABLE_INFO **ht; + DICT_OPEN_INFO *dp; + ARGV *mapnames; ++#ifndef NO_DYNAMIC_MAPS ++ DLINFO *dlp; ++#endif + + if (dict_open_hash == 0) + dict_open_init(); +@@ -353,6 +442,13 @@ ARGV *dict_mapnames() + dp = (DICT_OPEN_INFO *) ht[0]->value; + argv_add(mapnames, dp->type, ARGV_END); + } ++#ifndef NO_DYNAMIC_MAPS ++ if (!dict_dlinfo) ++ msg_fatal("dlinfo==NULL"); ++ for (dlp=dict_dlinfo; dlp->pattern; dlp++) { ++ argv_add(mapnames, dlp->pattern, ARGV_END); ++ } ++#endif + qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), + dict_sort_alpha_cpp); + myfree((char *) ht_info); +@@ -360,6 +456,87 @@ ARGV *dict_mapnames() + return mapnames; + } + ++#ifndef NO_DYNAMIC_MAPS ++#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0)) ++ ++void dict_open_dlinfo(const char *path) ++{ ++ char *myname="dict_open_dlinfo"; ++ VSTREAM *conf_fp=vstream_fopen(path,O_RDONLY,0); ++ VSTRING *buf = vstring_alloc(100); ++ char *cp; ++ ARGV *argv; ++ MVECT vector; ++ int nelm=0; ++ int linenum=0; ++ ++ dict_dlinfo=(DLINFO*)mvect_alloc(&vector,sizeof(DLINFO),3,NULL,NULL); ++ ++ if (!conf_fp) { ++ msg_warn("%s: cannot open %s. No dynamic maps will be allowed.", ++ myname, path); ++ } else { ++ while (vstring_get_nonl(buf,conf_fp) != VSTREAM_EOF) { ++ cp = vstring_str(buf); ++ linenum++; ++ if (*cp == '#' || *cp == '\0') ++ continue; ++ argv = argv_split(cp, " \t"); ++ if (argv->argc != 3 && argv->argc != 4) { ++ msg_fatal("%s: Expected \"pattern .so-name open-function [mkmap-function]\" at line %d", ++ myname, linenum); ++ } ++ if (STREQ(argv->argv[0],"*")) { ++ msg_warn("%s: wildcard dynamic map entry no longer supported.", ++ myname); ++ continue; ++ } ++ if (argv->argv[1][0] != '/') { ++ msg_fatal("%s: .so name must begin with a \"/\" at line %d", ++ myname, linenum); ++ } ++ if (nelm >= vector.nelm) { ++ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+3); ++ } ++ dict_dlinfo[nelm].pattern = mystrdup(argv->argv[0]); ++ dict_dlinfo[nelm].soname = mystrdup(argv->argv[1]); ++ dict_dlinfo[nelm].openfunc = mystrdup(argv->argv[2]); ++ if (argv->argc==4) ++ dict_dlinfo[nelm].mkmapfunc = mystrdup(argv->argv[3]); ++ else ++ dict_dlinfo[nelm].mkmapfunc = NULL; ++ nelm++; ++ argv_free(argv); ++ } ++ } ++ if (nelm >= vector.nelm) { ++ dict_dlinfo=(DLINFO*)mvect_realloc(&vector,vector.nelm+1); ++ } ++ dict_dlinfo[nelm].pattern = NULL; ++ dict_dlinfo[nelm].soname = NULL; ++ dict_dlinfo[nelm].openfunc = NULL; ++ dict_dlinfo[nelm].mkmapfunc = NULL; ++ if (conf_fp) ++ vstream_fclose(conf_fp); ++ vstring_free(buf); ++} ++ ++static DLINFO *dict_open_dlfind(const char *type) ++{ ++ DLINFO *dp; ++ ++ if (!dict_dlinfo) ++ return NULL; ++ ++ for (dp=dict_dlinfo; dp->pattern; dp++) { ++ if (STREQ(dp->pattern,type)) ++ return dp; ++ } ++ return NULL; ++} ++ ++#endif /* !NO_DYNAMIC_MAPS */ ++ + #ifdef TEST + + /* +diff --git a/src/util/load_lib.c b/src/util/load_lib.c +new file mode 100644 +index 0000000..b6526ef +--- /dev/null ++++ b/src/util/load_lib.c +@@ -0,0 +1,135 @@ ++/*++ ++/* NAME ++/* load_lib 3 ++/* SUMMARY ++/* library loading wrappers ++/* SYNOPSIS ++/* #include <load_lib.h> ++/* ++/* extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); ++/* const char *libname; ++/* LIB_FN *libfuncs; ++/* LIB_FN *libdata; ++/* ++/* DESCRIPTION ++/* This module loads functions from libraries, returnine pointers ++/* to the named functions. ++/* ++/* load_library_symbols() loads all of the desired functions, and ++/* returns zero for success, or exits via msg_fatal(). ++/* ++/* SEE ALSO ++/* msg(3) diagnostics interface ++/* DIAGNOSTICS ++/* Problems are reported via the msg(3) diagnostics routines: ++/* library not found, symbols not found, other fatal errors. ++/* LICENSE ++/* .ad ++/* .fi ++/* The Secure Mailer license must be distributed with this software. ++/* AUTHOR(S) ++/* LaMont Jones ++/* Hewlett-Packard Company ++/* 3404 Harmony Road ++/* Fort Collins, CO 80528, USA ++/* ++/* Wietse Venema ++/* IBM T.J. Watson Research ++/* P.O. Box 704 ++/* Yorktown Heights, NY 10598, USA ++/*--*/ ++ ++/* System libraries. */ ++ ++#include "sys_defs.h" ++#include <stdlib.h> ++#include <stddef.h> ++#include <string.h> ++#if defined(HAS_DLOPEN) ++#include <dlfcn.h> ++#elif defined(HAS_SHL_LOAD) ++#include <dl.h> ++#endif ++ ++/* Application-specific. */ ++ ++#include "msg.h" ++#include "load_lib.h" ++ ++extern int load_library_symbols(const char * libname, LIB_FN * libfuncs, LIB_FN * libdata) ++{ ++ char *myname = "load_library_symbols"; ++ LIB_FN *fn; ++ ++#if defined(HAS_DLOPEN) ++ void *handle; ++ char *emsg; ++ ++ handle=dlopen(libname,RTLD_NOW); ++ emsg=dlerror(); ++ if (emsg) { ++ msg_fatal("%s: dlopen failure loading %s: %s", myname, libname, emsg); ++ } ++ ++ if (libfuncs) { ++ for (fn=libfuncs; fn->name; fn++) { ++ *(fn->ptr) = dlsym(handle,fn->name); ++ emsg=dlerror(); ++ if (emsg) { ++ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, ++ fn->name, libname, emsg); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++ ++ if (libdata) { ++ for (fn=libdata; fn->name; fn++) { ++ *(fn->ptr) = dlsym(handle,fn->name); ++ emsg=dlerror(); ++ if (emsg) { ++ msg_fatal("%s: dlsym failure looking up %s in %s: %s", myname, ++ fn->name, libname, emsg); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %lx",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++#elif defined(HAS_SHL_LOAD) ++ shl_t handle; ++ ++ handle = shl_load(libname,BIND_IMMEDIATE,0); ++ ++ if (libfuncs) { ++ for (fn=libfuncs; fn->name; fn++) { ++ if (shl_findsym(&handle,fn->name,TYPE_PROCEDURE,fn->ptr) != 0) { ++ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", ++ myname, fn->name, libname); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++ ++ if (libdata) { ++ for (fn=libdata; fn->name; fn++) { ++ if (shl_findsym(&handle,fn->name,TYPE_DATA,fn->ptr) != 0) { ++ msg_fatal("%s: shl_findsym failure looking up %s in %s: %m", ++ myname, fn->name, libname); ++ } ++ if (msg_verbose>1) { ++ msg_info("loaded %s = %x",fn->name, *((long*)(fn->ptr))); ++ } ++ } ++ } ++ ++#else ++ msg_fatal("%s: need dlopen or shl_load support for dynamic libraries", ++ myname); ++#endif ++ return 0; ++} +diff --git a/src/util/load_lib.h b/src/util/load_lib.h +new file mode 100644 +index 0000000..adebd25 +--- /dev/null ++++ b/src/util/load_lib.h +@@ -0,0 +1,41 @@ ++#ifndef _LOAD_LIB_H_INCLUDED_ ++#define _LOAD_LIB_H_INCLUDED_ ++ ++/*++ ++/* NAME ++/* load_lib 3h ++/* SUMMARY ++/* library loading wrappers ++/* SYNOPSIS ++/* #include "load_lib.h" ++/* DESCRIPTION ++/* .nf ++ ++ /* ++ * External interface. ++ */ ++/* NULL name terminates list */ ++typedef struct LIB_FN { ++ const char *name; ++ void **ptr; ++} LIB_FN; ++ ++extern int load_library_symbols(const char *, LIB_FN *, LIB_FN *); ++ ++/* LICENSE ++/* .ad ++/* .fi ++/* The Secure Mailer license must be distributed with this software. ++/* AUTHOR(S) ++/* LaMont Jones ++/* Hewlett-Packard Company ++/* 3404 Harmony Road ++/* Fort Collins, CO 80528, USA ++/* ++/* Wietse Venema ++/* IBM T.J. Watson Research ++/* P.O. Box 704 ++/* Yorktown Heights, NY 10598, USA ++/*--*/ ++ ++#endif diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index a4d1b55fd4..69592378b0 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postgresql -pkgver=8.4.3 +pkgver=8.4.4 pkgrel=0 pkgdesc="A sophisticated object-relational DBMS" url="http://www.postgresql.org/" @@ -56,8 +56,8 @@ client() { } -md5sums="7f70e7b140fb190f268837255582b07e postgresql-8.4.3.tar.bz2 -740bc8414ee27b4c81dee1690c32679f postgresql.initd -d6b58fc2411fdadcb9b762464c5bee7d postgresql.confd -e64d0ab26b077ed80d883c0c40704ff4 pg-restore.initd -8d1b69ac56a1a0d1cfd7da337bf6c5e2 pg-restore.confd" +md5sums="4bf2448ad965bca3940df648c02194df postgresql-8.4.4.tar.bz2 +66c197b8186a6df0752fe2aed40c90c4 postgresql.initd +12199d445bfa42aafc2a958012737107 postgresql.confd +7f8de63848c51c8a30c39bec6b1b1606 pg-restore.initd +bf45384752b320b369f1425939763178 pg-restore.confd" diff --git a/main/postgresql/pg-restore.confd b/main/postgresql/pg-restore.confd index 18bff4c2a3..84a179f6cd 100644 --- a/main/postgresql/pg-restore.confd +++ b/main/postgresql/pg-restore.confd @@ -10,7 +10,7 @@ # #KEEP_DUMP=yes -# If you enable the KEEP_DUMP bove you probably also want the --clean option +# If you enable KEEP_DUMP above you probably also want the --clean option # the the pg_dumpall command. #PG_DUMPALL_OPTS="--clean" diff --git a/main/postgresql/pg-restore.initd b/main/postgresql/pg-restore.initd index aaf07cbe7d..91c69d18f4 100644 --- a/main/postgresql/pg-restore.initd +++ b/main/postgresql/pg-restore.initd @@ -1,5 +1,7 @@ #!/sbin/runscript +. /etc/conf.d/postgresql + opts="${opts} dump restore" depend() { @@ -7,18 +9,22 @@ depend() { } restore() { - [ -z "$PGDUMP" ] && return 0 + yesno "$PGDUMP" && return 0 ebegin "Restoring PostgreSQL $PGDUMP" - psql -U ${PG_USER:-postgres} ${PSQL_OPTS} -f "$PGDUMP" - eend $? - if [ -z "$KEEP_DUMP" ]; then - rm -f "$PGDUMP" - fi + psql -U ${PG_USER:-postgres} ${PSQL_OPTS} -f "$PGDUMP" >/dev/null 2>/dev/null + yesno "$KEEP_DUMP" || rm -f "$PGDUMP" + + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" /usr/bin/pg_ctl reload " >/dev/null + eend $res } dump() { - [ -z "$PGDUMP" ] && return 0 + yesno "$PGDUMP" && return 0 + mkdir -p "$( dirname "$PGDUMP" )" + ebegin "Saving PostgreSQL databases to $PGDUMP" pg_dumpall -U ${PG_USER:-postgres} ${PG_DUMPALL_OPTS} -f "$PGDUMP" + eend $? } start() { diff --git a/main/postgresql/postgresql.confd b/main/postgresql/postgresql.confd index 4fe28a4584..29ef20d941 100644 --- a/main/postgresql/postgresql.confd +++ b/main/postgresql/postgresql.confd @@ -52,5 +52,5 @@ WAIT_FOR_START="-w" # export R_HOME="/usr/lib/R" # Automatically set up a new database if missing on startup -#AUTO_SETUP=yes +AUTO_SETUP=yes diff --git a/main/postgresql/postgresql.initd b/main/postgresql/postgresql.initd index 23b0acff4c..2de91d0df6 100644 --- a/main/postgresql/postgresql.initd +++ b/main/postgresql/postgresql.initd @@ -2,6 +2,7 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.4 2008/09/28 22:53:02 caleb Exp $ +# Modifications to support Alpine Linux pg-restore opts="${opts} reload setup" @@ -11,10 +12,11 @@ depend() { } checkconfig() { - [ -d "$PGDATA" ] && return 0 + [ -d "$PGDATA/base" ] && return 0 + echo "checking config" - if [ -z "$AUTO_SETUP" ] || [ "$AUTO_SETUP" = "no" ]; then - eerror "Directory not found: $PGDATA" + if [ -z "$AUTO_SETUP" ] ; then + eerror "Database not found at: $PGDATA" eerror "Please make sure that PGDATA points to the right path." eerror "You can run '/etc/init.d/postgresql setup' to setup a new database cluster." return 1 @@ -101,18 +103,36 @@ reload() { setup() { ebegin "Creating a new PostgreSQL database cluster" - rmdir "${PGDATA}" 2>/dev/null - if [ -d "${PGDATA}" ] ; then - eend 1 "${PGDATA} already exist" + + if [ -d "${PGDATA}/base" ] ; then + eend 1 "${PGDATA}/base already exists" return fi - mkdir -p "${PGDATA}" + + mkdir -p "${PGDATA}" 2>/dev/null + + # If the pg_hba.conf and friends exist, move them + local tmpdir="$( dirname "$PGDATA" )/tmp" + mkdir -p "${tmpdir}" >/dev/null + echo mv "${PGDATA}"/* "${tmpdir}" + mv "${PGDATA}"/* "${tmpdir}" 2>/dev/null + + rm -rf "${PGDATA}"/* 2>/dev/null chown -Rf postgres:postgres "${PGDATA}" chmod 0700 "${PGDATA}" cd "${PGDATA}" # to avoid the: could not change directory to "/root" su -c "/usr/bin/initdb --pgdata ${PGDATA}" postgres einfo "You can use the '/etc/init.d/postgresql' script to run PostgreSQL instead" einfo "of 'pg_ctl'." - eend $? + local res=$? + + # move the pg_hba.conf and friends + mv $tmpdir/* "$PGDATA" 2>/dev/null + rm -rf $tmpdir 2>/dev/null + + # Do not send a SIGHUP to postmaster; its not necessary for a new database + # and allows pg-restore to do a blind restore of an old database + + eend $res } diff --git a/main/pound/APKBUILD b/main/pound/APKBUILD index 3ad049414e..263438af31 100644 --- a/main/pound/APKBUILD +++ b/main/pound/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pound pkgver=2.5 -pkgrel=0 +pkgrel=2 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" url="http://www.apsis.ch/pound/index_html" license="GPL" @@ -10,9 +10,17 @@ makedepends="pcre-dev openssl-dev" subpackages="$pkgname-doc" source="http://www.apsis.ch/$pkgname/Pound-$pkgver.tgz pound.cfg + pound-2.5-openssl.patch $pkgname.initd" _builddir="$srcdir"/Pound-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + patch -p1 -i "$i" || return 1 + done +} + build() { cd "$_builddir" ./configure --prefix=/usr --sysconfdir=/etc/pound @@ -28,4 +36,5 @@ package() { } md5sums="8a39f5902094619afcda7d12d9d8342c Pound-2.5.tgz 736b12a47acbb7fc2802ed7f51e959d0 pound.cfg +c2c48dc395ffc045f9d35394992292d0 pound-2.5-openssl.patch 074fc58c89bb70e8fcd767ee70ebd0f0 pound.initd" diff --git a/main/pound/pound-2.5-openssl.patch b/main/pound/pound-2.5-openssl.patch new file mode 100644 index 0000000000..efefd54879 --- /dev/null +++ b/main/pound/pound-2.5-openssl.patch @@ -0,0 +1,290 @@ +diff -up Pound-2.5/config.c.openssl Pound-2.5/config.c +--- Pound-2.5/config.c.openssl 2010-02-10 12:23:09.000000000 +0100 ++++ Pound-2.5/config.c 2010-02-10 12:23:07.000000000 +0100 +@@ -431,14 +431,22 @@ t_hash(const TABNODE *e) + res = (res ^ *k++) * 16777619; + return res; + } ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++static IMPLEMENT_LHASH_HASH_FN(t, TABNODE) ++#else + static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *) ++#endif + + static int + t_cmp(const TABNODE *d1, const TABNODE *d2) + { + return strcmp(d1->key, d2->key); + } ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++static IMPLEMENT_LHASH_COMP_FN(t, TABNODE) ++#else + static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *) ++#endif + + /* + * parse a service +@@ -460,7 +468,11 @@ parse_service(const char *svc_name) + pthread_mutex_init(&res->mut, NULL); + if(svc_name) + strncpy(res->name, svc_name, KEY_SIZE); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) ++#else + if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) ++#endif + conf_err("lh_new failed - aborted"); + ign_case = ignore_case; + while(conf_fgets(lin, MAXBUF)) { +diff -up Pound-2.5/pound.h.openssl Pound-2.5/pound.h +--- Pound-2.5/pound.h.openssl 2010-02-02 12:49:02.000000000 +0100 ++++ Pound-2.5/pound.h 2010-02-10 12:15:18.000000000 +0100 +@@ -322,6 +322,10 @@ typedef struct _tn { + /* maximal session key size */ + #define KEY_SIZE 127 + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++DECLARE_LHASH_OF(TABNODE); ++#endif ++ + /* service definition */ + typedef struct _service { + char name[KEY_SIZE + 1]; /* symbolic name */ +@@ -337,7 +341,11 @@ typedef struct _service { + int sess_ttl; /* session time-to-live */ + regex_t sess_start; /* pattern to identify the session data */ + regex_t sess_pat; /* pattern to match the session data */ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ LHASH_OF(TABNODE) *sessions; /* currently active sessions */ ++#else + LHASH *sessions; /* currently active sessions */ ++#endif + int dynscale; /* true if the back-ends should be dynamically rescaled */ + int disabled; /* true if the service is disabled */ + struct _service *next; +diff -up Pound-2.5/svc.c.openssl Pound-2.5/svc.c +--- Pound-2.5/svc.c.openssl 2010-02-02 12:49:02.000000000 +0100 ++++ Pound-2.5/svc.c 2010-02-10 12:13:29.000000000 +0100 +@@ -27,12 +27,17 @@ + + #include "pound.h" + ++#ifndef LHASH_OF ++#define LHASH_OF(x) LHASH ++#define CHECKED_LHASH_OF(type, h) h ++#endif ++ + /* + * Add a new key/content pair to a hash table + * the table should be already locked + */ + static void +-t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len) ++t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len) + { + TABNODE *t, *old; + +@@ -53,7 +58,11 @@ t_add(LHASH *const tab, const char *key, + } + memcpy(t->content, content, cont_len); + t->last_acc = time(NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) { ++#else + if((old = (TABNODE *)lh_insert(tab, t)) != NULL) { ++#endif + free(old->key); + free(old->content); + free(old); +@@ -68,12 +77,16 @@ t_add(LHASH *const tab, const char *key, + * side-effect: update the time of last access + */ + static void * +-t_find(LHASH *const tab, char *const key) ++t_find(LHASH_OF(TABNODE) *const tab, char *const key) + { + TABNODE t, *res; + + t.key = key; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) { ++#else + if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) { ++#endif + res->last_acc = time(NULL); + return res->content; + } +@@ -84,12 +97,16 @@ t_find(LHASH *const tab, char *const key + * Delete a key + */ + static void +-t_remove(LHASH *const tab, char *const key) ++t_remove(LHASH_OF(TABNODE) *const tab, char *const key) + { + TABNODE t, *res; + + t.key = key; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) { ++#else + if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) { ++#endif + free(res->key); + free(res->content); + free(res); +@@ -98,59 +115,75 @@ t_remove(LHASH *const tab, char *const k + } + + typedef struct { +- LHASH *tab; ++ LHASH_OF(TABNODE) *tab; + time_t lim; + void *content; + int cont_len; + } ALL_ARG; + + static void +-t_old(TABNODE *t, void *arg) ++t_old_doall_arg(TABNODE *t, ALL_ARG *a) + { +- ALL_ARG *a; +- +- a = (ALL_ARG *)arg; + if(t->last_acc < a->lim) ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ LHM_lh_delete(TABNODE, a->tab, t); ++#else + lh_delete(a->tab, t); ++#endif + return; + } +-IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *) ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG) ++#else ++#define t_old t_old_doall_arg ++IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *) ++#endif + + /* + * Expire all old nodes + */ + static void +-t_expire(LHASH *const tab, const time_t lim) ++t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim) + { + ALL_ARG a; + int down_load; + + a.tab = tab; + a.lim = lim; +- down_load = tab->down_load; +- tab->down_load = 0; ++ down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; ++ CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a); ++#else + lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a); +- tab->down_load = down_load; ++#endif ++ CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; + return; + } + + static void +-t_cont(TABNODE *t, void *arg) ++t_cont_doall_arg(TABNODE *t, ALL_ARG *a) + { +- ALL_ARG *a; +- +- a = (ALL_ARG *)arg; + if(memcmp(t->content, a->content, a->cont_len) == 0) ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ LHM_lh_delete(TABNODE, a->tab, t); ++#else + lh_delete(a->tab, t); ++#endif + return; + } +-IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *) ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG) ++#else ++#define t_cont t_cont_doall_arg ++IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *) ++#endif + + /* + * Remove all nodes with the given content + */ + static void +-t_clean(LHASH *const tab, void *const content, const size_t cont_len) ++t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len) + { + ALL_ARG a; + int down_load; +@@ -158,10 +191,14 @@ t_clean(LHASH *const tab, void *const co + a.tab = tab; + a.content = content; + a.cont_len = cont_len; +- down_load = tab->down_load; +- tab->down_load = 0; ++ down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; ++ CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a); ++#else + lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a); +- tab->down_load = down_load; ++#endif ++ CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; + return; + } + +@@ -1410,13 +1447,11 @@ typedef struct { + } DUMP_ARG; + + static void +-t_dump(TABNODE *t, void *arg) ++t_dump_doall_arg(TABNODE *t, DUMP_ARG *a) + { +- DUMP_ARG *a; + BACKEND *be, *bep; + int n_be, sz; + +- a = (DUMP_ARG *)arg; + memcpy(&bep, t->content, sizeof(bep)); + for(n_be = 0, be = a->backends; be; be = be->next, n_be++) + if(be == bep) +@@ -1432,19 +1467,28 @@ t_dump(TABNODE *t, void *arg) + return; + } + +-IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *) ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG) ++#else ++#define t_dump t_dump_doall_arg ++IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *) ++#endif + + /* + * write sessions to the control socket + */ + static void +-dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends) ++dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends) + { + DUMP_ARG a; + + a.control_sock = control_sock; + a.backends = backends; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a); ++#else + lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a); ++#endif + return; + } + diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD index a7fcb2e7b0..eb17abf7ca 100644 --- a/main/ppp/APKBUILD +++ b/main/ppp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="A daemon which implements the PPP protocol for dial-up networking" url="http://www.samba.org/ppp/" license="custom:GPL/BSD" diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD index 368148b23f..4df2d72194 100644 --- a/main/procps/APKBUILD +++ b/main/procps/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=procps pkgver=3.2.8 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for monitoring your system and processes on your system" url="http://procps.sourceforge.net/" license="GPL LGPL" diff --git a/main/psqlodbc/APKBUILD b/main/psqlodbc/APKBUILD new file mode 100644 index 0000000000..a14579a20b --- /dev/null +++ b/main/psqlodbc/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=psqlodbc +pkgver=08.04.0200 +pkgrel=2 +pkgdesc="PostgreSQL ODBC driver" +url="http://www.postgresql.org" +license="GPL" +depends= +makedepends="postgresql-dev unixodbc-dev openssl-dev" +subpackages="$pkgname-dev" +source="ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$_builddir" + ./configure --prefix=/usr + make || return 1 +} + + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} +md5sums="8296be11d24e3111319826fbaf034066 psqlodbc-08.04.0200.tar.gz" diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD index ce5cc5e126..ec920d874f 100644 --- a/main/pth/APKBUILD +++ b/main/pth/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pth pkgver=2.0.7 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Portable Threads." url="http://www.gnu.org/software/pth" license="LGPL-2.1" -depends="uclibc" +depends="" subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz pth-2.0.5-parallelfix.patch diff --git a/main/python/APKBUILD b/main/python/APKBUILD index 4e67b233db..07fb2d4cd8 100644 --- a/main/python/APKBUILD +++ b/main/python/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=python pkgver=2.6.5 -pkgrel=0 +pkgrel=2 pkgdesc="A high-level scripting language" url="http://www.python.org" license="custom" diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD new file mode 100644 index 0000000000..4d3d7100bd --- /dev/null +++ b/main/qemu/APKBUILD @@ -0,0 +1,90 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=qemu +pkgver=0.12.4 +pkgrel=0 +pkgdesc="QEMU is a generic machine emulator and virtualizer" +url="http://www.nongnu.org/qemu/" +license="GPL-2 LGPL-2" +makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev" +depends= +install="qemu.pre-install" +subpackages=" +$pkgname-arm +$pkgname-cris +$pkgname-m68k +$pkgname-microblaze +$pkgname-mips +$pkgname-mips64 +$pkgname-mips64el +$pkgname-mipsel +$pkgname-ppc +$pkgname-ppc64 +$pkgname-ppcemb +$pkgname-sh4 +$pkgname-sh4eb +$pkgname-sparc +$pkgname-sparc64 +$pkgname-x86_64 +" +source="http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz + kqemu.patch + " + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + # avoid fdt till an updated release appears + sed -i -e 's:fdt="yes":fdt="no":' configure + # prevent docs to get automatically installed + sed -i '/$(DESTDIR)$(docdir)/d' Makefile + # Alter target makefiles to accept CFLAGS + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target tests/Makefile + sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ + Makefile.target +# patch -p1 -i ../kqemu.patch || return 1 +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --audio-drv-list=oss,alsa,sdl \ + --audio-card-list=ac97,sb16,es1370,adlib \ + --disable-darwin-user \ + --disable-bsd-user \ + --disable-linux-user \ + --cc="${CC:-gcc}" + + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} + +_subsys() { + pkgdesc="Qemu $1 system emulator" + depend="qemu" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/qemu-system-$1 "$subpkgdir"/usr/bin/ +} + +arm() { _subsys arm; } +cris() { _subsys cris; } +m68k() { _subsys m68k; } +microblaze() { _subsys microblaze; } +mips() { _subsys mips; } +mips64() { _subsys mips64; } +mips64el() { _subsys mips64el; } +mipsel() { _subsys mipsel; } +ppc() { _subsys ppc; } +ppc64() { _subsys ppc64; } +ppcemb() { _subsys ppcemb; } +sh4() { _subsys sh4; } +sh4eb() { _subsys sh4eb; } +sparc() { _subsys sparc; } +sparc64() { _subsys sparc64; } +x86_64() { _subsys x86_64; } + +md5sums="93e6b134dff89b2799f57b7d9e0e0fc5 qemu-0.12.4.tar.gz +f63f7412f016d8ccddabfd02ea28e748 kqemu.patch" diff --git a/main/qemu/kqemu.c b/main/qemu/kqemu.c new file mode 100644 index 0000000000..035d310ab9 --- /dev/null +++ b/main/qemu/kqemu.c @@ -0,0 +1,997 @@ +/* + * KQEMU support + * + * Copyright (c) 2005-2008 Fabrice Bellard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + */ +#include "config.h" +#ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <winioctl.h> +#else +#include <sys/types.h> +#include <sys/mman.h> +#include <sys/ioctl.h> +#endif +#ifdef HOST_SOLARIS +#include <sys/ioccom.h> +#endif +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <inttypes.h> + +#include "cpu.h" +#include "exec-all.h" +#include "qemu-common.h" + +#ifdef USE_KQEMU + +#define DEBUG +//#define PROFILE + + +#ifdef DEBUG +# define LOG_INT(...) qemu_log_mask(CPU_LOG_INT, ## __VA_ARGS__) +# define LOG_INT_STATE(env) log_cpu_state_mask(CPU_LOG_INT, (env), 0) +#else +# define LOG_INT(...) do { } while (0) +# define LOG_INT_STATE(env) do { } while (0) +#endif + +#include <unistd.h> +#include <fcntl.h> +#include "kqemu.h" + +#ifdef _WIN32 +#define KQEMU_DEVICE "\\\\.\\kqemu" +#else +#define KQEMU_DEVICE "/dev/kqemu" +#endif + +static void qpi_init(void); + +#ifdef _WIN32 +#define KQEMU_INVALID_FD INVALID_HANDLE_VALUE +HANDLE kqemu_fd = KQEMU_INVALID_FD; +#define kqemu_closefd(x) CloseHandle(x) +#else +#define KQEMU_INVALID_FD -1 +int kqemu_fd = KQEMU_INVALID_FD; +#define kqemu_closefd(x) close(x) +#endif + +/* 0 = not allowed + 1 = user kqemu + 2 = kernel kqemu +*/ +int kqemu_allowed = 1; +uint64_t *pages_to_flush; +unsigned int nb_pages_to_flush; +uint64_t *ram_pages_to_update; +unsigned int nb_ram_pages_to_update; +uint64_t *modified_ram_pages; +unsigned int nb_modified_ram_pages; +uint8_t *modified_ram_pages_table; +int qpi_io_memory; +uint32_t kqemu_comm_base; /* physical address of the QPI communication page */ + +#define cpuid(index, eax, ecx, edx) \ + asm volatile ("cpuid" \ + : "=a" (eax), "=c" (ecx), "=d" (edx) \ + : "0" (index)) + +#ifdef __x86_64__ +static int is_cpuid_supported(void) +{ + return 1; +} +#else +static int is_cpuid_supported(void) +{ + int v0, v1; + asm volatile ("pushf\n" + "popl %0\n" + "movl %0, %1\n" + "xorl $0x00200000, %0\n" + "pushl %0\n" + "popf\n" + "pushf\n" + "popl %0\n" + : "=a" (v0), "=d" (v1) + : + : "cc"); + return (v0 != v1); +} +#endif + +static void kqemu_update_cpuid(CPUState *env) +{ + int critical_features_mask, features, ext_features, ext_features_mask; + uint32_t eax, ecx, edx; + + /* the following features are kept identical on the host and + target cpus because they are important for user code. Strictly + speaking, only SSE really matters because the OS must support + it if the user code uses it. */ + critical_features_mask = + CPUID_CMOV | CPUID_CX8 | + CPUID_FXSR | CPUID_MMX | CPUID_SSE | + CPUID_SSE2 | CPUID_SEP; + ext_features_mask = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR; + if (!is_cpuid_supported()) { + features = 0; + ext_features = 0; + } else { + cpuid(1, eax, ecx, edx); + features = edx; + ext_features = ecx; + } +#ifdef __x86_64__ + /* NOTE: on x86_64 CPUs, SYSENTER is not supported in + compatibility mode, so in order to have the best performances + it is better not to use it */ + features &= ~CPUID_SEP; +#endif + env->cpuid_features = (env->cpuid_features & ~critical_features_mask) | + (features & critical_features_mask); + env->cpuid_ext_features = (env->cpuid_ext_features & ~ext_features_mask) | + (ext_features & ext_features_mask); + /* XXX: we could update more of the target CPUID state so that the + non accelerated code sees exactly the same CPU features as the + accelerated code */ +} + +int kqemu_init(CPUState *env) +{ + struct kqemu_init kinit; + int ret, version; +#ifdef _WIN32 + DWORD temp; +#endif + + if (!kqemu_allowed) + return -1; + +#ifdef _WIN32 + kqemu_fd = CreateFile(KQEMU_DEVICE, GENERIC_WRITE | GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + NULL); + if (kqemu_fd == KQEMU_INVALID_FD) { + fprintf(stderr, "Could not open '%s' - QEMU acceleration layer not activated: %lu\n", + KQEMU_DEVICE, GetLastError()); + return -1; + } +#else + kqemu_fd = open(KQEMU_DEVICE, O_RDWR); + if (kqemu_fd == KQEMU_INVALID_FD) { + fprintf(stderr, "Could not open '%s' - QEMU acceleration layer not activated: %s\n", + KQEMU_DEVICE, strerror(errno)); + return -1; + } +#endif + version = 0; +#ifdef _WIN32 + DeviceIoControl(kqemu_fd, KQEMU_GET_VERSION, NULL, 0, + &version, sizeof(version), &temp, NULL); +#else + ioctl(kqemu_fd, KQEMU_GET_VERSION, &version); +#endif + if (version != KQEMU_VERSION) { + fprintf(stderr, "Version mismatch between kqemu module and qemu (%08x %08x) - disabling kqemu use\n", + version, KQEMU_VERSION); + goto fail; + } + + pages_to_flush = qemu_vmalloc(KQEMU_MAX_PAGES_TO_FLUSH * + sizeof(uint64_t)); + if (!pages_to_flush) + goto fail; + + ram_pages_to_update = qemu_vmalloc(KQEMU_MAX_RAM_PAGES_TO_UPDATE * + sizeof(uint64_t)); + if (!ram_pages_to_update) + goto fail; + + modified_ram_pages = qemu_vmalloc(KQEMU_MAX_MODIFIED_RAM_PAGES * + sizeof(uint64_t)); + if (!modified_ram_pages) + goto fail; + modified_ram_pages_table = qemu_mallocz(phys_ram_size >> TARGET_PAGE_BITS); + if (!modified_ram_pages_table) + goto fail; + + memset(&kinit, 0, sizeof(kinit)); /* set the paddings to zero */ + kinit.ram_base = phys_ram_base; + kinit.ram_size = phys_ram_size; + kinit.ram_dirty = phys_ram_dirty; + kinit.pages_to_flush = pages_to_flush; + kinit.ram_pages_to_update = ram_pages_to_update; + kinit.modified_ram_pages = modified_ram_pages; +#ifdef _WIN32 + ret = DeviceIoControl(kqemu_fd, KQEMU_INIT, &kinit, sizeof(kinit), + NULL, 0, &temp, NULL) == TRUE ? 0 : -1; +#else + ret = ioctl(kqemu_fd, KQEMU_INIT, &kinit); +#endif + if (ret < 0) { + fprintf(stderr, "Error %d while initializing QEMU acceleration layer - disabling it for now\n", ret); + fail: + kqemu_closefd(kqemu_fd); + kqemu_fd = KQEMU_INVALID_FD; + return -1; + } + kqemu_update_cpuid(env); + env->kqemu_enabled = kqemu_allowed; + nb_pages_to_flush = 0; + nb_ram_pages_to_update = 0; + + qpi_init(); + return 0; +} + +void kqemu_flush_page(CPUState *env, target_ulong addr) +{ + LOG_INT("kqemu_flush_page: addr=" TARGET_FMT_lx "\n", addr); + if (nb_pages_to_flush >= KQEMU_MAX_PAGES_TO_FLUSH) + nb_pages_to_flush = KQEMU_FLUSH_ALL; + else + pages_to_flush[nb_pages_to_flush++] = addr; +} + +void kqemu_flush(CPUState *env, int global) +{ + LOG_INT("kqemu_flush:\n"); + nb_pages_to_flush = KQEMU_FLUSH_ALL; +} + +void kqemu_set_notdirty(CPUState *env, ram_addr_t ram_addr) +{ + LOG_INT("kqemu_set_notdirty: addr=%08lx\n", + (unsigned long)ram_addr); + /* we only track transitions to dirty state */ + if (phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS] != 0xff) + return; + if (nb_ram_pages_to_update >= KQEMU_MAX_RAM_PAGES_TO_UPDATE) + nb_ram_pages_to_update = KQEMU_RAM_PAGES_UPDATE_ALL; + else + ram_pages_to_update[nb_ram_pages_to_update++] = ram_addr; +} + +static void kqemu_reset_modified_ram_pages(void) +{ + int i; + unsigned long page_index; + + for(i = 0; i < nb_modified_ram_pages; i++) { + page_index = modified_ram_pages[i] >> TARGET_PAGE_BITS; + modified_ram_pages_table[page_index] = 0; + } + nb_modified_ram_pages = 0; +} + +void kqemu_modify_page(CPUState *env, ram_addr_t ram_addr) +{ + unsigned long page_index; + int ret; +#ifdef _WIN32 + DWORD temp; +#endif + + page_index = ram_addr >> TARGET_PAGE_BITS; + if (!modified_ram_pages_table[page_index]) { +#if 0 + printf("%d: modify_page=%08lx\n", nb_modified_ram_pages, ram_addr); +#endif + modified_ram_pages_table[page_index] = 1; + modified_ram_pages[nb_modified_ram_pages++] = ram_addr; + if (nb_modified_ram_pages >= KQEMU_MAX_MODIFIED_RAM_PAGES) { + /* flush */ +#ifdef _WIN32 + ret = DeviceIoControl(kqemu_fd, KQEMU_MODIFY_RAM_PAGES, + &nb_modified_ram_pages, + sizeof(nb_modified_ram_pages), + NULL, 0, &temp, NULL); +#else + ret = ioctl(kqemu_fd, KQEMU_MODIFY_RAM_PAGES, + &nb_modified_ram_pages); +#endif + kqemu_reset_modified_ram_pages(); + } + } +} + +void kqemu_set_phys_mem(uint64_t start_addr, ram_addr_t size, + ram_addr_t phys_offset) +{ + struct kqemu_phys_mem kphys_mem1, *kphys_mem = &kphys_mem1; + uint64_t end; + int ret, io_index; + + end = (start_addr + size + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK; + start_addr &= TARGET_PAGE_MASK; + kphys_mem->phys_addr = start_addr; + kphys_mem->size = end - start_addr; + kphys_mem->ram_addr = phys_offset & TARGET_PAGE_MASK; + io_index = phys_offset & ~TARGET_PAGE_MASK; + switch(io_index) { + case IO_MEM_RAM: + kphys_mem->io_index = KQEMU_IO_MEM_RAM; + break; + case IO_MEM_ROM: + kphys_mem->io_index = KQEMU_IO_MEM_ROM; + break; + default: + if (qpi_io_memory == io_index) { + kphys_mem->io_index = KQEMU_IO_MEM_COMM; + } else { + kphys_mem->io_index = KQEMU_IO_MEM_UNASSIGNED; + } + break; + } +#ifdef _WIN32 + { + DWORD temp; + ret = DeviceIoControl(kqemu_fd, KQEMU_SET_PHYS_MEM, + kphys_mem, sizeof(*kphys_mem), + NULL, 0, &temp, NULL) == TRUE ? 0 : -1; + } +#else + ret = ioctl(kqemu_fd, KQEMU_SET_PHYS_MEM, kphys_mem); +#endif + if (ret < 0) { + fprintf(stderr, "kqemu: KQEMU_SET_PHYS_PAGE error=%d: start_addr=0x%016" PRIx64 " size=0x%08lx phys_offset=0x%08lx\n", + ret, start_addr, + (unsigned long)size, (unsigned long)phys_offset); + } +} + +struct fpstate { + uint16_t fpuc; + uint16_t dummy1; + uint16_t fpus; + uint16_t dummy2; + uint16_t fptag; + uint16_t dummy3; + + uint32_t fpip; + uint32_t fpcs; + uint32_t fpoo; + uint32_t fpos; + uint8_t fpregs1[8 * 10]; +}; + +struct fpxstate { + uint16_t fpuc; + uint16_t fpus; + uint16_t fptag; + uint16_t fop; + uint32_t fpuip; + uint16_t cs_sel; + uint16_t dummy0; + uint32_t fpudp; + uint16_t ds_sel; + uint16_t dummy1; + uint32_t mxcsr; + uint32_t mxcsr_mask; + uint8_t fpregs1[8 * 16]; + uint8_t xmm_regs[16 * 16]; + uint8_t dummy2[96]; +}; + +static struct fpxstate fpx1 __attribute__((aligned(16))); + +static void restore_native_fp_frstor(CPUState *env) +{ + int fptag, i, j; + struct fpstate fp1, *fp = &fp1; + + fp->fpuc = env->fpuc; + fp->fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11; + fptag = 0; + for (i=7; i>=0; i--) { + fptag <<= 2; + if (env->fptags[i]) { + fptag |= 3; + } else { + /* the FPU automatically computes it */ + } + } + fp->fptag = fptag; + j = env->fpstt; + for(i = 0;i < 8; i++) { + memcpy(&fp->fpregs1[i * 10], &env->fpregs[j].d, 10); + j = (j + 1) & 7; + } + asm volatile ("frstor %0" : "=m" (*fp)); +} + +static void save_native_fp_fsave(CPUState *env) +{ + int fptag, i, j; + uint16_t fpuc; + struct fpstate fp1, *fp = &fp1; + + asm volatile ("fsave %0" : : "m" (*fp)); + env->fpuc = fp->fpuc; + env->fpstt = (fp->fpus >> 11) & 7; + env->fpus = fp->fpus & ~0x3800; + fptag = fp->fptag; + for(i = 0;i < 8; i++) { + env->fptags[i] = ((fptag & 3) == 3); + fptag >>= 2; + } + j = env->fpstt; + for(i = 0;i < 8; i++) { + memcpy(&env->fpregs[j].d, &fp->fpregs1[i * 10], 10); + j = (j + 1) & 7; + } + /* we must restore the default rounding state */ + fpuc = 0x037f | (env->fpuc & (3 << 10)); + asm volatile("fldcw %0" : : "m" (fpuc)); +} + +static void restore_native_fp_fxrstor(CPUState *env) +{ + struct fpxstate *fp = &fpx1; + int i, j, fptag; + + fp->fpuc = env->fpuc; + fp->fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11; + fptag = 0; + for(i = 0; i < 8; i++) + fptag |= (env->fptags[i] << i); + fp->fptag = fptag ^ 0xff; + + j = env->fpstt; + for(i = 0;i < 8; i++) { + memcpy(&fp->fpregs1[i * 16], &env->fpregs[j].d, 10); + j = (j + 1) & 7; + } + if (env->cpuid_features & CPUID_SSE) { + fp->mxcsr = env->mxcsr; + /* XXX: check if DAZ is not available */ + fp->mxcsr_mask = 0xffff; + memcpy(fp->xmm_regs, env->xmm_regs, CPU_NB_REGS * 16); + } + asm volatile ("fxrstor %0" : "=m" (*fp)); +} + +static void save_native_fp_fxsave(CPUState *env) +{ + struct fpxstate *fp = &fpx1; + int fptag, i, j; + uint16_t fpuc; + + asm volatile ("fxsave %0" : : "m" (*fp)); + env->fpuc = fp->fpuc; + env->fpstt = (fp->fpus >> 11) & 7; + env->fpus = fp->fpus & ~0x3800; + fptag = fp->fptag ^ 0xff; + for(i = 0;i < 8; i++) { + env->fptags[i] = (fptag >> i) & 1; + } + j = env->fpstt; + for(i = 0;i < 8; i++) { + memcpy(&env->fpregs[j].d, &fp->fpregs1[i * 16], 10); + j = (j + 1) & 7; + } + if (env->cpuid_features & CPUID_SSE) { + env->mxcsr = fp->mxcsr; + memcpy(env->xmm_regs, fp->xmm_regs, CPU_NB_REGS * 16); + } + + /* we must restore the default rounding state */ + asm volatile ("fninit"); + fpuc = 0x037f | (env->fpuc & (3 << 10)); + asm volatile("fldcw %0" : : "m" (fpuc)); +} + +static int do_syscall(CPUState *env, + struct kqemu_cpu_state *kenv) +{ + int selector; + + selector = (env->star >> 32) & 0xffff; +#ifdef TARGET_X86_64 + if (env->hflags & HF_LMA_MASK) { + int code64; + + env->regs[R_ECX] = kenv->next_eip; + env->regs[11] = env->eflags; + + code64 = env->hflags & HF_CS64_MASK; + + cpu_x86_set_cpl(env, 0); + cpu_x86_load_seg_cache(env, R_CS, selector & 0xfffc, + 0, 0xffffffff, + DESC_G_MASK | DESC_P_MASK | + DESC_S_MASK | + DESC_CS_MASK | DESC_R_MASK | DESC_A_MASK | DESC_L_MASK); + cpu_x86_load_seg_cache(env, R_SS, (selector + 8) & 0xfffc, + 0, 0xffffffff, + DESC_G_MASK | DESC_B_MASK | DESC_P_MASK | + DESC_S_MASK | + DESC_W_MASK | DESC_A_MASK); + env->eflags &= ~env->fmask; + if (code64) + env->eip = env->lstar; + else + env->eip = env->cstar; + } else +#endif + { + env->regs[R_ECX] = (uint32_t)kenv->next_eip; + + cpu_x86_set_cpl(env, 0); + cpu_x86_load_seg_cache(env, R_CS, selector & 0xfffc, + 0, 0xffffffff, + DESC_G_MASK | DESC_B_MASK | DESC_P_MASK | + DESC_S_MASK | + DESC_CS_MASK | DESC_R_MASK | DESC_A_MASK); + cpu_x86_load_seg_cache(env, R_SS, (selector + 8) & 0xfffc, + 0, 0xffffffff, + DESC_G_MASK | DESC_B_MASK | DESC_P_MASK | + DESC_S_MASK | + DESC_W_MASK | DESC_A_MASK); + env->eflags &= ~(IF_MASK | RF_MASK | VM_MASK); + env->eip = (uint32_t)env->star; + } + return 2; +} + +#ifdef CONFIG_PROFILER + +#define PC_REC_SIZE 1 +#define PC_REC_HASH_BITS 16 +#define PC_REC_HASH_SIZE (1 << PC_REC_HASH_BITS) + +typedef struct PCRecord { + unsigned long pc; + int64_t count; + struct PCRecord *next; +} PCRecord; + +static PCRecord *pc_rec_hash[PC_REC_HASH_SIZE]; +static int nb_pc_records; + +static void kqemu_record_pc(unsigned long pc) +{ + unsigned long h; + PCRecord **pr, *r; + + h = pc / PC_REC_SIZE; + h = h ^ (h >> PC_REC_HASH_BITS); + h &= (PC_REC_HASH_SIZE - 1); + pr = &pc_rec_hash[h]; + for(;;) { + r = *pr; + if (r == NULL) + break; + if (r->pc == pc) { + r->count++; + return; + } + pr = &r->next; + } + r = malloc(sizeof(PCRecord)); + r->count = 1; + r->pc = pc; + r->next = NULL; + *pr = r; + nb_pc_records++; +} + +static int pc_rec_cmp(const void *p1, const void *p2) +{ + PCRecord *r1 = *(PCRecord **)p1; + PCRecord *r2 = *(PCRecord **)p2; + if (r1->count < r2->count) + return 1; + else if (r1->count == r2->count) + return 0; + else + return -1; +} + +static void kqemu_record_flush(void) +{ + PCRecord *r, *r_next; + int h; + + for(h = 0; h < PC_REC_HASH_SIZE; h++) { + for(r = pc_rec_hash[h]; r != NULL; r = r_next) { + r_next = r->next; + free(r); + } + pc_rec_hash[h] = NULL; + } + nb_pc_records = 0; +} + +void kqemu_record_dump(void) +{ + PCRecord **pr, *r; + int i, h; + FILE *f; + int64_t total, sum; + + pr = malloc(sizeof(PCRecord *) * nb_pc_records); + i = 0; + total = 0; + for(h = 0; h < PC_REC_HASH_SIZE; h++) { + for(r = pc_rec_hash[h]; r != NULL; r = r->next) { + pr[i++] = r; + total += r->count; + } + } + qsort(pr, nb_pc_records, sizeof(PCRecord *), pc_rec_cmp); + + f = fopen("/tmp/kqemu.stats", "w"); + if (!f) { + perror("/tmp/kqemu.stats"); + exit(1); + } + fprintf(f, "total: %" PRId64 "\n", total); + sum = 0; + for(i = 0; i < nb_pc_records; i++) { + r = pr[i]; + sum += r->count; + fprintf(f, "%08lx: %" PRId64 " %0.2f%% %0.2f%%\n", + r->pc, + r->count, + (double)r->count / (double)total * 100.0, + (double)sum / (double)total * 100.0); + } + fclose(f); + free(pr); + + kqemu_record_flush(); +} +#endif + +static inline void kqemu_load_seg(struct kqemu_segment_cache *ksc, + const SegmentCache *sc) +{ + ksc->selector = sc->selector; + ksc->flags = sc->flags; + ksc->limit = sc->limit; + ksc->base = sc->base; +} + +static inline void kqemu_save_seg(SegmentCache *sc, + const struct kqemu_segment_cache *ksc) +{ + sc->selector = ksc->selector; + sc->flags = ksc->flags; + sc->limit = ksc->limit; + sc->base = ksc->base; +} + +int kqemu_cpu_exec(CPUState *env) +{ + struct kqemu_cpu_state kcpu_state, *kenv = &kcpu_state; + int ret, cpl, i; +#ifdef CONFIG_PROFILER + int64_t ti; +#endif +#ifdef _WIN32 + DWORD temp; +#endif + +#ifdef CONFIG_PROFILER + ti = profile_getclock(); +#endif + LOG_INT("kqemu: cpu_exec: enter\n"); + LOG_INT_STATE(env); + for(i = 0; i < CPU_NB_REGS; i++) + kenv->regs[i] = env->regs[i]; + kenv->eip = env->eip; + kenv->eflags = env->eflags; + for(i = 0; i < 6; i++) + kqemu_load_seg(&kenv->segs[i], &env->segs[i]); + kqemu_load_seg(&kenv->ldt, &env->ldt); + kqemu_load_seg(&kenv->tr, &env->tr); + kqemu_load_seg(&kenv->gdt, &env->gdt); + kqemu_load_seg(&kenv->idt, &env->idt); + kenv->cr0 = env->cr[0]; + kenv->cr2 = env->cr[2]; + kenv->cr3 = env->cr[3]; + kenv->cr4 = env->cr[4]; + kenv->a20_mask = env->a20_mask; + kenv->efer = env->efer; + kenv->tsc_offset = 0; + kenv->star = env->star; + kenv->sysenter_cs = env->sysenter_cs; + kenv->sysenter_esp = env->sysenter_esp; + kenv->sysenter_eip = env->sysenter_eip; +#ifdef TARGET_X86_64 + kenv->lstar = env->lstar; + kenv->cstar = env->cstar; + kenv->fmask = env->fmask; + kenv->kernelgsbase = env->kernelgsbase; +#endif + if (env->dr[7] & 0xff) { + kenv->dr7 = env->dr[7]; + kenv->dr0 = env->dr[0]; + kenv->dr1 = env->dr[1]; + kenv->dr2 = env->dr[2]; + kenv->dr3 = env->dr[3]; + } else { + kenv->dr7 = 0; + } + kenv->dr6 = env->dr[6]; + cpl = (env->hflags & HF_CPL_MASK); + kenv->cpl = cpl; + kenv->nb_pages_to_flush = nb_pages_to_flush; + kenv->user_only = (env->kqemu_enabled == 1); + kenv->nb_ram_pages_to_update = nb_ram_pages_to_update; + nb_ram_pages_to_update = 0; + kenv->nb_modified_ram_pages = nb_modified_ram_pages; + + kqemu_reset_modified_ram_pages(); + + if (env->cpuid_features & CPUID_FXSR) + restore_native_fp_fxrstor(env); + else + restore_native_fp_frstor(env); + +#ifdef _WIN32 + if (DeviceIoControl(kqemu_fd, KQEMU_EXEC, + kenv, sizeof(struct kqemu_cpu_state), + kenv, sizeof(struct kqemu_cpu_state), + &temp, NULL)) { + ret = kenv->retval; + } else { + ret = -1; + } +#else + ioctl(kqemu_fd, KQEMU_EXEC, kenv); + ret = kenv->retval; +#endif + if (env->cpuid_features & CPUID_FXSR) + save_native_fp_fxsave(env); + else + save_native_fp_fsave(env); + + for(i = 0; i < CPU_NB_REGS; i++) + env->regs[i] = kenv->regs[i]; + env->eip = kenv->eip; + env->eflags = kenv->eflags; + for(i = 0; i < 6; i++) + kqemu_save_seg(&env->segs[i], &kenv->segs[i]); + cpu_x86_set_cpl(env, kenv->cpl); + kqemu_save_seg(&env->ldt, &kenv->ldt); + env->cr[0] = kenv->cr0; + env->cr[4] = kenv->cr4; + env->cr[3] = kenv->cr3; + env->cr[2] = kenv->cr2; + env->dr[6] = kenv->dr6; +#ifdef TARGET_X86_64 + env->kernelgsbase = kenv->kernelgsbase; +#endif + + /* flush pages as indicated by kqemu */ + if (kenv->nb_pages_to_flush >= KQEMU_FLUSH_ALL) { + tlb_flush(env, 1); + } else { + for(i = 0; i < kenv->nb_pages_to_flush; i++) { + tlb_flush_page(env, pages_to_flush[i]); + } + } + nb_pages_to_flush = 0; + +#ifdef CONFIG_PROFILER + kqemu_time += profile_getclock() - ti; + kqemu_exec_count++; +#endif + + if (kenv->nb_ram_pages_to_update > 0) { + cpu_tlb_update_dirty(env); + } + + if (kenv->nb_modified_ram_pages > 0) { + for(i = 0; i < kenv->nb_modified_ram_pages; i++) { + unsigned long addr; + addr = modified_ram_pages[i]; + tb_invalidate_phys_page_range(addr, addr + TARGET_PAGE_SIZE, 0); + } + } + + /* restore the hidden flags */ + { + unsigned int new_hflags; +#ifdef TARGET_X86_64 + if ((env->hflags & HF_LMA_MASK) && + (env->segs[R_CS].flags & DESC_L_MASK)) { + /* long mode */ + new_hflags = HF_CS32_MASK | HF_SS32_MASK | HF_CS64_MASK; + } else +#endif + { + /* legacy / compatibility case */ + new_hflags = (env->segs[R_CS].flags & DESC_B_MASK) + >> (DESC_B_SHIFT - HF_CS32_SHIFT); + new_hflags |= (env->segs[R_SS].flags & DESC_B_MASK) + >> (DESC_B_SHIFT - HF_SS32_SHIFT); + if (!(env->cr[0] & CR0_PE_MASK) || + (env->eflags & VM_MASK) || + !(env->hflags & HF_CS32_MASK)) { + /* XXX: try to avoid this test. The problem comes from the + fact that is real mode or vm86 mode we only modify the + 'base' and 'selector' fields of the segment cache to go + faster. A solution may be to force addseg to one in + translate-i386.c. */ + new_hflags |= HF_ADDSEG_MASK; + } else { + new_hflags |= ((env->segs[R_DS].base | + env->segs[R_ES].base | + env->segs[R_SS].base) != 0) << + HF_ADDSEG_SHIFT; + } + } + env->hflags = (env->hflags & + ~(HF_CS32_MASK | HF_SS32_MASK | HF_CS64_MASK | HF_ADDSEG_MASK)) | + new_hflags; + } + /* update FPU flags */ + env->hflags = (env->hflags & ~(HF_MP_MASK | HF_EM_MASK | HF_TS_MASK)) | + ((env->cr[0] << (HF_MP_SHIFT - 1)) & (HF_MP_MASK | HF_EM_MASK | HF_TS_MASK)); + if (env->cr[4] & CR4_OSFXSR_MASK) + env->hflags |= HF_OSFXSR_MASK; + else + env->hflags &= ~HF_OSFXSR_MASK; + + LOG_INT("kqemu: kqemu_cpu_exec: ret=0x%x\n", ret); + if (ret == KQEMU_RET_SYSCALL) { + /* syscall instruction */ + return do_syscall(env, kenv); + } else + if ((ret & 0xff00) == KQEMU_RET_INT) { + env->exception_index = ret & 0xff; + env->error_code = 0; + env->exception_is_int = 1; + env->exception_next_eip = kenv->next_eip; +#ifdef CONFIG_PROFILER + kqemu_ret_int_count++; +#endif + LOG_INT("kqemu: interrupt v=%02x:\n", env->exception_index); + LOG_INT_STATE(env); + return 1; + } else if ((ret & 0xff00) == KQEMU_RET_EXCEPTION) { + env->exception_index = ret & 0xff; + env->error_code = kenv->error_code; + env->exception_is_int = 0; + env->exception_next_eip = 0; +#ifdef CONFIG_PROFILER + kqemu_ret_excp_count++; +#endif + LOG_INT("kqemu: exception v=%02x e=%04x:\n", + env->exception_index, env->error_code); + LOG_INT_STATE(env); + return 1; + } else if (ret == KQEMU_RET_INTR) { +#ifdef CONFIG_PROFILER + kqemu_ret_intr_count++; +#endif + LOG_INT_STATE(env); + return 0; + } else if (ret == KQEMU_RET_SOFTMMU) { +#ifdef CONFIG_PROFILER + { + unsigned long pc = env->eip + env->segs[R_CS].base; + kqemu_record_pc(pc); + } +#endif + LOG_INT_STATE(env); + return 2; + } else { + cpu_dump_state(env, stderr, fprintf, 0); + fprintf(stderr, "Unsupported return value: 0x%x\n", ret); + exit(1); + } + return 0; +} + +void kqemu_cpu_interrupt(CPUState *env) +{ +#if defined(_WIN32) + /* cancelling the I/O request causes KQEMU to finish executing the + current block and successfully returning. */ + CancelIo(kqemu_fd); +#endif +} + +/* + QEMU paravirtualization interface. The current interface only + allows to modify the IF and IOPL flags when running in + kqemu. + + At this point it is not very satisfactory. I leave it for reference + as it adds little complexity. +*/ + +#define QPI_COMM_PAGE_PHYS_ADDR 0xff000000 + +static uint32_t qpi_mem_readb(void *opaque, target_phys_addr_t addr) +{ + return 0; +} + +static uint32_t qpi_mem_readw(void *opaque, target_phys_addr_t addr) +{ + return 0; +} + +static void qpi_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) +{ +} + +static void qpi_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val) +{ +} + +static uint32_t qpi_mem_readl(void *opaque, target_phys_addr_t addr) +{ + CPUState *env; + + env = cpu_single_env; + if (!env) + return 0; + return env->eflags & (IF_MASK | IOPL_MASK); +} + +/* Note: after writing to this address, the guest code must make sure + it is exiting the current TB. pushf/popf can be used for that + purpose. */ +static void qpi_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) +{ + CPUState *env; + + env = cpu_single_env; + if (!env) + return; + env->eflags = (env->eflags & ~(IF_MASK | IOPL_MASK)) | + (val & (IF_MASK | IOPL_MASK)); +} + +static CPUReadMemoryFunc *qpi_mem_read[3] = { + qpi_mem_readb, + qpi_mem_readw, + qpi_mem_readl, +}; + +static CPUWriteMemoryFunc *qpi_mem_write[3] = { + qpi_mem_writeb, + qpi_mem_writew, + qpi_mem_writel, +}; + +static void qpi_init(void) +{ + kqemu_comm_base = 0xff000000 | 1; + qpi_io_memory = cpu_register_io_memory(0, + qpi_mem_read, + qpi_mem_write, NULL); + cpu_register_physical_memory(kqemu_comm_base & ~0xfff, + 0x1000, qpi_io_memory); +} +#endif diff --git a/main/qemu/kqemu.patch b/main/qemu/kqemu.patch new file mode 100644 index 0000000000..337a356ce1 --- /dev/null +++ b/main/qemu/kqemu.patch @@ -0,0 +1,32 @@ +--- a/kqemu.c 2009-07-17 00:56:23.000000000 +0000 ++++ b/kqemu.c 2009-08-22 13:20:00.000000000 +0000 +@@ -93,9 +93,9 @@ + int qpi_io_memory; + uint32_t kqemu_comm_base; /* physical address of the QPI communication page */ + +-#define cpuid(index, eax, ebx, ecx, edx) \ ++#define cpuid(index, eax, ecx, edx) \ + asm volatile ("cpuid" \ +- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) \ ++ : "=a" (eax), "=c" (ecx), "=d" (edx) \ + : "0" (index)) + + #ifdef __x86_64__ +@@ -125,7 +125,7 @@ + static void kqemu_update_cpuid(CPUState *env) + { + int critical_features_mask, features, ext_features, ext_features_mask; +- uint32_t eax, ebx, ecx, edx; ++ uint32_t eax, ecx, edx; + + /* the following features are kept identical on the host and + target cpus because they are important for user code. Strictly +@@ -140,7 +140,7 @@ + features = 0; + ext_features = 0; + } else { +- cpuid(1, eax, ebx, ecx, edx); ++ cpuid(1, eax, ecx, edx); + features = edx; + ext_features = ecx; + } diff --git a/main/qemu/qemu-0.10.3-nopl-fix.patch b/main/qemu/qemu-0.10.3-nopl-fix.patch new file mode 100644 index 0000000000..bdef0efc35 --- /dev/null +++ b/main/qemu/qemu-0.10.3-nopl-fix.patch @@ -0,0 +1,32 @@ +--- i386-dis.c 2009-03-22 00:05:48.000000000 +0100 ++++ i386-dis_new.c 2009-04-21 08:31:08.000000000 +0200 +@@ -784,13 +784,13 @@ + { "movhpX", EX, XM, SIMD_Fixup, 'l' }, + /* 18 */ + { GRP14 }, +- { "(bad)", XX, XX, XX }, +- { "(bad)", XX, XX, XX }, +- { "(bad)", XX, XX, XX }, +- { "(bad)", XX, XX, XX }, +- { "(bad)", XX, XX, XX }, +- { "(bad)", XX, XX, XX }, +- { "(bad)", XX, XX, XX }, ++ { "nopQ", Ev, XX, XX }, ++ { "nopQ", Ev, XX, XX }, ++ { "nopQ", Ev, XX, XX }, ++ { "nopQ", Ev, XX, XX }, ++ { "nopQ", Ev, XX, XX }, ++ { "nopQ", Ev, XX, XX }, ++ { "nopQ", Ev, XX, XX }, + /* 20 */ + { "movL", Rm, Cm, XX }, + { "movL", Rm, Dm, XX }, +@@ -1072,7 +1072,7 @@ + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ + /* ------------------------------- */ + /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */ +- /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */ ++ /* 10 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 1f */ + /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */ + /* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */ + /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */ diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install new file mode 100644 index 0000000000..0119bacbea --- /dev/null +++ b/main/qemu/qemu.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +if ! getent group | grep -q "^kvm:"; then + addgroup kvm +fi + diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 6ce2b9265c..473322cf9b 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga -pkgver=0.99.15 -pkgrel=3 +pkgver=0.99.16 +pkgrel=0 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" license="GPL-2" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz $pkgname-0.99.11-link-libcap.patch $pkgname-0.99.11-del-routes.patch - quagga-revert-confed-check.patch bgpd.initd ospf6d.initd ospfd.initd @@ -67,10 +66,9 @@ package() { done install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra } -md5sums="8975414c76a295f4855a417af0b5ddce quagga-0.99.15.tar.gz +md5sums="350fb150be526cdfc4d2b093cb4d69a7 quagga-0.99.16.tar.gz 8f99d41a8ed79e51704e8f655d255f29 quagga-0.99.11-link-libcap.patch 1cbcf60a637b2577dee4d6df711e1247 quagga-0.99.11-del-routes.patch -9a9ad8ac543901f3eab6a6f2a914b69d quagga-revert-confed-check.patch ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd 92aba039c049050c48abf984c2db7e2b ospf6d.initd 878328ead225e6eb5f5f77f05ab39106 ospfd.initd diff --git a/main/quagga/quagga-revert-confed-check.patch b/main/quagga/quagga-revert-confed-check.patch deleted file mode 100644 index 3c76d1dd15..0000000000 --- a/main/quagga/quagga-revert-confed-check.patch +++ /dev/null @@ -1,97 +0,0 @@ -From b6c5e59e39e9513232c4e26faf30218e820f38a8 Mon Sep 17 00:00:00 2001 -From: Timo Teras <timo.teras@iki.fi> -Date: Thu, 8 Oct 2009 21:46:28 +0300 -Subject: [PATCH] Revert "bgpd: Implement BGP confederation error handling (RFC5065, Par. 5)" - -This reverts commit ca87e1d37b3c30648e9bacb476a3c89729512f6d. ---- - bgpd/bgp_aspath.c | 36 ------------------------------------ - bgpd/bgp_aspath.h | 2 -- - bgpd/bgp_attr.c | 11 ----------- - 3 files changed, 0 insertions(+), 49 deletions(-) - -diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c -index 440815b..e43d1f1 100644 ---- a/bgpd/bgp_aspath.c -+++ b/bgpd/bgp_aspath.c -@@ -1122,42 +1122,6 @@ aspath_private_as_check (struct aspath *aspath) - return 1; - } - --/* AS path confed check. If aspath contains confed set or sequence then return 1. */ --int --aspath_confed_check (struct aspath *aspath) --{ -- struct assegment *seg; -- -- if ( !(aspath && aspath->segments) ) -- return 0; -- -- seg = aspath->segments; -- -- while (seg) -- { -- if (seg->type == AS_CONFED_SET || seg->type == AS_CONFED_SEQUENCE) -- return 1; -- seg = seg->next; -- } -- return 0; --} -- --/* Leftmost AS path segment confed check. If leftmost AS segment is of type -- AS_CONFED_SEQUENCE or AS_CONFED_SET then return 1. */ --int --aspath_left_confed_check (struct aspath *aspath) --{ -- -- if ( !(aspath && aspath->segments) ) -- return 0; -- -- if ( (aspath->segments->type == AS_CONFED_SEQUENCE) -- || (aspath->segments->type == AS_CONFED_SET) ) -- return 1; -- -- return 0; --} -- - /* Merge as1 to as2. as2 should be uninterned aspath. */ - static struct aspath * - aspath_merge (struct aspath *as1, struct aspath *as2) -diff --git a/bgpd/bgp_aspath.h b/bgpd/bgp_aspath.h -index 9854d18..2b4625c 100644 ---- a/bgpd/bgp_aspath.h -+++ b/bgpd/bgp_aspath.h -@@ -88,8 +88,6 @@ extern unsigned int aspath_key_make (void *); - extern int aspath_loop_check (struct aspath *, as_t); - extern int aspath_private_as_check (struct aspath *); - extern int aspath_firstas_check (struct aspath *, as_t); --extern int aspath_confed_check (struct aspath *); --extern int aspath_left_confed_check (struct aspath *); - extern unsigned long aspath_count (void); - extern unsigned int aspath_count_hops (struct aspath *); - extern unsigned int aspath_count_confeds (struct aspath *); -diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c -index 5e7536a..0668e9a 100644 ---- a/bgpd/bgp_attr.c -+++ b/bgpd/bgp_attr.c -@@ -872,17 +872,6 @@ static int bgp_attr_aspath_check( struct peer *peer, - - bgp = peer->bgp; - -- /* Confederation sanity check. */ -- if ((peer_sort (peer) == BGP_PEER_CONFED && ! aspath_left_confed_check (attr->aspath)) || -- (peer_sort (peer) == BGP_PEER_EBGP && aspath_confed_check (attr->aspath))) -- { -- zlog (peer->log, LOG_ERR, "Malformed AS path from %s", peer->host); -- bgp_notify_send (peer, -- BGP_NOTIFY_UPDATE_ERR, -- BGP_NOTIFY_UPDATE_MAL_AS_PATH); -- return -1; -- } -- - /* First AS check for EBGP. */ - if (bgp != NULL && bgp_flag_check (bgp, BGP_FLAG_ENFORCE_FIRST_AS)) - { --- -1.6.0.4 - diff --git a/main/rarian/APKBUILD b/main/rarian/APKBUILD index 7649544905..4dcb23a7a9 100644 --- a/main/rarian/APKBUILD +++ b/main/rarian/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rarian pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper." url="http://rarian.freedesktop.org/" license="GPL" diff --git a/main/razor/APKBUILD b/main/razor/APKBUILD index a5dc72c69b..0489fcfdd7 100644 --- a/main/razor/APKBUILD +++ b/main/razor/APKBUILD @@ -3,11 +3,11 @@ pkgname=razor _realname=razor-agents pkgver=2.84 -pkgrel=0 +pkgrel=1 pkgdesc="Vipul's Razor is a distributed, collaborative spam detection and filtering network" url="http://razor.sourceforge.net/" license="Artistic" -depends="uclibc perl perl-digest-sha1 perl-getopt-long perl-uri-escape" +depends="perl perl-digest-sha1 perl-getopt-long perl-uri-escape" makedepends="perl-dev" install= subpackages="$pkgname-doc" diff --git a/main/rdesktop/APKBUILD b/main/rdesktop/APKBUILD index b705c0ffc0..c491e9901d 100644 --- a/main/rdesktop/APKBUILD +++ b/main/rdesktop/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rdesktop pkgver=1.6.0 -pkgrel=0 +pkgrel=3 pkgdesc="rdesktop is used to connect to windows terminal servers" url="http://www.rdesktop.org/" license="GPL" subpackages="$pkgname-doc" -depends="libx11 openssl libao libsamplerate" +depends= makedepends="libx11-dev libao-dev openssl-dev libsamplerate-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" @@ -16,6 +16,10 @@ build () ./configure --prefix=/usr \ --with-sound=ao make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } md5sums="c6fcbed7f0ad7e60ac5fcb2d324d8b16 rdesktop-1.6.0.tar.gz" diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD index 0c6caeede1..7ebf94deb4 100644 --- a/main/readline/APKBUILD +++ b/main/readline/APKBUILD @@ -4,7 +4,7 @@ pkgver=6.1.002 _myver=${pkgver%.*} _patchver=${pkgver##*.} _suff=${_myver%.*}${_myver#*.} -pkgrel=0 +pkgrel=1 pkgdesc="GNU readline library" url="ftp://ftp.cwru.edu/pub/bash/" license="GPL" diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD index 80db469e1a..67ff80659b 100644 --- a/main/remmina/APKBUILD +++ b/main/remmina/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=remmina pkgver=0.7.4 -pkgrel=0 +pkgrel=1 pkgdesc="Remmina is a remote desktop client written in GTK+" url="http://remmina.sourceforge.net/" license="GPL" diff --git a/main/rgb/APKBUILD b/main/rgb/APKBUILD index 73bbd8233b..15c8705591 100644 --- a/main/rgb/APKBUILD +++ b/main/rgb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rgb pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.org utility to display an rgb color-name database" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD index 4daa725939..28e77495ba 100644 --- a/main/ristretto/APKBUILD +++ b/main/ristretto/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ristretto pkgver=0.0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Ristretto is a image viewer for Xfce" url="http://goodies.xfce.org/projects/applications/ristretto" license="GPL-2" diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD index b35091fa2b..e91e0af400 100644 --- a/main/rrdtool/APKBUILD +++ b/main/rrdtool/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rrdtool pkgver=1.2.30 -pkgrel=1 +pkgrel=3 pkgdesc="Data logging and graphing application" url="http://www.rrdtool.org" license="GPL" depends= -makedepends="libart-lgpl-dev libpng-dev freetype-dev" -subpackages="$pkgname-dev $pkgname-doc" +makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev" +subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd" source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver @@ -15,8 +15,6 @@ build() { cd "$_builddir" ./configure --prefix=/usr \ --disable-tcl \ - --disable-perl \ - --disable-perl-site-install \ --disable-python \ --disable-ruby \ --disable-rrdcgi @@ -37,4 +35,10 @@ dev() { mv "$pkgdir"/usr/share/$pkgname/examples "$subpkgdir"/usr/share/$pkgname/ } +perl_rrd() { + pkgdesc="Perl interface for rrdtool" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/perl "$subpkgdir"/usr/lib/ +} + md5sums="19b24f7184a8dbf7b48c1bbb565ad9fb rrdtool-1.2.30.tar.gz" diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD index dcef2555a5..3ab1ce6073 100644 --- a/main/rsync/APKBUILD +++ b/main/rsync/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rsync pkgver=3.0.7 -pkgrel=0 +pkgrel=1 pkgdesc="A file transfer program to keep remote files in sync" url="http://samba.anu.edu.au/rsync/" license="GPL3" diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index e49c35a1aa..87063abdaf 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -3,19 +3,27 @@ pkgname=ruby pkgver=1.8.7_p174 _pkgver=1.8.7-p174 -pkgrel=3 +pkgrel=6 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/en/" license="Ruby" depends= makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev" subpackages="$pkgname-doc $pkgname-dev" -source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2" +source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2 + ruby-openssl-1.0.0.patch" # # maybe its a good idea to split dep libs to seperate pkg's. # + +_builddir="$srcdir/$pkgname-${_pkgver}" +prepare() { + cd "$_builddir" + patch -p0 -i "$srcdir"/ruby-openssl-1.0.0.patch +} + build() { - cd "$srcdir/$pkgname-${_pkgver}" + cd "$_builddir" # -fomit-frame-pointer makes ruby segfault, see gentoo bug #150413 # In many places aliasing rules are broken; play it safe @@ -24,7 +32,7 @@ build() { # turn off distcc/ccache # http://bugs.alpinelinux.org/issues/show/1 - export CC=cc + export CC=gcc ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \ --prefix=/usr \ @@ -36,10 +44,15 @@ build() { --with-extra-site-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \ --enable-shared make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1 } -md5sums="88c45aaf627b4404e5e4273cb03ba2ee ruby-1.8.7-p174.tar.bz2" +md5sums="88c45aaf627b4404e5e4273cb03ba2ee ruby-1.8.7-p174.tar.bz2 +3361f559a6b338b792ff4946a41708dd ruby-openssl-1.0.0.patch" diff --git a/main/ruby/ruby-openssl-1.0.0.patch b/main/ruby/ruby-openssl-1.0.0.patch new file mode 100644 index 0000000000..1ebded911e --- /dev/null +++ b/main/ruby/ruby-openssl-1.0.0.patch @@ -0,0 +1,167 @@ +diff -up ext/openssl/ossl.c.ossl10 ext/openssl/ossl.c +--- ext/openssl/ossl.c.ossl10 2007-02-13 00:01:19.000000000 +0100 ++++ ext/openssl/ossl.c 2009-08-26 12:29:41.000000000 +0200 +@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) + + #define OSSL_IMPL_SK2ARY(name, type) \ + VALUE \ +-ossl_##name##_sk2ary(STACK *sk) \ ++ossl_##name##_sk2ary(STACK_OF(type) *sk) \ + { \ + type *t; \ + int i, num; \ +@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \ + OSSL_Debug("empty sk!"); \ + return Qnil; \ + } \ +- num = sk_num(sk); \ ++ num = sk_##type##_num(sk); \ + if (num < 0) { \ + OSSL_Debug("items in sk < -1???"); \ + return rb_ary_new(); \ +@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \ + ary = rb_ary_new2(num); \ + \ + for (i=0; i<num; i++) { \ +- t = (type *)sk_value(sk, i); \ ++ t = sk_##type##_value(sk, i); \ + rb_ary_push(ary, ossl_##name##_new(t)); \ + } \ + return ary; \ +diff -up ext/openssl/ossl_pkcs7.c.ossl10 ext/openssl/ossl_pkcs7.c +--- ext/openssl/ossl_pkcs7.c.ossl10 2007-02-13 00:01:19.000000000 +0100 ++++ ext/openssl/ossl_pkcs7.c 2009-08-26 12:53:05.000000000 +0200 +@@ -543,12 +543,11 @@ ossl_pkcs7_add_certificate(VALUE self, V + return self; + } + +-static STACK * +-pkcs7_get_certs_or_crls(VALUE self, int want_certs) ++static STACK_OF(X509) * ++pkcs7_get_certs(VALUE self) + { + PKCS7 *pkcs7; + STACK_OF(X509) *certs; +- STACK_OF(X509_CRL) *crls; + int i; + + GetPKCS7(self, pkcs7); +@@ -556,17 +555,38 @@ pkcs7_get_certs_or_crls(VALUE self, int + switch(i){ + case NID_pkcs7_signed: + certs = pkcs7->d.sign->cert; +- crls = pkcs7->d.sign->crl; + break; + case NID_pkcs7_signedAndEnveloped: + certs = pkcs7->d.signed_and_enveloped->cert; ++ break; ++ default: ++ certs = NULL; ++ } ++ ++ return certs; ++} ++ ++static STACK_OF(X509_CRL) * ++pkcs7_get_crls(VALUE self) ++{ ++ PKCS7 *pkcs7; ++ STACK_OF(X509_CRL) *crls; ++ int i; ++ ++ GetPKCS7(self, pkcs7); ++ i = OBJ_obj2nid(pkcs7->type); ++ switch(i){ ++ case NID_pkcs7_signed: ++ crls = pkcs7->d.sign->crl; ++ break; ++ case NID_pkcs7_signedAndEnveloped: + crls = pkcs7->d.signed_and_enveloped->crl; + break; + default: +- certs = crls = NULL; ++ crls = NULL; + } + +- return want_certs ? certs : crls; ++ return crls; + } + + static VALUE +@@ -581,7 +601,7 @@ ossl_pkcs7_set_certificates(VALUE self, + STACK_OF(X509) *certs; + X509 *cert; + +- certs = pkcs7_get_certs_or_crls(self, 1); ++ certs = pkcs7_get_certs(self); + while((cert = sk_X509_pop(certs))) X509_free(cert); + rb_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self); + +@@ -591,7 +611,7 @@ ossl_pkcs7_set_certificates(VALUE self, + static VALUE + ossl_pkcs7_get_certificates(VALUE self) + { +- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); ++ return ossl_x509_sk2ary(pkcs7_get_certs(self)); + } + + static VALUE +@@ -621,7 +641,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar + STACK_OF(X509_CRL) *crls; + X509_CRL *crl; + +- crls = pkcs7_get_certs_or_crls(self, 0); ++ crls = pkcs7_get_crls(self); + while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); + rb_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self); + +@@ -631,7 +651,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar + static VALUE + ossl_pkcs7_get_crls(VALUE self) + { +- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); ++ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); + } + + static VALUE +diff -up ext/openssl/ossl_ssl.c.ossl10 ext/openssl/ossl_ssl.c +--- ext/openssl/ossl_ssl.c.ossl10 2007-03-12 05:12:32.000000000 +0100 ++++ ext/openssl/ossl_ssl.c 2009-08-26 12:08:48.000000000 +0200 +@@ -89,12 +89,18 @@ static char *ossl_sslctx_attrs[] = { + static char *ossl_ssl_attr_readers[] = { "io", "context", }; + static char *ossl_ssl_attrs[] = { "sync_close", }; + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define OSSL_MORE_CONST const ++#define STACK _STACK ++#else ++#define OSSL_MORE_CONST ++#endif + /* + * SSLContext class + */ + struct { + const char *name; +- SSL_METHOD *(*func)(void); ++ OSSL_MORE_CONST SSL_METHOD *(*func)(void); + } ossl_ssl_method_tab[] = { + #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method } + OSSL_SSL_METHOD_ENTRY(TLSv1), +@@ -407,7 +413,7 @@ ossl_sslctx_setup(VALUE self) + } + + static VALUE +-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher) ++ossl_ssl_cipher_to_ary(OSSL_MORE_CONST SSL_CIPHER *cipher) + { + VALUE ary; + int bits, alg_bits; +@@ -805,7 +811,7 @@ static VALUE + ossl_ssl_get_cipher(VALUE self) + { + SSL *ssl; +- SSL_CIPHER *cipher; ++ OSSL_MORE_CONST SSL_CIPHER *cipher; + + Data_Get_Struct(self, SSL, ssl); + if (!ssl) {
\ No newline at end of file diff --git a/main/run-parts/APKBUILD b/main/run-parts/APKBUILD index b501732368..5718d63419 100644 --- a/main/run-parts/APKBUILD +++ b/main/run-parts/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=run-parts pkgver=3.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="run-parts from the debianutils package" url="http://packages.qa.debian.org/d/debianutils.html" license="GPL" diff --git a/main/rxmtp/APKBUILD b/main/rxmtp/APKBUILD index 49cad696c1..c12214a400 100644 --- a/main/rxmtp/APKBUILD +++ b/main/rxmtp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=rxmtp pkgver=1.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Rewrite and eXchange smtp proxy" url="http://dev.alpinelinux.org/alpine/rxmtp" license="GPL" diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index f84662f88b..864ed9bedb 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=3.4.7 +pkgver=3.5.2 pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" @@ -13,11 +13,20 @@ source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz samba.initd samba.confd samba.logrotate + samba-uclibc-fstab.patch " pkggroups="winbind" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + patch -p1 -i "$i" || return 1 + done +} + build() { - cd "$srcdir"/$pkgname-$pkgver/source3 + cd "$_builddir"/source3 ./configure --prefix=/usr \ --sysconfdir=/etc/samba \ --with-configdir=/etc/samba \ @@ -38,7 +47,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver/source3 + cd "$_builddir"/source3 make DESTDIR="$pkgdir" install install -d "$pkgdir"/var/log/samba \ @@ -108,7 +117,8 @@ tdb() { usr/bin/tdb* } -md5sums="f5e11690d54466c143f4598bcce2a8bb samba-3.4.7.tar.gz +md5sums="6f8cf649207ccd8c2c17e28c335f4e9d samba-3.5.2.tar.gz c8a7f6ac5df2f73dbf023e25ea39927b samba.initd c150433426e18261e6e3eed3930e1a76 samba.confd -b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate" +b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate +811e5a3f570d0053cf27a73248be4ae6 samba-uclibc-fstab.patch" diff --git a/main/samba/samba-uclibc-fstab.patch b/main/samba/samba-uclibc-fstab.patch new file mode 100644 index 0000000000..3fdbc90308 --- /dev/null +++ b/main/samba/samba-uclibc-fstab.patch @@ -0,0 +1,15 @@ +--- ./client/mount.cifs.c.orig ++++ ./client/mount.cifs.c +@@ -39,7 +39,11 @@ + #include <mntent.h> + #include <fcntl.h> + #include <limits.h> +-#include <fstab.h> ++#if defined(__UCLIBC__) ++ #define _PATH_FSTAB "/etc/fstab" ++#else ++ #include <fstab.h> ++#endif + #include "mount.h" + + #define MOUNT_CIFS_VERSION_MAJOR "1" diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD index a8a04b1653..6b08e5fada 100644 --- a/main/screen/APKBUILD +++ b/main/screen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=screen pkgver=4.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="A window manager that multiplexes a physical terminal" url="http://ftp.gnu.org/gnu/screen/" license="GPL" diff --git a/main/scrot/APKBUILD b/main/scrot/APKBUILD index ee98edd623..ea6ac1b6a8 100644 --- a/main/scrot/APKBUILD +++ b/main/scrot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=scrot pkgver=0.8 -pkgrel=3 +pkgrel=4 pkgdesc="A simple command-line screenshot utility for X" url="http://linuxbrit.co.uk/scrot/" license="MIT" diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD index e81c806441..e98589b0a9 100644 --- a/main/sdl/APKBUILD +++ b/main/sdl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sdl pkgver=1.2.14 -pkgrel=0 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" url="http://www.libsdl.org" license="LGPL" diff --git a/main/sed/APKBUILD b/main/sed/APKBUILD index 99ba1e6f8b..b19f1f5e39 100644 --- a/main/sed/APKBUILD +++ b/main/sed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sed pkgver=4.2.1 -pkgrel=0 +pkgrel=1 subpackages="$pkgname-doc" pkgdesc="GNU stream editor" url="http://www.gnu.org/software/sed" diff --git a/main/sessreg/APKBUILD b/main/sessreg/APKBUILD index 4e1cba4e0d..237df93b18 100644 --- a/main/sessreg/APKBUILD +++ b/main/sessreg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sessreg pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="manage utmp/wtmp entries for non-init clients" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/setxkbmap/APKBUILD b/main/setxkbmap/APKBUILD index 2b8eb19b69..1a75ef885e 100644 --- a/main/setxkbmap/APKBUILD +++ b/main/setxkbmap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=setxkbmap pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="set the keyboard using the X Keyboard Extension" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/sfic/APKBUILD b/main/sfic/APKBUILD index 3f781b4dee..4c03890745 100644 --- a/main/sfic/APKBUILD +++ b/main/sfic/APKBUILD @@ -1,27 +1,34 @@ pkgdesc="Small and Simple File Integrity Checker" pkgname=sfic pkgver=0.1.7 -pkgrel=1 -depends=uclibc +pkgrel=2 +depends= license=GPL makedepends="autoconf automake samba-dev" -depends="tdb uclibc" -arch=i486 +depends= url=http://sfic.sourceforge.net source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-0.1.7-signal.patch" subpackages="$pkgname-doc" -build() { - cd $srcdir/$pkgname-$pkgver +prepare() { + cd "$srcdir"/$pkgname-$pkgver patch -p1 < ../$pkgname-0.1.7-signal.patch || return 1 aclocal autoconf automake --add-missing || return 1 +} + +build() { + cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" } diff --git a/main/shared-mime-info/APKBUILD b/main/shared-mime-info/APKBUILD index 81b8c5c622..5d1d200b0d 100644 --- a/main/shared-mime-info/APKBUILD +++ b/main/shared-mime-info/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=shared-mime-info pkgver=0.71 -pkgrel=0 +pkgrel=1 pkgdesc="Freedesktop.org Shared MIME Info" url="http://freedesktop.org/Software/shared-mime-info" license="GPL" diff --git a/main/sic/APKBUILD b/main/sic/APKBUILD index 72e197ea08..e95fd832c6 100644 --- a/main/sic/APKBUILD +++ b/main/sic/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sic pkgver=1.0 -pkgrel=0 +pkgrel=1 pkgdesc="an extremely simple IRC client" url="http://www.suckless.org/programs/sic.html" license="GPL" -depends="uclibc" +depends="" subpackages="$pkgname-doc" source="http://code.suckless.org/dl/tools/sic-$pkgver.tar.gz" diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD index 09b42e1b40..a74ca0e6fe 100644 --- a/main/slang/APKBUILD +++ b/main/slang/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slang pkgver=2.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="S-Lang is a powerful interpreted language" url="http://www.s-lang.org/" license="GPL" diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD index cf2e08f934..9f4cebe8c6 100644 --- a/main/slim/APKBUILD +++ b/main/slim/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slim pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc="Desktop-independent graphical login manager for X11" url="http://slim.berlios.de/" license="GPL-2" diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD index 15ac9717ac..f9fc94b412 100644 --- a/main/snort/APKBUILD +++ b/main/snort/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=snort pkgver=2.8.5.1 -pkgrel=0 +pkgrel=1 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" license="GPL" diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD index b821d56934..8164310261 100644 --- a/main/sntpc/APKBUILD +++ b/main/sntpc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sntpc pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Simple NTP client" url="http://git.alpinelinux.org/cgit/sntpc" license="GPL-2" diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD index 166d08b256..37b016a99d 100644 --- a/main/sox/APKBUILD +++ b/main/sox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sox -pkgver=14.3.0 -pkgrel=0 +pkgver=14.3.1 +pkgrel=1 pkgdesc="The Swiss Army knife of sound processing tools" url="http://sox.sourceforge.net/" license="GPL LGPL" @@ -23,6 +23,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dyn-default \ + --disable-nls \ --with-distro="Alpine Linux" || return 1 make || return 1 } @@ -33,5 +34,5 @@ package() { ln -sf play "$pkgdir"/usr/bin/rec || return 1 ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7 } -md5sums="8e3509804e6227273ef84092e1a2fea7 sox-14.3.0.tar.gz +md5sums="b99871c7bbae84feac9d0d1f010331ba sox-14.3.1.tar.gz d8267f718ba6b4fb2f48c5104af31364 sox-uclibc.patch" diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index 981994f5e4..97ec9e8aab 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -2,7 +2,7 @@ pkgname=spamassassin _realname=Mail-SpamAssassin pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="http://spamassassin.apache.org" license="Apache" diff --git a/main/spandsp/APKBUILD b/main/spandsp/APKBUILD index 87c855a40b..15372f476f 100644 --- a/main/spandsp/APKBUILD +++ b/main/spandsp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=spandsp pkgver=0.0.6_pre17 -pkgrel=0 +pkgrel=1 pkgdesc="SpanDSP is a library of DSP functions for telephony" url="http://www.soft-switch.org/installing-spandsp.html" license="GPL" diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD index 325e2b4a85..21d90fc6af 100644 --- a/main/sqlite/APKBUILD +++ b/main/sqlite/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=sqlite pkgver=3.6.22 -pkgrel=0 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" license="custom" diff --git a/main/squashfs-tools/APKBUILD b/main/squashfs-tools/APKBUILD index 8af448562f..f5ac12c8de 100644 --- a/main/squashfs-tools/APKBUILD +++ b/main/squashfs-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=squashfs-tools pkgver=4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license="GPL" diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index e0f6582fee..22e516527f 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD @@ -3,7 +3,7 @@ pkgname=squid pkgver=2.7.7 _ver=2.7.STABLE7 -pkgrel=3 +pkgrel=5 pkgdesc="A full-featured Web proxy cache server." url="http://www.squid-cache.org" install="squid.pre-install squid.pre-upgrade squid.post-install" diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD index 35af54e967..272022f432 100644 --- a/main/ssmtp/APKBUILD +++ b/main/ssmtp/APKBUILD @@ -3,7 +3,7 @@ pkgname=ssmtp pkgver=2.64 -pkgrel=1 +pkgrel=3 pkgdesc="Extremely simple MTA to get mail off the system to a mail hub" subpackages="$pkgname-doc" arch="" diff --git a/main/startup-notification/APKBUILD b/main/startup-notification/APKBUILD index 34f81011ec..c9414d4ec8 100644 --- a/main/startup-notification/APKBUILD +++ b/main/startup-notification/APKBUILD @@ -1,23 +1,27 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=startup-notification pkgver=0.10 -pkgrel=0 +pkgrel=2 pkgdesc="Monitor and display application startup" url="http://www.freedesktop.org" license="LGPL" subpackages="$pkgname-dev" -depends="libx11 libsm xcb-util" +depends= makedepends="libx11-dev libsm-dev xcb-util-dev" source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz" -build () -{ +depends_dev="libsm-dev xcb-util-dev" +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } md5sums="bca0ed1c74bc4e483ea2ed12a5717354 startup-notification-0.10.tar.gz" diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index d7a10cfd64..aed2236e4f 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=strace -pkgver=4.5.19 -pkgrel=1 +pkgver=4.5.20 +pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="http://sourceforge.net/projects/strace/" license="BSD" @@ -25,4 +25,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir" install } -md5sums="2415e435d61e40315a298c80aced0cda strace-4.5.19.tar.bz2" +md5sums="64dfe10d9db0c1e34030891695ffca4b strace-4.5.20.tar.bz2" diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index 6005c18825..e33abe6e6b 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.6.9 -pkgrel=0 +pkgrel=2 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" license="apache bsd" diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index 628d7589d9..b5d54fd034 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.7.2_p5 +pkgver=1.7.2_p6 _realver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" url="http://www.sudo.ws/sudo/" license='custom ISC' @@ -27,4 +27,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="398f584e831bd75b3c0179e28368c2a3 sudo-1.7.2p5.tar.gz" +md5sums="c4f1a43e8ba94f6bf06d2211442148c4 sudo-1.7.2p6.tar.gz" diff --git a/main/swfdec-mozilla/APKBUILD b/main/swfdec-mozilla/APKBUILD index b2409e8da5..6e3bd9895e 100644 --- a/main/swfdec-mozilla/APKBUILD +++ b/main/swfdec-mozilla/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=swfdec-mozilla pkgver=0.8.2 -pkgrel=0 +pkgrel=1 pkgdesc="free plugin for Mozilla browsers that uses the Swfdec library for playing SWF files" url="http://swfdec.freedesktop.org" license="LGPL" diff --git a/main/swfdec/APKBUILD b/main/swfdec/APKBUILD index 3225d0a463..8ab7488d95 100644 --- a/main/swfdec/APKBUILD +++ b/main/swfdec/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=swfdec pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="free library for decoding and rendering Flash animations" url="http://swfdec.freedesktop.org" license="LGPL" diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD index 3a2d470e5b..9be176bf65 100644 --- a/main/swig/APKBUILD +++ b/main/swig/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=swig pkgver=1.3.40 -pkgrel=0 +pkgrel=1 pkgdesc="SWIG is a compiler that makes it easy to integrate C and C++ code with scripting languages" url="http://www.swig.org/" license="custom" diff --git a/main/sylpheed/APKBUILD b/main/sylpheed/APKBUILD index 672279f2b5..5d7dc146ad 100644 --- a/main/sylpheed/APKBUILD +++ b/main/sylpheed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sylpheed pkgver=3.0.2 -pkgrel=0 +pkgrel=2 pkgdesc="Lightweight and user-friendly e-mail client" url="http://sylpheed.sraoss.jp/en/" license="GPL" diff --git a/main/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD index e462aec705..1f910b148c 100644 --- a/main/sysfsutils/APKBUILD +++ b/main/sysfsutils/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sysfsutils pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="System Utilities Based on Sysfs" url="http://linux-diag.sourceforge.net/Sysfsutils.html" license="GPL LGPL" -depends="uclibc" +depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="http://downloads.sourceforge.net/sourceforge/linux-diag/$pkgname-$pkgver.tar.gz" diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD index 33dde41e43..681ac7d890 100644 --- a/main/sysklogd/APKBUILD +++ b/main/sysklogd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sysklogd pkgver=1.5 -pkgrel=4 +pkgrel=5 pkgdesc="System and kernel log daemons" url="http://www.infodrom.org/projects/sysklogd/" license="GPL BSD" diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index e543f31f6e..739e99558f 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,28 +1,33 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux -pkgver=3.85 -pkgrel=0 +pkgver=3.86 +pkgrel=1 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." url="http://syslinux.org" license="GPL" makedepends="nasm perl" depends="mtools" source="http://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.bz2 - $pkgname-3.72-nopie.patch + $pkgname-3.86-nopie.patch " subpackages="$pkgname-doc" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p1 < ../$pkgname-3.86-nopie.patch || return 1 +} + build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 < ../$pkgname-3.72-nopie.patch || return 1 + cd "$_builddir" unset LDFLAGS make installer || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install } -md5sums="416e64e3e9b1f838e393c809ff83e792 syslinux-3.85.tar.bz2 -c08398d165d29e48711e55058e2897de syslinux-3.72-nopie.patch" +md5sums="d6fb0231e82190b4932b2aa20274911a syslinux-3.86.tar.bz2 +5852d62ba0772cf967156a75451e6066 syslinux-3.86-nopie.patch" diff --git a/main/syslinux/syslinux-3.72-nopie.patch b/main/syslinux/syslinux-3.72-nopie.patch deleted file mode 100644 index 2662d17b43..0000000000 --- a/main/syslinux/syslinux-3.72-nopie.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/com32/MCONFIG b/com32/MCONFIG ---- a/com32/MCONFIG 2008-09-26 01:46:02.000000000 +0200 -+++ b/com32/MCONFIG 2008-10-28 16:10:16.107964907 +0100 -@@ -19,6 +19,8 @@ - GCCOPT := $(call gcc_ok,-std=gnu99,) \ - $(call gcc_ok,-m32,) \ - $(call gcc_ok,-fno-stack-protector,) \ -+ $(call gcc_ok,-nopie,) \ -+ $(call gcc_ok,-fno-pie,) \ - -mregparm=3 -DREGPARM=3 -march=i386 -Os - - com32 = $(topdir)/com32 diff --git a/main/syslinux/syslinux-3.86-nopie.patch b/main/syslinux/syslinux-3.86-nopie.patch new file mode 100644 index 0000000000..262a4c15ca --- /dev/null +++ b/main/syslinux/syslinux-3.86-nopie.patch @@ -0,0 +1,11 @@ +--- ./com32/MCONFIG.orig ++++ ./com32/MCONFIG +@@ -25,6 +25,8 @@ + $(call gcc_ok,-falign-loops=0,-malign-loops=0) \ + $(call gcc_ok,-mpreferred-stack-boundary=2,) \ + $(call gcc_ok,-mincoming-stack-boundary=2,) \ ++ $(call gcc_ok,-nopie,) \ ++ $(call gcc_ok,-fno-pie,) \ + -march=i386 -Os -fomit-frame-pointer -mregparm=3 -DREGPARM=3 + + com32 = $(topdir)/com32 diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD index 7ec00676d0..f78fc6e6f2 100644 --- a/main/sysstat/APKBUILD +++ b/main/sysstat/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sysstat pkgver=9.0.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Performance monitoring tools for Linux" url="http://pagesperso-orange.fr/sebastien.godard/" license="GPL" diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD index 66b82a8320..d449276825 100644 --- a/main/taglib/APKBUILD +++ b/main/taglib/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=taglib -pkgver=1.6.1 +pkgver=1.6.3 pkgrel=0 pkgdesc="library for reading and editing the meta-data of several popular audio formats." url="http://ktown.kde.org/~wheeler/taglib.html" @@ -21,4 +21,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="db0502b3c3448ff1f1f9b090c1daa5f7 taglib-1.6.1.tar.gz" +md5sums="ddf02f4e1d2dc30f76734df806e613eb taglib-1.6.3.tar.gz" diff --git a/main/tar/APKBUILD b/main/tar/APKBUILD index fed2453b58..994adaef43 100644 --- a/main/tar/APKBUILD +++ b/main/tar/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=tar pkgver=1.23 -pkgrel=0 +pkgrel=1 pkgdesc="Utility used to store, backup, and transport files" url="http://www.gnu.org" license='GPL' diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD index d815acdd5a..6b724f9cc2 100644 --- a/main/tcl/APKBUILD +++ b/main/tcl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=tcl pkgver=8.5.8 -pkgrel=0 +pkgrel=1 pkgdesc="The Tcl scripting language" url="http://tcl.sourceforge.net/" license="custom" diff --git a/main/tcpdump/APKBUILD b/main/tcpdump/APKBUILD index ad9f5323f4..5a1efbdd57 100644 --- a/main/tcpdump/APKBUILD +++ b/main/tcpdump/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tcpdump -pkgver=4.0.0 +pkgver=4.1.1 pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" license="BSD" -depends="libpcap openssl" +depends= makedepends="libpcap-dev openssl-dev" source="http://www.$pkgname.org/release/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" @@ -17,8 +17,12 @@ build () --mandir=/usr/share/man \ --enable-ipv6 make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -md5sums="b22ca72890df2301d922c9f2d17867f9 tcpdump-4.0.0.tar.gz" +md5sums="d0dd58bbd6cd36795e05c6f1f74420b0 tcpdump-4.1.1.tar.gz" diff --git a/main/tcpproxy/APKBUILD b/main/tcpproxy/APKBUILD index a06aacb39a..9b2273a3f6 100644 --- a/main/tcpproxy/APKBUILD +++ b/main/tcpproxy/APKBUILD @@ -2,7 +2,7 @@ pkgname=tcpproxy pkgver=2.0.0_beta15 _realver=2.0.0-beta15 -pkgrel=0 +pkgrel=1 pkgdesc="Transparent TCP Proxy" url="http://www.quietsche-entchen.de/cgi-bin/wiki.cgi/proxies/TcpProxy" license="GPL" diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD index d4db8897d7..620d3535de 100644 --- a/main/terminal/APKBUILD +++ b/main/terminal/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=terminal -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=0 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" url="http://www.xfce.org/projects/terminal/" @@ -28,4 +28,4 @@ package() { cd "$srcdir"/Terminal-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="eba7da9acca699d168f4cc11ee9ed7a9 Terminal-0.4.4.tar.bz2" +md5sums="3c707628e2e97c6d9566cd74d400036a Terminal-0.4.5.tar.bz2" diff --git a/main/texinfo/APKBUILD b/main/texinfo/APKBUILD index a8484bf43b..ad4be84c3b 100644 --- a/main/texinfo/APKBUILD +++ b/main/texinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=texinfo pkgver=4.13a -pkgrel=1 +pkgrel=2 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" url="http://www.gnu.org/software/texinfo/" license='GPL3' diff --git a/main/tftpd-hpa/APKBUILD b/main/tftpd-hpa/APKBUILD index c507e2f68c..c2a3e349e8 100644 --- a/main/tftpd-hpa/APKBUILD +++ b/main/tftpd-hpa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tftp-hpa pkgver=5.0 -pkgrel=0 +pkgrel=1 pkgdesc="Official tftp server" url="http://www.kernel.org/pub/software/network/tftp/" license="BSD" diff --git a/main/thunar-archive-plugin/APKBUILD b/main/thunar-archive-plugin/APKBUILD index 87162bbf0c..6e5f899905 100644 --- a/main/thunar-archive-plugin/APKBUILD +++ b/main/thunar-archive-plugin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=thunar-archive-plugin pkgver=0.2.4 -pkgrel=0 +pkgrel=1 pkgdesc="create and deflate archives in thunar" url="http://xfce-goodies.berlios.de/" license="GPL2" diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD index f99a041026..7dcc1b2964 100644 --- a/main/thunar/APKBUILD +++ b/main/thunar/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=thunar -pkgver=1.0.1 -pkgrel=6 +pkgver=1.0.2 +pkgrel=1 pkgdesc="File manager for Xfce" url="http://thunar.xfce.org" license="GPL2 LGPL2" @@ -11,15 +11,13 @@ makedepends="pkgconfig libexif-dev xfce4-panel-dev exo-dev pcre-dev intltool gettext-dev libiconv-dev expat-dev startup-notification-dev libsm-dev e2fsprogs-dev gamin-dev libexif-dev jpeg-dev" install= -source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2 - libpng-1.4.patch" +source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2" -depends_dev="exo-dev glib-dev gamin-dev jpeg-dev" +depends_dev="exo-dev glib-dev gamin-dev jpeg-dev startup-notification-dev" _builddir="$srcdir"/Thunar-$pkgver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/libpng-1.4.patch } build() { @@ -41,5 +39,4 @@ package() { sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop } -md5sums="218373aa45d74b6ba8c69c4d5af3bb19 Thunar-1.0.1.tar.bz2 -ee998c20ba13d0cb18741da8b7d67328 libpng-1.4.patch" +md5sums="c91073202d373a1f9951a1240083c36d Thunar-1.0.2.tar.bz2" diff --git a/main/thunar/libpng-1.4.patch b/main/thunar/libpng-1.4.patch deleted file mode 100644 index 7f38165f77..0000000000 --- a/main/thunar/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c ---- Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:31:35.000000000 -0500 -+++ Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:34:51.000000000 -0500 -@@ -1169,7 +1169,7 @@ - goto done0; - - /* verify the png signature */ -- if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature)))) -+ if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature)))) - rewind (fp); - else - goto done0; diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD index 4b34846518..c13e26a46b 100644 --- a/main/tiff/APKBUILD +++ b/main/tiff/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tiff pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Provides support for the Tag Image File Format or TIFF" url="http://www.libtiff.org/" license="GPL" diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD index 5a60c10635..9489bd1a2e 100644 --- a/main/tinyproxy/APKBUILD +++ b/main/tinyproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tinyproxy pkgver=1.6.5 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight HTTP proxy" pkgusers="tinyproxy" pkggroups="tinyproxy" diff --git a/main/tmux/APKBUILD b/main/tmux/APKBUILD index e2720843ff..fd3a8883c5 100644 --- a/main/tmux/APKBUILD +++ b/main/tmux/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tmux pkgver=1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to control multiple terminals from a single terminal" url="http://tmux.sourceforge.net/" license="BSD" diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 7bd64c5efa..1e8f07b85b 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD @@ -1,7 +1,7 @@ # Maintainer:Carlo Landmeter pkgname=transmission pkgver=1.74 -pkgel=1 +pkgrel=2 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" install="$pkgname.pre-install" @@ -20,6 +20,10 @@ build() { ./configure --prefix=/usr \ --mandir=/usr/share/man make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/main/ucarp/APKBUILD b/main/ucarp/APKBUILD index a40d99f279..f785f2d77e 100644 --- a/main/ucarp/APKBUILD +++ b/main/ucarp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=ucarp pkgver=1.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Share common IP and do fail over" url="http://www.ucarp.org" license="GPL" diff --git a/main/uclibc++/APKBUILD b/main/uclibc++/APKBUILD index 6a40ba5493..e4e9667f1d 100644 --- a/main/uclibc++/APKBUILD +++ b/main/uclibc++/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uclibc++ pkgver=0.2.2 -pkgrel=5 +pkgrel=6 pkgdesc="Embedded C++ library" url="http://cxx.uclibc.org/" license='GPL-2' diff --git a/main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch b/main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch deleted file mode 100644 index 6dd7b17cbb..0000000000 --- a/main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch +++ /dev/null @@ -1,115 +0,0 @@ -From ab443685d9f923afcdfb9fbb071a293b53aa3c40 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <natanael.copa@gmail.com> -Date: Sun, 13 Sep 2009 09:53:09 +0000 -Subject: [PATCH] Add dn_skipname() from OpenBSD - -dn_skipname() is needed by a few applications like yate, wine, kde and -probably more. ---- - libresolv/resolv.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 85 insertions(+), 0 deletions(-) - -diff --git a/libresolv/resolv.c b/libresolv/resolv.c -index 38b10ff..c55046d 100644 ---- a/libresolv/resolv.c -+++ b/libresolv/resolv.c -@@ -7,7 +7,9 @@ - * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ - -+#include <sys/types.h> - #include <features.h> -+#include <resolv.h> - - void __stub1(void); - void __stub1(void) -@@ -16,3 +18,86 @@ void __stub1(void) - } - link_warning (__stub1, "the `libresolv' library is a stub. Do you really need it?") - -+/* taken from OpenBSD source */ -+/* -+ * ++Copyright++ 1985, 1993 -+ * - -+ * Copyright (c) 1985, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * - -+ * Portions Copyright (c) 1993 by Digital Equipment Corporation. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies, and that -+ * the name of Digital Equipment Corporation not be used in advertising or -+ * publicity pertaining to distribution of the document or software without -+ * specific, written prior permission. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ * - -+ * --Copyright-- -+ */ -+ -+/* -+ * Skip over a compressed domain name. Return the size or -1. -+ */ -+int -+__dn_skipname(const u_char *comp_dn, const u_char *eom) -+{ -+ const u_char *cp; -+ int n; -+ -+ cp = comp_dn; -+ while (cp < eom && (n = *cp++)) { -+ /* -+ * check for indirection -+ */ -+ switch (n & INDIR_MASK) { -+ case 0: /* normal case, n == len */ -+ cp += n; -+ continue; -+ case INDIR_MASK: /* indirection */ -+ cp++; -+ break; -+ default: /* illegal type */ -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) -+ return (-1); -+ return (cp - comp_dn); -+} -+ --- -1.6.4.2 - diff --git a/main/uclibc/0001-avr32-add-varargs-handling-of-prctl-syscall.patch b/main/uclibc/0001-avr32-add-varargs-handling-of-prctl-syscall.patch deleted file mode 100644 index 79676958c7..0000000000 --- a/main/uclibc/0001-avr32-add-varargs-handling-of-prctl-syscall.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 85bc04d5436ca6c8a30a1ad28862260a04b8b3d5 Mon Sep 17 00:00:00 2001 -From: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> -Date: Wed, 16 Dec 2009 13:16:08 +0100 -Subject: [PATCH 1/9] avr32: add varargs handling of prctl syscall - -prctl is defined to use varargs in the header file, hence it needs varargs -specific handling in the source. This patch properly handles the variodic -argument before the syscall is passed to the kernel for the AVR32 architecture. - -Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> ---- - libc/sysdeps/linux/avr32/Makefile.arch | 2 +- - libc/sysdeps/linux/avr32/prctl.c | 36 ++++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+), 1 deletions(-) - create mode 100644 libc/sysdeps/linux/avr32/prctl.c - -diff --git a/libc/sysdeps/linux/avr32/Makefile.arch b/libc/sysdeps/linux/avr32/Makefile.arch -index bc5f625..98b85a7 100644 ---- a/libc/sysdeps/linux/avr32/Makefile.arch -+++ b/libc/sysdeps/linux/avr32/Makefile.arch -@@ -5,7 +5,7 @@ - # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - # - --CSRC := brk.c clone.c mmap.c sigaction.c -+CSRC := brk.c clone.c mmap.c prctl.c sigaction.c - - SSRC := __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ - sigrestorer.S syscall.S vfork.S -diff --git a/libc/sysdeps/linux/avr32/prctl.c b/libc/sysdeps/linux/avr32/prctl.c -new file mode 100644 -index 0000000..4e146e3 ---- /dev/null -+++ b/libc/sysdeps/linux/avr32/prctl.c -@@ -0,0 +1,36 @@ -+/* -+ * prctl syscall for AVR32 Linux. -+ * -+ * Copyright (C) 2010 Atmel Corporation -+ * -+ * This file is subject to the terms and conditions of the GNU Lesser General -+ * Public License. See the file "COPYING.LIB" in the main directory of this -+ * archive for more details. -+ */ -+#include <sys/syscall.h> -+#include <sys/prctl.h> -+#include <stdarg.h> -+ -+#ifdef __NR_prctl -+#define __NR___syscall_prctl __NR_prctl -+static inline _syscall5(int, __syscall_prctl, int, option, long, arg2, -+ long, arg3, long, arg4, long, arg5); -+ -+int prctl(int __option, ...) -+{ -+ long arg2; -+ long arg3; -+ long arg4; -+ long arg5; -+ va_list ap; -+ -+ va_start(ap, __option); -+ arg2 = va_arg(ap, long); -+ arg3 = va_arg(ap, long); -+ arg4 = va_arg(ap, long); -+ arg5 = va_arg(ap, long); -+ va_end(ap); -+ -+ return INLINE_SYSCALL(prctl, 5, __option, arg2, arg3, arg4, arg5); -+} -+#endif --- -1.6.6.1 - diff --git a/main/uclibc/0002-Make-use-of-macros-from-sys-asm.h-in-crt1.S.patch b/main/uclibc/0002-Make-use-of-macros-from-sys-asm.h-in-crt1.S.patch deleted file mode 100644 index 9f04a3ae6e..0000000000 --- a/main/uclibc/0002-Make-use-of-macros-from-sys-asm.h-in-crt1.S.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 2911103dd4a03bbd3aad11eddfce524a5c9ba9b3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 22 Jan 2010 13:00:20 +0100 -Subject: [PATCH 2/9] Make use of macros from sys/asm.h in crt1.S - -Needed for mips nptl to boot once again. -(cherry picked from commit 9c343fd4030dcd7a52616f365893177dded50346) - -Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> ---- - libc/sysdeps/linux/mips/crt1.S | 46 +++++++++++---------------------------- - 1 files changed, 13 insertions(+), 33 deletions(-) - -diff --git a/libc/sysdeps/linux/mips/crt1.S b/libc/sysdeps/linux/mips/crt1.S -index e851d52..6a80412 100644 ---- a/libc/sysdeps/linux/mips/crt1.S -+++ b/libc/sysdeps/linux/mips/crt1.S -@@ -85,29 +85,10 @@ - - __start: - #ifdef __PIC__ --#if _MIPS_SIM == _MIPS_SIM_ABI32 -- .frame sp, 24, sp -- .set noreorder -- move $0, $31 /* Save old ra. */ -- bal 10f /* Find addr of cpload. */ -- nop --10: -- .cpload $31 -- move $31, $0 -- .set reorder -- .cprestore 16 --#else -- move $0, $31; /* Save old ra. */ -- .set noreorder -- bal 10f /* Find addr of .cpsetup. */ -- nop --10: -- .set reorder -- .cpsetup $31, $25, 10b -- move $31, $0 --#endif -+ SETUP_GPX($0) -+ SETUP_GPX64($25,$0) - #else -- la $28, _gp /* Setup GP correctly if we're non-PIC. */ -+ PTR_LA $28, _gp /* Setup GP correctly if we're non-PIC. */ - move $31, $0 - #endif - -@@ -118,18 +99,18 @@ __start: - /* Allocate space on the stack for seven arguments and - * make sure the stack is aligned to double words (8 bytes) */ - -+ and $29, -2 * SZREG -+ - #if _MIPS_SIM == _MIPS_SIM_ABI32 -- and $29, -2 * 4 -- subu $29, 32 -- la $7, _init /* init */ -- la $8, _fini -- sw $8, 16($29) /* fini */ -- sw $2, 20($29) /* rtld_fini */ -- sw $29, 24($29) /* stack_end */ --#else -- and $29, -2 * PTRSIZE -+ PTR_SUBIU $29, 32 -+#endif - PTR_LA $7, _init /* init */ -- PTR_LA $8, _fini /* fini */ -+ PTR_LA $8, _fini -+#if _MIPS_SIM == _MIPS_SIM_ABI32 -+ PTR_S $8, 16($29) /* fini */ -+ PTR_S $2, 20($29) /* rtld_fini */ -+ PTR_S $29, 24($29) /* stack_end */ -+#else - move $9, $2 /* rtld_fini */ - move $10, $29 /* stack_end */ - #endif -@@ -148,4 +129,3 @@ __data_start: - .weak data_start - data_start = __data_start - -- --- -1.6.6.1 - diff --git a/main/uclibc/0003-rpc-fix-typo-in-version-mismatch-msg.patch b/main/uclibc/0003-rpc-fix-typo-in-version-mismatch-msg.patch deleted file mode 100644 index cb0826c63e..0000000000 --- a/main/uclibc/0003-rpc-fix-typo-in-version-mismatch-msg.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 83a09cd5c9ed9afd87a7d1d17319c2fd2203ad0f Mon Sep 17 00:00:00 2001 -From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> -Date: Thu, 21 Jan 2010 10:36:13 +0100 -Subject: [PATCH 3/9] rpc: fix typo in version mismatch msg - -Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> ---- - libc/inet/rpc/rpc_prot.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c -index 74658e6..229f988 100644 ---- a/libc/inet/rpc/rpc_prot.c -+++ b/libc/inet/rpc/rpc_prot.c -@@ -229,7 +229,7 @@ rejected (enum reject_stat rjct_stat, - { - switch (rjct_stat) - { -- case RPC_VERSMISMATCH: -+ case RPC_MISMATCH: - error->re_status = RPC_VERSMISMATCH; - return; - case AUTH_ERROR: --- -1.6.6.1 - diff --git a/main/uclibc/0004-fix-make-install_-host-utils.patch b/main/uclibc/0004-fix-make-install_-host-utils.patch deleted file mode 100644 index f5a5a95872..0000000000 --- a/main/uclibc/0004-fix-make-install_-host-utils.patch +++ /dev/null @@ -1,158 +0,0 @@ -From d75ad2e129b3f22296cead3db53c784527deab60 Mon Sep 17 00:00:00 2001 -From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> -Date: Fri, 18 Sep 2009 16:07:31 +0200 -Subject: [PATCH 4/9] fix make {,install_}{,host}utils - -Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> ---- - extra/locale/programs/locale.c | 3 +- - libc/misc/wchar/wchar.c | 88 +++++++++++++++++++++------------------- - 2 files changed, 47 insertions(+), 44 deletions(-) - -diff --git a/extra/locale/programs/locale.c b/extra/locale/programs/locale.c -index 462a579..dfd2029 100644 ---- a/extra/locale/programs/locale.c -+++ b/extra/locale/programs/locale.c -@@ -10,10 +10,9 @@ - * - */ - -- -+#include <string.h> - #include <stdio.h> - #include <stdlib.h> --#include <string.h> - #include <langinfo.h> - #include <unistd.h> - #ifdef __UCLIBC_HAS_GETOPT_LONG__ -diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c -index 290e680..3ce884d 100644 ---- a/libc/misc/wchar/wchar.c -+++ b/libc/misc/wchar/wchar.c -@@ -171,7 +171,6 @@ extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn, - - extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n, - const wchar_t **__restrict src, size_t wn) attribute_hidden; -- - #endif /* _LIBC */ - /**********************************************************************/ - #ifdef L_btowc -@@ -1201,45 +1200,6 @@ typedef struct { - int skip_invalid_input; /* To support iconv -c option. */ - } _UC_iconv_t; - -- -- --#ifdef L_iconv -- --#include <iconv.h> --#include <string.h> --#include <endian.h> --#include <byteswap.h> -- --#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN) --#error unsupported endianness for iconv --#endif -- --#ifndef __CTYPE_HAS_8_BIT_LOCALES --#error currently iconv requires 8 bit locales --#endif --#ifndef __CTYPE_HAS_UTF_8_LOCALES --#error currently iconv requires UTF-8 locales --#endif -- -- --enum { -- IC_WCHAR_T = 0xe0, -- IC_MULTIBYTE = 0xe0, --#if __BYTE_ORDER == __BIG_ENDIAN -- IC_UCS_4 = 0xec, -- IC_UTF_32 = 0xe4, -- IC_UCS_2 = 0xe2, -- IC_UTF_16 = 0xea, --#else -- IC_UCS_4 = 0xed, -- IC_UTF_32 = 0xe5, -- IC_UCS_2 = 0xe3, -- IC_UTF_16 = 0xeb, --#endif -- IC_UTF_8 = 2, -- IC_ASCII = 1 --}; -- - /* For the multibyte - * bit 0 means swap endian - * bit 1 means 2 byte -@@ -1247,8 +1207,13 @@ enum { - * - */ - -+#if defined L_iconv && defined _LIBC -+/* Used externally only by iconv utility */ - extern const unsigned char __iconv_codesets[]; - libc_hidden_proto(__iconv_codesets) -+#endif -+ -+#if defined L_iconv || defined L_iconv_main - const unsigned char __iconv_codesets[] = - "\x0a\xe0""WCHAR_T\x00" /* superset of UCS-4 but platform-endian */ - #if __BYTE_ORDER == __BIG_ENDIAN -@@ -1281,7 +1246,48 @@ const unsigned char __iconv_codesets[] = - "\x08\x02""UTF-8\x00" - "\x0b\x01""US-ASCII\x00" - "\x07\x01""ASCII"; /* Must be last! (special case to save a nul) */ -+#endif -+#if defined L_iconv && defined _LIBC - libc_hidden_data_def(__iconv_codesets) -+#endif -+ -+ -+#ifdef L_iconv -+ -+#include <iconv.h> -+#include <string.h> -+#include <endian.h> -+#include <byteswap.h> -+ -+#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN) -+#error unsupported endianness for iconv -+#endif -+ -+#ifndef __CTYPE_HAS_8_BIT_LOCALES -+#error currently iconv requires 8 bit locales -+#endif -+#ifndef __CTYPE_HAS_UTF_8_LOCALES -+#error currently iconv requires UTF-8 locales -+#endif -+ -+ -+enum { -+ IC_WCHAR_T = 0xe0, -+ IC_MULTIBYTE = 0xe0, -+#if __BYTE_ORDER == __BIG_ENDIAN -+ IC_UCS_4 = 0xec, -+ IC_UTF_32 = 0xe4, -+ IC_UCS_2 = 0xe2, -+ IC_UTF_16 = 0xea, -+#else -+ IC_UCS_4 = 0xed, -+ IC_UTF_32 = 0xe5, -+ IC_UCS_2 = 0xe3, -+ IC_UTF_16 = 0xeb, -+#endif -+ IC_UTF_8 = 2, -+ IC_ASCII = 1 -+}; - - /* Experimentally off - libc_hidden_proto(strcasecmp) */ - -@@ -1575,6 +1581,4 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf, - } - return nrcount; - } -- - #endif -- --- -1.6.6.1 - diff --git a/main/uclibc/0005-host-utils-depend-on-headers.patch b/main/uclibc/0005-host-utils-depend-on-headers.patch deleted file mode 100644 index 3a3689267f..0000000000 --- a/main/uclibc/0005-host-utils-depend-on-headers.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 47e88c04e01299f975ff23f33035d0f34a8f6787 Mon Sep 17 00:00:00 2001 -From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> -Date: Fri, 22 Jan 2010 13:32:44 +0100 -Subject: [PATCH 5/9] {,host}utils depend on headers - -Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> ---- - Makefile.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 4c5aecb..ec4c28e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -436,7 +436,7 @@ ifeq ($(HAVE_SHARED),y) - fi - endif - --utils: -+utils: headers - $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils $@ - - # Installs helper applications, such as 'ldd' and 'ldconfig' -@@ -445,7 +445,7 @@ install_utils: utils - - endif # ifeq ($(HAVE_DOT_CONFIG),y) - --hostutils: -+hostutils: headers - $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@ - - install_hostutils: hostutils --- -1.6.6.1 - diff --git a/main/uclibc/0006-fstatat-fix-up-behavior-on-32-64-bit-hosts.patch b/main/uclibc/0006-fstatat-fix-up-behavior-on-32-64-bit-hosts.patch deleted file mode 100644 index 51564405a9..0000000000 --- a/main/uclibc/0006-fstatat-fix-up-behavior-on-32-64-bit-hosts.patch +++ /dev/null @@ -1,113 +0,0 @@ -From d43f068e84513ed88392df4ca27d49ad01145fd2 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 6 Sep 2009 12:12:12 -0400 -Subject: [PATCH 6/9] fstatat: fix up behavior on 32/64 bit hosts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The fstatat() syscall is a little funky in that it sometimes changes name -between 32 and 64 bit hosts, but it should always operate on a 64bit stat -structure. So for the fstatat() function, make sure we convert it from a -64bit kstat to a 32bit stat. - -Along these lines, we need to restore the __xstat32_conv() function. - -Reported-by: Timo Teräs <timo.teras@iki.fi> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> ---- - libc/sysdeps/linux/common/fstatat.c | 9 +++++++-- - libc/sysdeps/linux/common/fstatat64.c | 5 +++++ - libc/sysdeps/linux/common/xstatconv.c | 19 +++++++++++++++++++ - libc/sysdeps/linux/common/xstatconv.h | 1 + - 4 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/libc/sysdeps/linux/common/fstatat.c b/libc/sysdeps/linux/common/fstatat.c -index 149c189..33daa7c 100644 ---- a/libc/sysdeps/linux/common/fstatat.c -+++ b/libc/sysdeps/linux/common/fstatat.c -@@ -10,15 +10,20 @@ - #include <sys/stat.h> - #include "xstatconv.h" - -+/* 64bit ports tend to favor newfstatat() */ -+#ifdef __NR_newfstatat -+# define __NR_fstatat64 __NR_newfstatat -+#endif -+ - #ifdef __NR_fstatat64 - int fstatat(int fd, const char *file, struct stat *buf, int flag) - { - int ret; -- struct kernel_stat kbuf; -+ struct kernel_stat64 kbuf; - - ret = INLINE_SYSCALL(fstatat64, 4, fd, file, &kbuf, flag); - if (ret == 0) -- __xstat_conv(&kbuf, buf); -+ __xstat32_conv(&kbuf, buf); - - return ret; - } -diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c -index 5ae1fad..95627af 100644 ---- a/libc/sysdeps/linux/common/fstatat64.c -+++ b/libc/sysdeps/linux/common/fstatat64.c -@@ -12,6 +12,11 @@ - - #ifdef __UCLIBC_HAS_LFS__ - -+/* 64bit ports tend to favor newfstatat() */ -+#ifdef __NR_newfstatat -+# define __NR_fstatat64 __NR_newfstatat -+#endif -+ - #ifdef __NR_fstatat64 - int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) - { -diff --git a/libc/sysdeps/linux/common/xstatconv.c b/libc/sysdeps/linux/common/xstatconv.c -index e575b26..50455c6 100644 ---- a/libc/sysdeps/linux/common/xstatconv.c -+++ b/libc/sysdeps/linux/common/xstatconv.c -@@ -46,6 +46,25 @@ void attribute_hidden __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) - buf->st_ctim = kbuf->st_ctim; - } - -+void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) -+{ -+ /* Convert to current kernel version of `struct stat64'. */ -+ memset(buf, 0x00, sizeof(*buf)); -+ buf->st_dev = kbuf->st_dev; -+ buf->st_ino = kbuf->st_ino; -+ buf->st_mode = kbuf->st_mode; -+ buf->st_nlink = kbuf->st_nlink; -+ buf->st_uid = kbuf->st_uid; -+ buf->st_gid = kbuf->st_gid; -+ buf->st_rdev = kbuf->st_rdev; -+ buf->st_size = kbuf->st_size; -+ buf->st_blksize = kbuf->st_blksize; -+ buf->st_blocks = kbuf->st_blocks; -+ buf->st_atim = kbuf->st_atim; -+ buf->st_mtim = kbuf->st_mtim; -+ buf->st_ctim = kbuf->st_ctim; -+} -+ - #ifdef __UCLIBC_HAS_LFS__ - - void attribute_hidden __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) -diff --git a/libc/sysdeps/linux/common/xstatconv.h b/libc/sysdeps/linux/common/xstatconv.h -index 57c8bcb..7568da8 100644 ---- a/libc/sysdeps/linux/common/xstatconv.h -+++ b/libc/sysdeps/linux/common/xstatconv.h -@@ -26,6 +26,7 @@ - #include <bits/kernel_stat.h> - - extern void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) attribute_hidden; -+extern void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) attribute_hidden; - #if defined __UCLIBC_HAS_LFS__ - extern void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) attribute_hidden; - #endif --- -1.6.6.1 - diff --git a/main/uclibc/0007-Unbreak-build-for-sparc-on-some-config-s.patch b/main/uclibc/0007-Unbreak-build-for-sparc-on-some-config-s.patch deleted file mode 100644 index 1d86d585c7..0000000000 --- a/main/uclibc/0007-Unbreak-build-for-sparc-on-some-config-s.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7b964170536951a260f7d552db99b428d1ea5026 Mon Sep 17 00:00:00 2001 -From: Austin Foxley <austinf@cetoncorp.com> -Date: Wed, 3 Feb 2010 12:12:10 -0800 -Subject: [PATCH 7/9] Unbreak build for sparc on some config's - -Thanks to rob@landley.net - -Signed-off-by: Austin Foxley <austinf@cetoncorp.com> ---- - libc/sysdeps/linux/sparc/sigaction.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/libc/sysdeps/linux/sparc/sigaction.c b/libc/sysdeps/linux/sparc/sigaction.c -index a22ac40..7140fd3 100644 ---- a/libc/sysdeps/linux/sparc/sigaction.c -+++ b/libc/sysdeps/linux/sparc/sigaction.c -@@ -34,7 +34,8 @@ _syscall5(int, rt_sigaction, int, a, int, b, int, c, int, d, int, e); - static void __rt_sigreturn_stub(void); - static void __sigreturn_stub(void); - --int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) -+libc_hidden_proto(sigaction) -+int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) - { - int ret; - struct sigaction kact, koact; -@@ -65,10 +66,8 @@ int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oac - return ret; - } - --#ifndef LIBC_SIGACTION --weak_alias(__libc_sigaction,sigaction) --libc_hidden_weak(sigaction) --#endif -+libc_hidden_def(sigaction) -+weak_alias(sigaction,__libc_sigaction) - - static void - __rt_sigreturn_stub(void) --- -1.6.6.1 - diff --git a/main/uclibc/0008-malloc-fix-race-condition-and-other-bugs-in-the-no-m.patch b/main/uclibc/0008-malloc-fix-race-condition-and-other-bugs-in-the-no-m.patch deleted file mode 100644 index 48e8427d28..0000000000 --- a/main/uclibc/0008-malloc-fix-race-condition-and-other-bugs-in-the-no-m.patch +++ /dev/null @@ -1,89 +0,0 @@ -From fa476d01f1c1990a92ee49d1f1c557b83805d0e9 Mon Sep 17 00:00:00 2001 -From: Freeman Wang <xwang@ubicom.com> -Date: Sat, 19 Dec 2009 13:43:00 -0800 -Subject: [PATCH 8/9] malloc: fix race condition and other bugs in the no-mmu malloc - -Fixes multiple race conditions on mmb list. This was done by -making the mmb_heap_lock into a recursive lock and making the -regular heap_lock extend to cover the mmb heap handling. - -Also move the new_mmb allocation up to before the mmb list is -iterated through to find the insertion point. When the mmb_heap -also runs out and needs to be extended when the regular heap is -just extended, the mmb list could be messed up. - -Signed-off-by: Freeman Wang <xwang@ubicom.com> -Signed-off-by: Austin Foxley <austinf@cetoncorp.com> ---- - libc/stdlib/malloc/free.c | 6 +++--- - libc/stdlib/malloc/malloc.c | 7 ++++--- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c -index 90e18f4..741248a 100644 ---- a/libc/stdlib/malloc/free.c -+++ b/libc/stdlib/malloc/free.c -@@ -179,14 +179,14 @@ __free_to_heap (void *mem, struct heap_free_area **heap - /* Start searching again from the end of this block. */ - start = mmb_end; - -+ /* Release the descriptor block we used. */ -+ free_to_heap (mmb, &__malloc_mmb_heap, &__malloc_mmb_heap_lock); -+ - /* We have to unlock the heap before we recurse to free the mmb - descriptor, because we might be unmapping from the mmb - heap. */ - __heap_unlock (heap_lock); - -- /* Release the descriptor block we used. */ -- free_to_heap (mmb, &__malloc_mmb_heap, &__malloc_mmb_heap_lock); -- - /* Do the actual munmap. */ - munmap ((void *)mmb_start, mmb_end - mmb_start); - -diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c -index 71f9e58..84a6acd 100644 ---- a/libc/stdlib/malloc/malloc.c -+++ b/libc/stdlib/malloc/malloc.c -@@ -48,7 +48,7 @@ struct malloc_mmb *__malloc_mmapped_blocks = 0; - HEAP_DECLARE_STATIC_FREE_AREA (initial_mmb_fa, 48); /* enough for 3 mmbs */ - struct heap_free_area *__malloc_mmb_heap = HEAP_INIT_WITH_FA (initial_mmb_fa); - #ifdef HEAP_USE_LOCKING --pthread_mutex_t __malloc_mmb_heap_lock = PTHREAD_MUTEX_INITIALIZER; -+pthread_mutex_t __malloc_mmb_heap_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - #endif - #endif /* __UCLIBC_UCLINUX_BROKEN_MUNMAP__ */ - -@@ -151,19 +151,19 @@ __malloc_from_heap (size_t size, struct heap_free_area **heap - /* Try again to allocate. */ - mem = __heap_alloc (heap, &size); - -- __heap_unlock (heap_lock); - - #if !defined(MALLOC_USE_SBRK) && defined(__UCLIBC_UCLINUX_BROKEN_MUNMAP__) - /* Insert a record of BLOCK in sorted order into the - __malloc_mmapped_blocks list. */ - -+ new_mmb = malloc_from_heap (sizeof *new_mmb, &__malloc_mmb_heap, &__malloc_mmb_heap_lock); -+ - for (prev_mmb = 0, mmb = __malloc_mmapped_blocks; - mmb; - prev_mmb = mmb, mmb = mmb->next) - if (block < mmb->mem) - break; - -- new_mmb = malloc_from_heap (sizeof *new_mmb, &__malloc_mmb_heap, &__malloc_mmb_heap_lock); - new_mmb->next = mmb; - new_mmb->mem = block; - new_mmb->size = block_size; -@@ -177,6 +177,7 @@ __malloc_from_heap (size_t size, struct heap_free_area **heap - (unsigned)new_mmb, - (unsigned)new_mmb->mem, block_size); - #endif /* !MALLOC_USE_SBRK && __UCLIBC_UCLINUX_BROKEN_MUNMAP__ */ -+ __heap_unlock (heap_lock); - } - } - --- -1.6.6.1 - diff --git a/main/uclibc/0009-libm-enable-log2f-and-exp2f.patch b/main/uclibc/0009-libm-enable-log2f-and-exp2f.patch deleted file mode 100644 index 88e13e328e..0000000000 --- a/main/uclibc/0009-libm-enable-log2f-and-exp2f.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 956a0087e282e53ba9c085dbbc469391f7234944 Mon Sep 17 00:00:00 2001 -From: Aurelien Jacobs <aurel@gnuage.org> -Date: Thu, 4 Feb 2010 09:31:40 -0800 -Subject: [PATCH 9/9] libm: enable log2f and exp2f - -Signed-off-by: Aurelien Jacobs <aurel@gnuage.org> -Signed-off-by: Austin Foxley <austinf@cetoncorp.com> ---- - libm/float_wrappers.c | 4 ++-- - test/math/compile_test.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c -index dc315e7..b7317a1 100644 ---- a/libm/float_wrappers.c -+++ b/libm/float_wrappers.c -@@ -15,12 +15,10 @@ - - /* For the time being, do _NOT_ implement these functions - * that are defined by SuSv3 */ --#undef L_exp2f /*float exp2f(float);*/ - #undef L_fdimf /*float fdimf(float, float);*/ - #undef L_fmaf /*float fmaf(float, float, float);*/ - #undef L_fmaxf /*float fmaxf(float, float);*/ - #undef L_fminf /*float fminf(float, float);*/ --#undef L_log2f /*float log2f(float);*/ - #undef L_nearbyintf /*float nearbyintf(float);*/ - #undef L_nexttowardf /*float nexttowardf(float, long double);*/ - #undef L_remquof /*float remquof(float, float, int *);*/ -@@ -43,6 +41,7 @@ float cosf(float); - float coshf(float); - float erfcf(float); - float erff(float); -+float exp2f(float); - float expf(float); - float expm1f(float); - float fabsf(float); -@@ -56,6 +55,7 @@ float lgammaf(float); - long long llroundf(float); - float log10f(float); - float log1pf(float); -+float log2f(float); - float logbf(float); - float logf(float); - long lroundf(float); -diff --git a/test/math/compile_test.c b/test/math/compile_test.c -index 9990520..ee5e2e3 100644 ---- a/test/math/compile_test.c -+++ b/test/math/compile_test.c -@@ -18,7 +18,7 @@ r += cosf(float_x); - r += coshf(float_x); - r += erfcf(float_x); - r += erff(float_x); --/*r += exp2f(float_x); - uclibc does not have it (yet?) */ -+r += exp2f(float_x); - r += expf(float_x); - r += expm1f(float_x); - r += fabsf(float_x); -@@ -38,7 +38,7 @@ r += llrintf(float_x); - r += llroundf(float_x); - r += log10f(float_x); - r += log1pf(float_x); --/*r += log2f(float_x); - uclibc does not have it (yet?) */ -+r += log2f(float_x); - r += logbf(float_x); - r += logf(float_x); - r += lrintf(float_x); --- -1.6.6.1 - diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD deleted file mode 100644 index 72b5648b3b..0000000000 --- a/main/uclibc/APKBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=uclibc -pkgver=0.9.30.2 -pkgrel=2 -pkgdesc="C library for developing embedded Linux systems" -url=http://uclibc.org -license="LGPL-2" -_mynamever=uClibc-$pkgver - -subpackages="$pkgname-dev" -depends_dev="linux-headers=>2.6.32" - -source="http://uclibc.org/downloads/$_mynamever.tar.bz2 - $pkgname-0.9.30.1-resolv.patch - uclibc-0.9.30.1-pthread_getattr_np.patch - 0001-Add-dn_skipname-from-OpenBSD.patch - 0001-ldd-segfault-fix.patch - - 0001-avr32-add-varargs-handling-of-prctl-syscall.patch - 0002-Make-use-of-macros-from-sys-asm.h-in-crt1.S.patch - 0003-rpc-fix-typo-in-version-mismatch-msg.patch - 0004-fix-make-install_-host-utils.patch - 0005-host-utils-depend-on-headers.patch - 0006-fstatat-fix-up-behavior-on-32-64-bit-hosts.patch - 0007-Unbreak-build-for-sparc-on-some-config-s.patch - 0008-malloc-fix-race-condition-and-other-bugs-in-the-no-m.patch - 0009-libm-enable-log2f-and-exp2f.patch - - uclibc-linuxthreads-init-stdio.patch - pthread-new-aliasing-fix.diff - uclibc-resolv-cname-fix.diff - uclibc-i386-floating-stacks.diff - uclibc-fork-hidden.diff - uclibc-fork-hook.diff - uclibcconfig.x86 - " - -_config="$srcdir"/uclibcconfig.${ARCH:-x86} - - -prepare() { - local i gcc_major - cd "$srcdir/$_mynamever/" - # patches goes here - for i in ../*.patch ../*.diff; do - msg "Applying $i..." - patch -p1 < $i || return 1 - done -} - -build() { - cd "$srcdir/$_mynamever/" - cp "$_config" .config - make silentoldconfig - # this is a hack to get uclibc-i386-floating-stacks.diff working - touch libc/sysdeps/linux/i386/sysdep.h - make || return 1 -} - -package() { - cd "$srcdir/$_mynamever/" - make install DESTDIR="$pkgdir" install_utils - install -Dm755 extra/scripts/getent "$pkgdir"/usr/bin/getent - # provided by linux-headers - rm -f "$pkgdir"/usr/include/scsi/scsi.h -} - -md5sums="e759ec855500082ac3e671dd6cacfdb0 uClibc-0.9.30.2.tar.bz2 -ea91460617601b6e084ead66bc3948f5 uclibc-0.9.30.1-resolv.patch -cf80c0d44a41e02f389be427ee615d61 uclibc-0.9.30.1-pthread_getattr_np.patch -c9e3df01e854db4b1118266acd9bcfbd 0001-Add-dn_skipname-from-OpenBSD.patch -4079b20c763727863bc53408e4988434 0001-ldd-segfault-fix.patch -fe69ee3a487605b40cd7e6edadedbc45 0001-avr32-add-varargs-handling-of-prctl-syscall.patch -045d4e110e512493fbc2040fd6a6d5c4 0002-Make-use-of-macros-from-sys-asm.h-in-crt1.S.patch -e23edaf402ae29650205b3337b2f9ec2 0003-rpc-fix-typo-in-version-mismatch-msg.patch -afbeb89d1fd086cec5cfbc10cc011b7a 0004-fix-make-install_-host-utils.patch -41796dd355bc56526991410647d854f4 0005-host-utils-depend-on-headers.patch -c78e19855a8a83f07855fe82ceaf9d21 0006-fstatat-fix-up-behavior-on-32-64-bit-hosts.patch -d20abc16e2ce8579f77e42271008ff07 0007-Unbreak-build-for-sparc-on-some-config-s.patch -2438e999b21cfaf823139df05d06dd33 0008-malloc-fix-race-condition-and-other-bugs-in-the-no-m.patch -0b2ed68cbd2e4bb2941155bdb1f0f9b0 0009-libm-enable-log2f-and-exp2f.patch -152bd508303e110e660fa7935411b6df uclibc-linuxthreads-init-stdio.patch -969187e1da84d0a0a5957b392a3d5a2b pthread-new-aliasing-fix.diff -bbb8475963e791f596c34c81ef5583d7 uclibc-resolv-cname-fix.diff -ccf15714e089306c09d74a1a5c3cc670 uclibc-i386-floating-stacks.diff -220260c979eca4558827d0e7ec8aa8b6 uclibc-fork-hidden.diff -55bb709f5efd937df323f0d39a202cfd uclibc-fork-hook.diff -36b28777f4c49af39268920fbade41b1 uclibcconfig.x86" diff --git a/main/uclibc/pthread-new-aliasing-fix.diff b/main/uclibc/pthread-new-aliasing-fix.diff deleted file mode 100644 index 2b2b37723a..0000000000 --- a/main/uclibc/pthread-new-aliasing-fix.diff +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/libpthread/linuxthreads/cancel.c b/libpthread/linuxthreads/cancel.c -index 3435680..1412b57 100644 ---- a/libpthread/linuxthreads/cancel.c -+++ b/libpthread/linuxthreads/cancel.c -@@ -152,8 +152,8 @@ void pthread_testcancel(void) - __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); - } - --void _pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer, -- void (*routine)(void *), void * arg) -+void __pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer, -+ void (*routine)(void *), void * arg) - { - pthread_descr self = thread_self(); - buffer->__routine = routine; -@@ -163,17 +163,19 @@ void _pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer, - buffer->__prev = NULL; - THREAD_SETMEM(self, p_cleanup, buffer); - } -+strong_alias(__pthread_cleanup_push, _pthread_cleanup_push); - --void _pthread_cleanup_pop(struct _pthread_cleanup_buffer * buffer, -- int execute) -+void __pthread_cleanup_pop(struct _pthread_cleanup_buffer * buffer, -+ int execute) - { - pthread_descr self = thread_self(); - if (execute) buffer->__routine(buffer->__arg); - THREAD_SETMEM(self, p_cleanup, buffer->__prev); - } -+strong_alias(__pthread_cleanup_pop, _pthread_cleanup_pop); - --void _pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer, -- void (*routine)(void *), void * arg) -+void __pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer, -+ void (*routine)(void *), void * arg) - { - pthread_descr self = thread_self(); - buffer->__routine = routine; -@@ -185,9 +187,10 @@ void _pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer, - THREAD_SETMEM(self, p_canceltype, PTHREAD_CANCEL_DEFERRED); - THREAD_SETMEM(self, p_cleanup, buffer); - } -+strong_alias(__pthread_cleanup_push_defer, _pthread_cleanup_push_defer); - --void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer, -- int execute) -+void __pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer, -+ int execute) - { - pthread_descr self = thread_self(); - if (execute) buffer->__routine(buffer->__arg); -@@ -198,6 +201,7 @@ void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer, - THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS) - __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); - } -+strong_alias(__pthread_cleanup_pop_restore, _pthread_cleanup_pop_restore); - - extern void __rpc_thread_destroy(void); - void __pthread_perform_cleanup(char *currentframe) -diff --git a/libpthread/linuxthreads/forward.c b/libpthread/linuxthreads/forward.c -index f9f8ea1..385e79f 100644 ---- a/libpthread/linuxthreads/forward.c -+++ b/libpthread/linuxthreads/forward.c -@@ -24,6 +24,10 @@ - /* psm: keep this before internals.h */ - /* libc_hidden_proto(exit) */ - -+#define hidden_strong_alias(name, aliasname) \ -+ extern __typeof (name) aliasname __attribute__ ((alias (#name), \ -+ visibility ("hidden"))); -+ - #include "internals.h" - - /* Pointers to the libc functions. */ -@@ -104,8 +108,7 @@ FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2), - - /* Use an alias to avoid warning, as pthread_exit is declared noreturn. */ - FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) --strong_alias (__pthread_exit, pthread_exit) -- -+hidden_strong_alias (__pthread_exit, pthread_exit) - - FORWARD (pthread_getschedparam, - (pthread_t target_thread, int *policy, struct sched_param *param), -@@ -120,16 +123,16 @@ FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0) - FORWARD (pthread_mutex_init, - (pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr), - (mutex, mutexattr), 0) --strong_alias(pthread_mutex_init, __pthread_mutex_init) -+hidden_strong_alias(pthread_mutex_init, __pthread_mutex_init) - - FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) --strong_alias(pthread_mutex_lock, __pthread_mutex_lock) -+hidden_strong_alias(pthread_mutex_lock, __pthread_mutex_lock) - - FORWARD (pthread_mutex_trylock, (pthread_mutex_t *mutex), (mutex), 0) --strong_alias(pthread_mutex_trylock, __pthread_mutex_trylock) -+hidden_strong_alias(pthread_mutex_trylock, __pthread_mutex_trylock) - - FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) --strong_alias(pthread_mutex_unlock, __pthread_mutex_unlock) -+hidden_strong_alias(pthread_mutex_unlock, __pthread_mutex_unlock) - - FORWARD2 (pthread_self, pthread_t, (void), (), return 0) - -diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads/internals.h -index eb0a519..4ad6a0d 100644 ---- a/libpthread/linuxthreads/internals.h -+++ b/libpthread/linuxthreads/internals.h -@@ -380,6 +380,17 @@ extern int __pthread_setschedparam (pthread_t thread, int policy, - extern int __pthread_setcancelstate (int state, int * oldstate); - extern int __pthread_setcanceltype (int type, int * oldtype); - -+extern void __pthread_cleanup_push (struct _pthread_cleanup_buffer *__buffer, -+ void (*__routine) (void *), -+ void *__arg) __THROW; -+extern void __pthread_cleanup_pop (struct _pthread_cleanup_buffer *__buffer, -+ int __execute) __THROW; -+extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer, -+ void (*__routine) (void *), -+ void *__arg) __THROW; -+extern void __pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, -+ int __execute) __THROW; -+ - extern void __pthread_restart_old(pthread_descr th); - extern void __pthread_suspend_old(pthread_descr self); - extern int __pthread_timedsuspend_old(pthread_descr self, const struct timespec *abstime); -diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c -index 4d1d906..012b74b 100644 ---- a/libpthread/linuxthreads/pthread.c -+++ b/libpthread/linuxthreads/pthread.c -@@ -280,10 +280,10 @@ struct pthread_functions __pthread_functions = - .ptr_pthread_sigaction = __pthread_sigaction, - .ptr_pthread_sigwait = __pthread_sigwait, - .ptr_pthread_raise = __pthread_raise, -- .ptr__pthread_cleanup_push = _pthread_cleanup_push, -- .ptr__pthread_cleanup_push_defer = _pthread_cleanup_push_defer, -- .ptr__pthread_cleanup_pop = _pthread_cleanup_pop, -- .ptr__pthread_cleanup_pop_restore = _pthread_cleanup_pop_restore, -+ .ptr__pthread_cleanup_push = __pthread_cleanup_push, -+ .ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer, -+ .ptr__pthread_cleanup_pop = __pthread_cleanup_pop, -+ .ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore, - }; - #ifdef SHARED - # define ptr_pthread_functions &__pthread_functions diff --git a/main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch b/main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch deleted file mode 100644 index 28469be236..0000000000 --- a/main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch +++ /dev/null @@ -1,137 +0,0 @@ ---- uClibc-0.9.30.1.orig/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h 2009-03-30 15:01:48.000000000 +0000 -+++ uClibc-0.9.30.1/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h 2009-03-30 15:48:16.000000000 +0000 -@@ -288,16 +288,12 @@ - __attr, size_t *__restrict __stacksize) - __THROW; - --#if 0 --/* Not yet implemented in uClibc! */ -- - #ifdef __USE_GNU - /* Initialize thread attribute *ATTR with attributes corresponding to the - already running thread TH. It shall be called on uninitialized ATTR - and destroyed with pthread_attr_destroy when no longer needed. */ - extern int pthread_getattr_np (pthread_t __th, pthread_attr_t *__attr) __THROW; - #endif --#endif - - /* Functions for scheduling control. */ - -@@ -599,6 +595,11 @@ - cancelled. */ - extern void pthread_testcancel (void); - -+/* Return the previously set address for the stack. */ -+extern int pthread_attr_getstack (__const pthread_attr_t *__restrict __attr, -+ void **__restrict __stackaddr, -+ size_t *__restrict __stacksize) __THROW; -+ - - /* Install a cleanup handler: ROUTINE will be called with arguments ARG - when the thread is cancelled or calls pthread_exit. ROUTINE will also ---- a/libpthread/linuxthreads.old/attr.c.orig 2007-11-22 16:55:08.000000000 +0000 -+++ b/libpthread/linuxthreads.old/attr.c 2009-03-30 19:15:51.000000000 +0000 -@@ -38,6 +38,14 @@ - libpthread_hidden_proto(pthread_attr_getscope) - libpthread_hidden_proto(pthread_attr_setscope) - -+#include <sys/resource.h> -+#include <inttypes.h> -+#include <stdio.h> -+#include <stdio_ext.h> -+#include <stdlib.h> -+#include <sys/resource.h> -+ -+ - /* NOTE: With uClibc I don't think we need this versioning stuff. - * Therefore, define the function pthread_attr_init() here using - * a strong symbol. */ -@@ -235,4 +243,88 @@ - *stacksize = attr->__stacksize; - return 0; - } -+ -+ -+extern int *__libc_stack_end; -+ - weak_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize) -+int pthread_getattr_np(pthread_t thread, pthread_attr_t *attr) -+{ -+ static void *stackBase = 0; -+ static size_t stackSize = 0; -+ int ret = 0; -+ /* Stack size limit. */ -+ struct rlimit rl; -+ -+ /* The safest way to get the top of the stack is to read -+ /proc/self/maps and locate the line into which -+ __libc_stack_end falls. */ -+ FILE *fp = fopen("/proc/self/maps", "rc"); -+ if (fp == NULL) -+ ret = errno; -+ /* We need the limit of the stack in any case. */ -+ else if (getrlimit (RLIMIT_STACK, &rl) != 0) -+ ret = errno; -+ else { -+ /* We need no locking. */ -+ __fsetlocking (fp, FSETLOCKING_BYCALLER); -+ -+ /* Until we found an entry (which should always be the case) -+ mark the result as a failure. */ -+ ret = ENOENT; -+ -+ char *line = NULL; -+ size_t linelen = 0; -+ uintptr_t last_to = 0; -+ -+ while (! feof_unlocked (fp)) { -+ if (getdelim (&line, &linelen, '\n', fp) <= 0) -+ break; -+ -+ uintptr_t from; -+ uintptr_t to; -+ if (sscanf (line, "%x-%x", &from, &to) != 2) -+ continue; -+ if (from <= (uintptr_t) __libc_stack_end -+ && (uintptr_t) __libc_stack_end < to) { -+ /* Found the entry. Now we have the info we need. */ -+ attr->__stacksize = rl.rlim_cur; -+#ifdef _STACK_GROWS_UP -+ /* Don't check to enforce a limit on the __stacksize */ -+ attr->__stackaddr = (void *) from; -+#else -+ attr->__stackaddr = (void *) to; -+ -+ /* The limit might be too high. */ -+ if ((size_t) attr->__stacksize > (size_t) attr->__stackaddr - last_to) -+ attr->__stacksize = (size_t) attr->__stackaddr - last_to; -+#endif -+ -+ /* We succeed and no need to look further. */ -+ ret = 0; -+ break; -+ } -+ last_to = to; -+ } -+ -+ fclose (fp); -+ free (line); -+ } -+ return ret; -+} -+ -+int __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr, -+ size_t *stacksize) -+{ -+ /* XXX This function has a stupid definition. The standard specifies -+ no error value but what is if no stack address was set? We simply -+ return the value we have in the member. */ -+#ifndef _STACK_GROWS_UP -+ *stackaddr = (char *) attr->__stackaddr - attr->__stacksize; -+#else -+ *stackaddr = attr->__stackaddr; -+#endif -+ *stacksize = attr->__stacksize; -+ return 0; -+} -+weak_alias (__pthread_attr_getstack, pthread_attr_getstack) diff --git a/main/uclibc/uclibc-0.9.30.1-resolv.patch b/main/uclibc/uclibc-0.9.30.1-resolv.patch deleted file mode 100644 index 55b7d991e1..0000000000 --- a/main/uclibc/uclibc-0.9.30.1-resolv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru uClibc-0.9.30.1.orig/libc/inet/resolv.c uClibc-0.9.30.1/libc/inet/resolv.c ---- uClibc-0.9.30.1.orig/libc/inet/resolv.c 2009-03-10 15:32:14.000000000 +0000 -+++ uClibc-0.9.30.1/libc/inet/resolv.c 2009-03-10 15:39:20.000000000 +0000 -@@ -1331,7 +1331,8 @@ - i = __dns_lookup(dname, type, __nameserversXX, __nameserverXX, &packet, &a); - - if (i < 0) { -- h_errno = TRY_AGAIN; -+ if (!h_errno) /* TODO: can this ever happen? */ -+ h_errno = TRY_AGAIN; - return -1; - } - diff --git a/main/uclibc/uclibc-fork-hidden.diff b/main/uclibc/uclibc-fork-hidden.diff deleted file mode 100644 index 2a0543380e..0000000000 --- a/main/uclibc/uclibc-fork-hidden.diff +++ /dev/null @@ -1,115 +0,0 @@ -Index: uClibc-0.9.30.1/libc/misc/wordexp/wordexp.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/misc/wordexp/wordexp.c 2009-08-03 16:13:20.000000000 +0300 -+++ uClibc-0.9.30.1/libc/misc/wordexp/wordexp.c 2009-08-03 16:14:23.000000000 +0300 -@@ -56,7 +56,7 @@ - libc_hidden_proto(atoi) - libc_hidden_proto(fnmatch) - libc_hidden_proto(pipe) --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - libc_hidden_proto(open) - libc_hidden_proto(close) - libc_hidden_proto(read) -Index: uClibc-0.9.30.1/libc/stdio/popen.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/stdio/popen.c 2009-08-03 16:13:20.000000000 +0300 -+++ uClibc-0.9.30.1/libc/stdio/popen.c 2009-08-03 16:14:23.000000000 +0300 -@@ -42,7 +42,7 @@ - # define vfork fork - # define VFORK_LOCK ((void) 0) - # define VFORK_UNLOCK ((void) 0) --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - #endif - - #ifndef VFORK_LOCK -Index: uClibc-0.9.30.1/libc/stdlib/system.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/stdlib/system.c 2009-08-03 16:13:20.000000000 +0300 -+++ uClibc-0.9.30.1/libc/stdlib/system.c 2009-08-03 16:14:23.000000000 +0300 -@@ -21,7 +21,7 @@ - #include <sys/syscall.h> - #ifndef __NR_vfork - # define vfork fork --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - #endif - - extern __typeof(system) __libc_system; -Index: uClibc-0.9.30.1/libc/stdlib/unix_grantpt.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/stdlib/unix_grantpt.c 2009-08-03 16:13:21.000000000 +0300 -+++ uClibc-0.9.30.1/libc/stdlib/unix_grantpt.c 2009-08-03 16:14:23.000000000 +0300 -@@ -39,7 +39,7 @@ - libc_hidden_proto(chmod) - libc_hidden_proto(chown) - libc_hidden_proto(vfork) --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - libc_hidden_proto(stat) - libc_hidden_proto(ptsname_r) - libc_hidden_proto(execle) -Index: uClibc-0.9.30.1/libc/sysdeps/linux/common/fork.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/sysdeps/linux/common/fork.c 2009-08-03 16:10:51.000000000 +0300 -+++ uClibc-0.9.30.1/libc/sysdeps/linux/common/fork.c 2009-08-03 16:14:23.000000000 +0300 -@@ -16,9 +16,9 @@ - extern __typeof(fork) __libc_fork; - #define __NR___libc_fork __NR_fork - _syscall0(pid_t, __libc_fork) --libc_hidden_proto(fork) -+////libc_hidden_proto(fork) - weak_alias(__libc_fork,fork) --libc_hidden_weak(fork) -+//libc_hidden_weak(fork) - #endif - - #elif defined __UCLIBC_HAS_STUBS__ -@@ -28,7 +28,7 @@ - __set_errno(ENOSYS); - return -1; - } --libc_hidden_proto(fork) -+////libc_hidden_proto(fork) - weak_alias(__libc_fork,fork) - libc_hidden_weak(fork) - link_warning(fork, "fork: this function is not implemented on no-mmu systems") -Index: uClibc-0.9.30.1/libc/sysdeps/linux/common/vfork.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/sysdeps/linux/common/vfork.c 2009-08-03 16:13:20.000000000 +0300 -+++ uClibc-0.9.30.1/libc/sysdeps/linux/common/vfork.c 2009-08-03 16:14:23.000000000 +0300 -@@ -12,7 +12,7 @@ - #ifdef __ARCH_USE_MMU__ - - #ifdef __NR_fork --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - - extern __typeof(vfork) __vfork attribute_hidden; - pid_t __vfork(void) -Index: uClibc-0.9.30.1/libc/sysdeps/linux/cris/fork.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/sysdeps/linux/cris/fork.c 2009-08-03 16:13:20.000000000 +0300 -+++ uClibc-0.9.30.1/libc/sysdeps/linux/cris/fork.c 2009-08-03 16:14:23.000000000 +0300 -@@ -14,6 +14,6 @@ - R0&-1==R0, and the child gets R0&0==0. */ - /* i dunno what the blurb above is useful for. we just return. */ - __asm__("ret\n\tnop"); --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - weak_alias(__libc_fork,fork) - libc_hidden_weak(fork) -Index: uClibc-0.9.30.1/libc/unistd/daemon.c -=================================================================== ---- uClibc-0.9.30.1.orig/libc/unistd/daemon.c 2009-08-03 16:13:21.000000000 +0300 -+++ uClibc-0.9.30.1/libc/unistd/daemon.c 2009-08-03 16:14:23.000000000 +0300 -@@ -54,7 +54,7 @@ - libc_hidden_proto(dup2) - libc_hidden_proto(setsid) - libc_hidden_proto(chdir) --libc_hidden_proto(fork) -+//libc_hidden_proto(fork) - - int daemon( int nochdir, int noclose ) - { diff --git a/main/uclibc/uclibc-fork-hook.diff b/main/uclibc/uclibc-fork-hook.diff deleted file mode 100644 index 0126918836..0000000000 --- a/main/uclibc/uclibc-fork-hook.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.c -index e15b99b..70c750d 100644 ---- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.c -+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.c -@@ -20,6 +20,7 @@ - #include <errno.h> - #include <fork.h> - #include <bits/libc-lock.h> -+#include <internals.h> - - struct fork_block __fork_block = - { -@@ -28,3 +29,12 @@ struct fork_block __fork_block = - .parent_list = { &__fork_block.parent_list, &__fork_block.parent_list }, - .child_list = { &__fork_block.child_list, &__fork_block.child_list } - }; -+ -+pid_t -+__libc_fork (void) -+{ -+ return __libc_maybe_call2 (pthread_fork, (&__fork_block), ARCH_FORK ()); -+} -+weak_alias (__libc_fork, __fork) -+libc_hidden_def (__fork) -+weak_alias (__libc_fork, fork) -diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h -index 85477eb..1e7379e 100644 ---- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h -+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h -@@ -54,5 +54,5 @@ extern int __register_atfork (void (*__prepare) (void), - void *dso_handle); - - #ifndef ARCH_FORK --# define ARCH_FORK() __libc_fork() -+# define ARCH_FORK() INLINE_SYSCALL (fork, 0) - #endif diff --git a/main/uclibc/uclibc-i386-floating-stacks.diff b/main/uclibc/uclibc-i386-floating-stacks.diff deleted file mode 100644 index 0ec05799aa..0000000000 --- a/main/uclibc/uclibc-i386-floating-stacks.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- uClibc-0.9.30.1/libpthread/linuxthreads/sysdeps/i386/pt-machine.h Thu Sep 25 13:55:14 2008 -+++ /root/uClibc-0.9.30.1-patched/libpthread/linuxthreads/sysdeps/i386/pt-machine.h Wed Jun 24 13:13:31 2009 -@@ -113,6 +113,8 @@ - } - #endif /* __ASSEMBLER__ */ - -+#include "./useldt.h" -+ - #endif /* pt-machine.h */ - - #endif ---- uClibc-0.9.30.1/libpthread/linuxthreads/sysdeps/i386/useldt.h Tue May 15 00:35:00 2007 -+++ /root/uClibc-0.9.30.1-patched/libpthread/linuxthreads/sysdeps/i386/useldt.h Wed Jun 24 13:22:38 2009 -@@ -23,7 +23,8 @@ - #include <stddef.h> /* For offsetof. */ - #include <stdlib.h> /* For abort(). */ - #include <sysdep.h> -- -+#include <sys/syscall.h> -+#include <bits/kernel-features.h> - - /* We don't want to include the kernel header. So duplicate the - information. */ diff --git a/main/uclibc/uclibc-linuxthreads-init-stdio.patch b/main/uclibc/uclibc-linuxthreads-init-stdio.patch deleted file mode 100644 index aa5ef64600..0000000000 --- a/main/uclibc/uclibc-linuxthreads-init-stdio.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c -index 6ae9a10..151e039 100644 ---- a/libpthread/linuxthreads/pthread.c -+++ b/libpthread/linuxthreads/pthread.c -@@ -409,6 +409,16 @@ cannot allocate TLS data structures for initial thread\n"; - #endif - - __libc_multiple_threads_ptr = __libc_pthread_init (ptr_pthread_functions); -+ /* uClibc-specific stdio initialization for threads. */ -+ { -+ FILE *fp; -+ _stdio_user_locking = 0; /* 2 if threading not initialized */ -+ for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen) { -+ if (fp->__user_locking != 1) { -+ fp->__user_locking = 0; -+ } -+ } -+ } - } - - diff --git a/main/uclibc/uclibc-resolv-cname-fix.diff b/main/uclibc/uclibc-resolv-cname-fix.diff deleted file mode 100644 index 041e150f35..0000000000 --- a/main/uclibc/uclibc-resolv-cname-fix.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- a/libc/inet/resolv.c.orig 2009-06-18 09:38:26.000000000 +0300 -+++ b/libc/inet/resolv.c 2009-06-18 09:38:32.000000000 +0300 -@@ -1337,10 +1337,9 @@ int res_query(const char *dname, int cla - - free(a.dotted); - -- if (a.atype == type) { /* CNAME */ -- i = MIN(anslen, i); -- memcpy(answer, packet, i); -- } -+ i = MIN(anslen, i); -+ memcpy(answer, packet, i); -+ - free(packet); - return i; - } diff --git a/main/uiconv/APKBUILD b/main/uiconv/APKBUILD index 3814bb5656..1e4aac3b43 100644 --- a/main/uiconv/APKBUILD +++ b/main/uiconv/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 pkgdesc="Micro iconv implementation" url="http://git.alpinelinux.org/cgit/uiconv" license="GPL" -depends="uclibc" +depends="" source="http://git.alpinelinux.org/cgit/$pkgname/snapshots/$pkgname-$pkgver.tar.bz2" build() { diff --git a/main/unarj/APKBUILD b/main/unarj/APKBUILD index b2e0c72607..f40c7577d7 100644 --- a/main/unarj/APKBUILD +++ b/main/unarj/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=unarj pkgver=2.63a -pkgrel=0 +pkgrel=1 pkgdesc="Extracting, testing and viewing the contents of archives created with the ARJ archiver" url="http://www.arjsoftware.com" license="custom" subpackages="" -depends="uclibc" +depends="" makedepends="" install= source="http://ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz" diff --git a/main/unfs3/APKBUILD b/main/unfs3/APKBUILD index 28de301571..7895d99ec2 100644 --- a/main/unfs3/APKBUILD +++ b/main/unfs3/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unfs3 pkgver=0.9.22 -pkgrel=0 +pkgrel=1 pkgdesc="a user-space implementation of the NFSv3 server specification" url="http://unfs3.sourceforge.net/" license='GPL' -depends="uclibc" +depends="" makedepends="flex" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD index e0ed27c971..48d2efe936 100644 --- a/main/unixodbc/APKBUILD +++ b/main/unixodbc/APKBUILD @@ -1,18 +1,20 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=unixodbc -pkgver=2.2.14 -pkgrel=1 +pkgver=2.3.0 +pkgrel=0 pkgdesc="ODBC is an open specification to access Data Sources" url="http://www.unixodbc.org/" license="GPL2" -depends="readline" +depends= makedepends="readline-dev" subpackages="$pkgname-dev" source="http://www.unixodbc.org/unixODBC-${pkgver}.tar.gz" +_builddir="$srcdir/unixODBC-$pkgver" + build() { - cd "$srcdir/unixODBC-$pkgver" + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -24,9 +26,9 @@ build() { } package() { - cd "$srcdir/unixODBC-$pkgver" + cd "$_builddir" make -j1 DESTDIR="$pkgdir" install } -md5sums="f47c2efb28618ecf5f33319140a7acd0 unixODBC-2.2.14.tar.gz" +md5sums="f2ad22cbdffe836c58987ed2332c2e99 unixODBC-2.3.0.tar.gz" diff --git a/main/unrar/APKBUILD b/main/unrar/APKBUILD index 1f5989d9a4..6c48217db6 100644 --- a/main/unrar/APKBUILD +++ b/main/unrar/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=unrar pkgver=3.9.10 -pkgrel=0 +pkgrel=1 pkgdesc="The RAR uncompression program" url="http://www.rarlab.com" license="GPL" diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD index f3ff638fe2..a6f579b969 100644 --- a/main/usbutils/APKBUILD +++ b/main/usbutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=usbutils pkgver=0.87 -pkgrel=0 +pkgrel=1 pkgdesc="USB Device Utilities" url="http://linux-usb.sourceforge.net/" license="GPL" diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD index 9fe1aa292b..604d924432 100644 --- a/main/util-linux-ng/APKBUILD +++ b/main/util-linux-ng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-linux-ng -pkgver=2.17.1 +pkgver=2.17.2 pkgrel=0 pkgdesc="Random collection of Linux utilities" arch="" @@ -74,4 +74,4 @@ cfdisk() { mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ } -md5sums="3dbf64e961ec00441677855ae1b2e569 util-linux-ng-2.17.1.tar.gz" +md5sums="4c810430e86d53b6ea5e7ae279b39186 util-linux-ng-2.17.2.tar.gz" diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index 5d77bca77f..5fed8f70c6 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-vserver pkgver=0.30.216_pre2882 -_realver=0.30.216-pre2882 -pkgrel=7 +_realver=0.30.216-pre2883 +pkgrel=0 pkgdesc="Linux-VServer admin utilities" url="http://www.nongnu.org/util-vserver/" license="GPL" @@ -63,7 +63,7 @@ package() { install -Dm755 ../setup-vs-guest "$pkgdir"/usr/sbin/setup-vs-guest } -md5sums="ed974d112c9cf89943f1bc9be287621b util-vserver-0.30.216-pre2882.tar.bz2 +md5sums="4f7a64b7295ea01673974394f4afd3ff util-vserver-0.30.216-pre2883.tar.bz2 62b7b9bbe5902b95f4614272af003dfd busybox.patch 73c7437dea6937a57cf38d166ef83c09 chmod.patch ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch diff --git a/main/uvncrepeater/APKBUILD b/main/uvncrepeater/APKBUILD index d4464fe11a..c4fa4d052d 100644 --- a/main/uvncrepeater/APKBUILD +++ b/main/uvncrepeater/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=uvncrepeater pkgver=014 -pkgrel=1 +pkgrel=2 pkgdesc="VNC repeater based on ultravnc repeater" url="http://koti.mbnet.fi/jtko/" license="GPL-2" diff --git a/main/v86d/APKBUILD b/main/v86d/APKBUILD index 8bcdcf6181..95f726999f 100644 --- a/main/v86d/APKBUILD +++ b/main/v86d/APKBUILD @@ -1,10 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=v86d pkgver=0.1.9 +pkgrel=1 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" url="http://dev.gentoo.org/~spock/projects/uvesafb/" license="GPL2" -depends="uclibc" +depends="" makedepends="bash" source="http://dev.gentoo.org/~spock/projects/uvesafb/archive/$pkgname-$pkgver.tar.bz2 modprobe.uvesafb" @@ -14,6 +15,10 @@ build () cd "$srcdir"/v86d-$pkgver ./configure --with-x86emu make || return 1 +} + +package() { + cd "$srcdir"/v86d-$pkgver make DESTDIR="$pkgdir" install || return 1 install -D -m644 "$srcdir"/modprobe.uvesafb "$pkgdir"/etc/modprobe.d/uvesafb || return 1 } diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD index 4ace140d1d..5501fbb4a1 100644 --- a/main/vala/APKBUILD +++ b/main/vala/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vala -pkgver=0.8.0 +pkgver=0.8.1 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="177662b0cf1977dcea6707292685647e vala-0.8.0.tar.gz" +md5sums="9e3703950a84d2e57a6aa9354034705b vala-0.8.1.tar.gz" diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD index dcba298373..0465ac4a27 100644 --- a/main/valgrind/APKBUILD +++ b/main/valgrind/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=valgrind -pkgver=3.4.1 -pkgrel=1 +pkgver=3.5.0 +pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" license="GPL" -depends="uclibc" +depends="" # it seems like busybox sed works but the configure script requires GNU sed makedepends="sed paxctl pax-utils" # from README_PACKAGERS: @@ -16,26 +16,29 @@ makedepends="sed paxctl pax-utils" options="!strip" subpackages="$pkgname-dev $pkgname-doc" source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2 - $pkgname-3.4.0-uclibc.patch " -build() { +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" local i - cd "$srcdir/$pkgname-$pkgver" - for i in ../*.patch; do + for i in "$srcdir"/*.patch; do + [ -f "$i" ] || continue msg "Applying $i" patch -p1 < $i || return 1 done +} - # make sure our CFLAGS are respected - sed -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long -fno-stack-protector":' \ - -i configure.in - +build() { + cd "$_builddir" ./configure --prefix=/usr \ --without-mpicc \ --mandir=/usr/share/man || return 1 - make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 # we have options=!strip above so we strip the /usr/bin/* manually @@ -46,10 +49,9 @@ build() { # pax causes some issues # http://marc.info/?l=gentoo-hardened&m=119512627126298&w=2 - scanelf "$pkgdir"/usr/lib/valgrind/x86-linux \ - | awk '$1 == "ET_EXEC" {print $2}' | xargs paxctl -c -m +# scanelf "$pkgdir"/usr/lib/valgrind/x86-linux \ +# | awk '$1 == "ET_EXEC" {print $2}' | xargs paxctl -c -m } -md5sums="b5f039dd2271aaf9ae570ab4116f87c7 valgrind-3.4.1.tar.bz2 -37bc90d0783bc0f8ba5754c8407e3dcc valgrind-3.4.0-uclibc.patch" +md5sums="f03522a4687cf76c676c9494fcc0a517 valgrind-3.5.0.tar.bz2" diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index e0cc6c1c7e..4ab3972f18 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -2,7 +2,7 @@ pkgname=vim _srcver=7.2 _patchver=394 -pkgver=7.2.394 +pkgver=7.2.411 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index f53933cd42..a7b78362db 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vsftpd pkgver=2.2.2 -pkgrel=0 +pkgrel=2 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" license="GPL" diff --git a/main/vte/APKBUILD b/main/vte/APKBUILD index 71620ed79b..9de94bbd4a 100644 --- a/main/vte/APKBUILD +++ b/main/vte/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vte -pkgver=0.24.0 +pkgver=0.24.1 pkgrel=0 pkgdesc="Virtual Terminal Emulator library" url="http://www.gnome.org" @@ -26,4 +26,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="c381f6019448a6e84470ec0acfd78c63 vte-0.24.0.tar.bz2" +md5sums="3b66116e930dde00e1ddbf8277066ea7 vte-0.24.1.tar.bz2" diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD index e7df9315c6..cde6457396 100644 --- a/main/webkit/APKBUILD +++ b/main/webkit/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkit -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=0 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" @@ -42,4 +42,4 @@ gtklauncher() { "$subpkgdir"/usr/bin/GtkLauncher } -md5sums="b2bfcbc4bbf1d0a51f848cb54c21ee66 webkit-1.2.0.tar.gz" +md5sums="eb6f473d8d7be56ecd226e7dd55dcb9b webkit-1.2.1.tar.gz" diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD index 8f377ecbab..55285c1fe3 100644 --- a/main/wget/APKBUILD +++ b/main/wget/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=wget pkgver=1.12 -pkgrel=0 +pkgrel=2 pkgdesc="A network utility to retrieve files from the Web" url="http://www.gnu.org/software/wget/wget.html" license="GPL3" diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD new file mode 100644 index 0000000000..99e4a5bd0d --- /dev/null +++ b/main/wine/APKBUILD @@ -0,0 +1,36 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wine +pkgver=1.1.44 +pkgrel=0 +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +license="LGPL" +subpackages="$pkgname-dev $pkgname-doc" +makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev + libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex bison + libpng-dev jpeg-dev freetype-dev" +# lcms +source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2 + dn_skipname.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/dn_skipname.patch || return 1 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-x + make depend && make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make prefix="$pkgdir"/usr install || return 1 + mkdir -p "$pkgdir"/etc/wine +} +md5sums="f18649bd71b9099fecad22436d239cba wine-1.1.44.tar.bz2 +6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch" diff --git a/main/wine/dn_skipname.patch b/main/wine/dn_skipname.patch new file mode 100644 index 0000000000..99ecf83158 --- /dev/null +++ b/main/wine/dn_skipname.patch @@ -0,0 +1,38 @@ +--- ./dlls/dnsapi/ns_parse.c.orig ++++ ./dlls/dnsapi/ns_parse.c +@@ -69,6 +69,35 @@ + } while (0) + + /* Public. */ ++#ifdef __UCLIBC__ ++int ++dn_skipname(const u_char *comp_dn, const u_char *eom) ++{ ++ const u_char *cp; ++ int n; ++ ++ cp = comp_dn; ++ while (cp < eom && (n = *cp++)) { ++ /* ++ * check for indirection ++ */ ++ switch (n & INDIR_MASK) { ++ case 0: /* normal case, n == len */ ++ cp += n; ++ continue; ++ case INDIR_MASK: /* indirection */ ++ cp++; ++ break; ++ default: /* illegal type */ ++ return (-1); ++ } ++ break; ++ } ++ if (cp > eom) ++ return (-1); ++ return (cp - comp_dn); ++} ++#endif + + static int + dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) { diff --git a/main/wireless-tools/APKBUILD b/main/wireless-tools/APKBUILD index b4c726bd0f..33c0c9273c 100644 --- a/main/wireless-tools/APKBUILD +++ b/main/wireless-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=wireless-tools pkgver=29 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source wireless tools" url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" license="GPL" diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index 8cd7aa0f6f..bd315fa3b8 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=wireshark pkgver=1.2.6 -pkgrel=0 +pkgrel=2 pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" license="GPLv2" diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index bdcbd9bff1..3474daa147 100644 --- a/main/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wpa_supplicant pkgver=0.7.1 -pkgrel=0 +pkgrel=2 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" license="GPL" diff --git a/main/wv/APKBUILD b/main/wv/APKBUILD index b3b48ff42c..ddaeaf07c1 100644 --- a/main/wv/APKBUILD +++ b/main/wv/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wv pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" url="http://sourceforge.net/projects/wvware" license="GPL" diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD index a26175f6bc..737ac4fe8f 100644 --- a/main/x264/APKBUILD +++ b/main/x264/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=x264 -pkgver=20100312 +pkgver=20100410 pkgrel=0 pkgdesc="free library for encoding H264/AVC video streams" url="http://www.videolan.org/developers/x264.html" @@ -26,4 +26,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1 } -md5sums="769d3755963bb95b66ea428efe1d6bc0 x264-snapshot-20100312-2245.tar.bz2" +md5sums="13195a516eece721dc743b1dd787a02f x264-snapshot-20100410-2245.tar.bz2" diff --git a/main/xarchiver/APKBUILD b/main/xarchiver/APKBUILD index d114f14ca3..67081e5d19 100644 --- a/main/xarchiver/APKBUILD +++ b/main/xarchiver/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xarchiver pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ frontend to various command line archivers" url="http://xarchiver.xfce.org/" license="GPL" diff --git a/main/xauth/APKBUILD b/main/xauth/APKBUILD index 0c16b8701e..62366d9e46 100644 --- a/main/xauth/APKBUILD +++ b/main/xauth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xauth pkgver=1.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org authorization settings program" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xbacklight/APKBUILD b/main/xbacklight/APKBUILD index 6c0caaf056..1149915cb8 100644 --- a/main/xbacklight/APKBUILD +++ b/main/xbacklight/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xbacklight pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Sets backlight level using the RandR 1.2 BACKLIGHT output property" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD index 820a4e1fa5..a1812b5ef1 100644 --- a/main/xcb-util/APKBUILD +++ b/main/xcb-util/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xcb-util pkgver=0.3.6 -pkgrel=0 +pkgrel=1 pkgdesc="Utility libraries for XC Binding" url="http://xcb.freedesktop.org" license="GPL" diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD index cb4bdbef65..c5c67a59d0 100644 --- a/main/xchat/APKBUILD +++ b/main/xchat/APKBUILD @@ -1,23 +1,23 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xchat -pkgver=2.8.6 -pkgrel=2 +pkgver=2.8.8 +pkgrel=0 pkgdesc="A GTK+ based IRC client" url="http://www.xchat.org/" license="GPL" makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev perl-dev libxext-dev" source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2 - http://www.$pkgname.org/files/source/2.8/patches/xc286-smallfixes.diff - depreciated-macros.patch - $pkgname-gtk2.patch" + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 < ../xc286-smallfixes.diff || return 1 - patch -p1 -i "$srcdir"/depreciated-macros.patch || return 1 - patch -p1 < ../xchat-gtk2.patch || return 1 + for i in "$srcdir"/*.patch; do + [ -r "$i" ] || continue + msg "Applying $i" + patch -p1 -i "$i" || return 1 + done } @@ -42,7 +42,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="1f2670865d43a23a9abc596dde999aca xchat-2.8.6.tar.bz2 -eb68b6261bf6740cb5f223627eb8f384 xc286-smallfixes.diff -daee42354f95ca54a84248c3cb690fee depreciated-macros.patch -f3fe00982c0bec93152ed0b32438ef87 xchat-gtk2.patch" +md5sums="6775c44f38e84d06c06c336b32c4a452 xchat-2.8.8.tar.bz2" diff --git a/main/xchat/depreciated-macros.patch b/main/xchat/depreciated-macros.patch deleted file mode 100644 index 1b86be2f1b..0000000000 --- a/main/xchat/depreciated-macros.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/src/fe-gtk/fe-gtk.c 2008-02-24 08:39:44.000000000 +0000 -+++ b/src/fe-gtk/fe-gtk.c.new 2010-04-01 18:10:31.840778707 +0000 -@@ -819,7 +819,8 @@ - switch (info_type) - { - case 0: /* window status */ -- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window))) -+ if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window))) -+ - return 2; /* hidden (iconified or systray) */ - #if GTK_CHECK_VERSION(2,4,0) - if (gtk_window_is_active (GTK_WINDOW (sess->gui->window))) ---- a/src/fe-gtk/menu.c 2008-06-08 07:59:37.000000000 +0000 -+++ b/src/fe-gtk/menu.c.new 2010-04-01 18:15:54.527573869 +0000 -@@ -1670,7 +1670,7 @@ - menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) - { - /* GTK2.2 behaviour */ -- return GTK_WIDGET_IS_SENSITIVE (widget); -+ return gtk_widget_is_sensitive (widget); - } - - #endif ---- a/src/fe-gtk/maingui.c 2008-04-01 08:53:41.000000000 +0000 -+++ b/src/fe-gtk/maingui.c.new 2010-04-01 18:21:56.400181435 +0000 -@@ -599,7 +599,7 @@ - int num; - GtkWidget *f = NULL; - -- if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box)) -+ if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box)) - f = current_sess->gui->input_box; - - num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box); -@@ -809,8 +809,8 @@ - static void - mg_hide_empty_pane (GtkPaned *pane) - { -- if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) && -- (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2))) -+ if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) && -+ (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2))) - { - gtk_widget_hide (GTK_WIDGET (pane)); - return; -@@ -2563,9 +2563,9 @@ - { - int handle_size; - --/* if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1))) -+/* if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1))) - return; -- if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2))) -+ if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2))) - return;*/ - - gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL); diff --git a/main/xchat/xchat-gtk2.patch b/main/xchat/xchat-gtk2.patch deleted file mode 100644 index 4e13a2cf5d..0000000000 --- a/main/xchat/xchat-gtk2.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 -05:48:02.000000000 +0100 -+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 -02:18:39.000000000 +0200 -@@ -270,6 +270,6 @@ - xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); - void gtk_xtext_buffer_free (xtext_buffer *buf); - void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); --GtkType gtk_xtext_get_type (void); -+GType gtk_xtext_get_type (void); - - #endif diff --git a/main/xcmsdb/APKBUILD b/main/xcmsdb/APKBUILD index 778413b2ac..ecab4fb880 100644 --- a/main/xcmsdb/APKBUILD +++ b/main/xcmsdb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xcmsdb pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Device Color Characterization utility for X Color Management System" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xdelta3/APKBUILD b/main/xdelta3/APKBUILD index 1ca20cae07..b2e2d281ed 100644 --- a/main/xdelta3/APKBUILD +++ b/main/xdelta3/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdelta3 pkgver=3.0y -pkgrel=0 +pkgrel=1 pkgdesc="A diff utility which works with binary files" url="http://xdelta.org/" license="GPL" diff --git a/main/xdpyinfo/APKBUILD b/main/xdpyinfo/APKBUILD index 09f9affcc5..5342985a88 100644 --- a/main/xdpyinfo/APKBUILD +++ b/main/xdpyinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdpyinfo pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="display information utility for X" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xdriinfo/APKBUILD b/main/xdriinfo/APKBUILD index ff9e76aa6c..c750906577 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=0 +pkgrel=1 pkgdesc="query configuration information of DRI drivers" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xev/APKBUILD b/main/xev/APKBUILD index c30c899aae..ed31bb1cd4 100644 --- a/main/xev/APKBUILD +++ b/main/xev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xev pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="print contents of X events" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD index c7461d3fca..d0946ebf70 100644 --- a/main/xf86-input-evdev/APKBUILD +++ b/main/xf86-input-evdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-input-evdev -pkgver=2.3.2 +pkgver=2.4.0 pkgrel=0 pkgdesc="X.org evdev input driver" url="http://xorg.freedesktop.org/" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="b2bfe368022eedf2671ee28daba31efc xf86-input-evdev-2.3.2.tar.bz2" +md5sums="1dbf4d57d99682ba466c7855ed555f19 xf86-input-evdev-2.4.0.tar.bz2" diff --git a/main/xf86-input-keyboard/APKBUILD b/main/xf86-input-keyboard/APKBUILD index 4c5fc14f79..5315b173ae 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.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org keyboard input driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-input-mouse/APKBUILD b/main/xf86-input-mouse/APKBUILD index b2aea2bb87..78eb5b4c38 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.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.org mouse input driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD index 05debbbab6..8ec7ca59b3 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.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="X.org synaptics input driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD index ae0582b5ef..20eec3e3c3 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.2 -pkgrel=1 +pkgrel=2 pkgdesc="Alliance ProMotion video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD index 79bb65c0f7..6f4683f969 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.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for ark cards" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD index a07d4933f6..6bebdeec1d 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.89.9 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org driver for ASpeedTech cards" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD index 44b69b132c..bef7a30b5b 100644 --- a/main/xf86-video-ati/APKBUILD +++ b/main/xf86-video-ati/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ati -pkgver=6.12.192 +pkgver=6.13.0 pkgrel=0 pkgdesc="ATI video driver" url="http://xorg.freedesktop.org/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="7c331b8ca71c81f2680d065cfc181f3e xf86-video-ati-6.12.192.tar.bz2" +md5sums="7b2642442091808002963920c7693aeb xf86-video-ati-6.13.0.tar.bz2" diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD index 74c98f96fe..ba6ef00ddc 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.2 -pkgrel=0 +pkgrel=1 pkgdesc="Chips and Technologies video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-cirrus/APKBUILD b/main/xf86-video-cirrus/APKBUILD index 6b708a28a1..db531d89df 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.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Cirrus Logic video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD index b8f5570fd6..f3c27c4a43 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.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org driver for dummy cards" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD index 2d001aa928..ebd7b04d4a 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.2 -pkgrel=0 +pkgrel=1 pkgdesc="video driver for framebuffer device" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD index 2ef39bf4dc..9e0d240bfd 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.6 -pkgrel=1 +pkgrel=2 pkgdesc="AMD Geode GX and LX video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD index 983b820151..554fda2620 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.4 -pkgrel=1 +pkgrel=2 pkgdesc="GLINT/Permedia video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD index 5374446fad..2ec4d300ce 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.3 -pkgrel=1 +pkgrel=2 pkgdesc="Number 9 I128 video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD index fe8db4e600..43771f60da 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.2 -pkgrel=1 +pkgrel=2 pkgdesc="Intel i740 video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD index b90dba74eb..4b3d706247 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.11.0 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org driver for Intel cards" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-mach64/APKBUILD b/main/xf86-video-mach64/APKBUILD index ab361df528..948c053ac3 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.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="ATI Mach64 video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-newport/APKBUILD b/main/xf86-video-newport/APKBUILD index bdf2f1e113..4aac546584 100644 --- a/main/xf86-video-newport/APKBUILD +++ b/main/xf86-video-newport/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-newport pkgver=0.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Newport video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD index d150de3615..49cc7b53d6 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.17 -pkgrel=0 +pkgrel=1 pkgdesc="Nvidia video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD index f5b944c1e1..1268b7567d 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.2.904 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for VIA/S3G cards" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD index ffceb6ff9e..691331b7c6 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.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="ATI Rage128 video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-radeonhd/APKBUILD b/main/xf86-video-radeonhd/APKBUILD index ebdba8c5b3..546512c0d7 100644 --- a/main/xf86-video-radeonhd/APKBUILD +++ b/main/xf86-video-radeonhd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-radeonhd pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Experimental Radeon HD video driver." url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD index 6722882484..1912336430 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.3 -pkgrel=1 +pkgrel=2 pkgdesc="Rendition video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD index 03f54d2385..bb48034b4a 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.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org driver for s3 cards" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD index f00b0a4132..e2a62b3c77 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.4 -pkgrel=0 +pkgrel=1 pkgdesc="S3 ViRGE video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD index e9a6d740ec..6572053d78 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.1 -pkgrel=1 +pkgrel=2 pkgdesc="S3 Savage video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD index 52d91be125..39a34827d8 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.3 -pkgrel=1 +pkgver=1.7.4 +pkgrel=0 pkgdesc="Silicon Motion video driver" url="http://xorg.freedesktop.org/" license="custom" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="29fb322cd3adab52cc7f1ac86f9315bb xf86-video-siliconmotion-1.7.3.tar.bz2" +md5sums="3059e87586e16c34da89437cc6215b49 xf86-video-siliconmotion-1.7.4.tar.bz2" diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD index ad3589a3ef..7348977815 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.2 -pkgrel=0 +pkgrel=1 pkgdesc="X.org SiS video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-sunffb/APKBUILD b/main/xf86-video-sunffb/APKBUILD index e6a566d199..003415417e 100644 --- a/main/xf86-video-sunffb/APKBUILD +++ b/main/xf86-video-sunffb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-sunffb pkgver=1.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="SUNFFB video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-sunleo/APKBUILD b/main/xf86-video-sunleo/APKBUILD index b6898904b7..ac930235b2 100644 --- a/main/xf86-video-sunleo/APKBUILD +++ b/main/xf86-video-sunleo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-sunleo pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Leo video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD index 2da071fd5a..6804918933 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.3 -pkgrel=1 +pkgrel=2 pkgdesc="3Dfx video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-tseng/APKBUILD b/main/xf86-video-tseng/APKBUILD index c924a7c373..288636a6c0 100644 --- a/main/xf86-video-tseng/APKBUILD +++ b/main/xf86-video-tseng/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-tseng pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Tseng Labs video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-v4l/APKBUILD b/main/xf86-video-v4l/APKBUILD index 42c658b358..4be24ebef6 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=2 +pkgrel=3 pkgdesc="video4linux driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD index 8eed0bb138..b73c82ffca 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.0 -pkgrel=0 +pkgrel=1 pkgdesc="X.org vesa video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD index 8bba4f31bd..e01ed3493c 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=11.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="X.org VMWare video driver" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xfce-utils/APKBUILD b/main/xfce-utils/APKBUILD index c702096d9e..00dee69161 100644 --- a/main/xfce-utils/APKBUILD +++ b/main/xfce-utils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce-utils -pkgver=4.6.1 -pkgrel=1 +pkgver=4.6.2 +pkgrel=0 pkgdesc="Utilities for Xfce" url="http://www.xfce.org/" license="GPL2" @@ -10,10 +10,9 @@ depends="hicolor-icon-theme" makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev libsm-dev expat-dev e2fsprogs-dev" install= -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver sed -i -e "s/share\/xsessions/sessions/g" Makefile.in || return 1 ./configure --prefix=/usr \ @@ -23,6 +22,10 @@ build () --disable-static \ --with-xsession-prefix=/etc/X11/ make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="1aa2362b11e79e56d52ce0d265faf1b6 xfce-utils-4.6.1.tar.bz2" +md5sums="5d23407700d7e8c9751e17a5bc955109 xfce-utils-4.6.2.tar.bz2" diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD index 6f9f6a19ac..5787f36ed9 100644 --- a/main/xfce4-appfinder/APKBUILD +++ b/main/xfce4-appfinder/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-appfinder -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=0 pkgdesc="Xfce application finder" url="http://www.xfce.org/" @@ -10,11 +10,9 @@ makedepends="pkgconfig thunar-dev libxfce4menu-dev intltool gtk+-dev libxfce4util-dev libxfcegui4-dev gettext-dev libiconv-dev startup-notification-dev libsm-dev expat-dev e2fsprogs-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 - $install" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,9 +20,10 @@ build () --localstatedir=/var \ --disable-static || return 1 make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="a1bc7d88100cfd92714a300be531589b xfce4-appfinder-4.6.1.tar.bz2 -db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-install -db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-upgrade -db51db79681eadc47be4932355a77c25 xfce4-appfinder.post-deinstall" +md5sums="7752e43578b821e35010bcd3762da166 xfce4-appfinder-4.6.2.tar.bz2" diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD index c0b271cff6..b18f5b3cd1 100644 --- a/main/xfce4-battery-plugin/APKBUILD +++ b/main/xfce4-battery-plugin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-battery-plugin pkgver=0.5.1 -pkgrel=0 +pkgrel=1 pkgdesc="A battery monitor plugin for the Xfce panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" license="GPL-2" diff --git a/main/xfce4-cpufreq-plugin/APKBUILD b/main/xfce4-cpufreq-plugin/APKBUILD index 4f134440ae..344fdb2ab9 100644 --- a/main/xfce4-cpufreq-plugin/APKBUILD +++ b/main/xfce4-cpufreq-plugin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-cpufreq-plugin pkgver=0.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="CPU frequency plugin for the Xfce4 panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" license="GPL2" diff --git a/main/xfce4-mixer/APKBUILD b/main/xfce4-mixer/APKBUILD index 1541cb92be..b68c6fa1eb 100644 --- a/main/xfce4-mixer/APKBUILD +++ b/main/xfce4-mixer/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-mixer pkgver=4.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="The volume control plugin for the Xfce panel" url="http://www.xfce.org/" license="GPL2" diff --git a/main/xfce4-notes-plugin/APKBUILD b/main/xfce4-notes-plugin/APKBUILD new file mode 100644 index 0000000000..4c8870cd11 --- /dev/null +++ b/main/xfce4-notes-plugin/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: +pkgname=xfce4-notes-plugin +pkgver=1.7.4 +pkgrel=0 +pkgdesc="Notes plugin for the Xfce4 desktop" +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +license="GPL" +depends= +makedepends="xfce4-panel-dev libunique-dev" +install= +subpackages= +source="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="47bd8d19d807a471d9d4d09db2ebafb6 xfce4-notes-plugin-1.7.4.tar.bz2" diff --git a/main/xfce4-notifyd/APKBUILD b/main/xfce4-notifyd/APKBUILD index 717b68470d..e708fc3f55 100644 --- a/main/xfce4-notifyd/APKBUILD +++ b/main/xfce4-notifyd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-notifyd pkgver=0.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="notification daemon for the xfce desktop" url="http://spuriousinterrupt.org/projects/xfce4-notifyd" license="GPL2" diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD index ba867f7f09..4094d48d36 100644 --- a/main/xfce4-panel/APKBUILD +++ b/main/xfce4-panel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-panel -pkgver=4.6.3 -pkgrel=1 +pkgver=4.6.4 +pkgrel=0 pkgdesc="Panel for the Xfce desktop environment" url="http://www.xfce.org/" license="GPL-2" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="0b715abb929220f136483ccd7303ff62 xfce4-panel-4.6.3.tar.bz2" +md5sums="82f10a42aefca4cc26a6633e7478cc65 xfce4-panel-4.6.4.tar.bz2" diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD index cde73790c2..4b13192297 100644 --- a/main/xfce4-screenshooter/APKBUILD +++ b/main/xfce4-screenshooter/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-screenshooter -pkgver=1.6.0 +pkgver=1.7.9 pkgrel=0 pkgdesc="screenshot application for Xfce4" url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" @@ -8,14 +8,12 @@ license="GPL2" subpackages="$pkgname-doc" depends= makedepends="xfce4-panel-dev intltool hicolor-icon-theme libsm-dev - e2fsprogs-dev" + e2fsprogs-dev libsoup-dev libxext-dev" install="xfce4-screenshooter.post-install xfce4-screenshooter.post-upgrade xfce4-screenshooter.post-deinstall" -source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz - $install" +source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2" -build () -{ +build () { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -23,10 +21,11 @@ build () --localstatedir=/var \ --disable-static make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="331750879b966eec639eb3fe3045cb16 xfce4-screenshooter-1.6.0.tar.gz -db51db79681eadc47be4932355a77c25 xfce4-screenshooter.post-install -db51db79681eadc47be4932355a77c25 xfce4-screenshooter.post-upgrade -db51db79681eadc47be4932355a77c25 xfce4-screenshooter.post-deinstall" +md5sums="c01d1cf3830bf8d60e09c0cdd223034c xfce4-screenshooter-1.7.9.tar.bz2" diff --git a/main/xfce4-session/APKBUILD b/main/xfce4-session/APKBUILD index 21fe345250..d5ddddebc4 100644 --- a/main/xfce4-session/APKBUILD +++ b/main/xfce4-session/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-session -pkgver=4.6.1 -pkgrel=2 +pkgver=4.6.2 +pkgrel=0 pkgdesc="A session manager for Xfce" url="http://www.xfce.org/" license="GPL2" @@ -11,7 +11,7 @@ makedepends="pkgconfig libxfcegui4-dev libwnck-dev libglade-dev intltool e2fsprogs-dev zlib-dev" depends="hicolor-icon-theme" install= -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2 +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2 busybox-shutdown.patch" depends_dev="libxfcegui4-dev xfconf-dev" @@ -41,5 +41,5 @@ package() { "$pkgdir"/usr/bin/xfce4-tips } -md5sums="7628be41ed3511a20cff5673d9d39858 xfce4-session-4.6.1.tar.bz2 +md5sums="9d9890130e45e0e9476591ed9ba2c9d5 xfce4-session-4.6.2.tar.bz2 bfd9132f08f4a92efbe982fb911c511c busybox-shutdown.patch" diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD index ffc6ec035a..e6bab01dd9 100644 --- a/main/xfce4-settings/APKBUILD +++ b/main/xfce4-settings/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-settings -pkgver=4.6.4 -pkgrel=1 +pkgver=4.6.5 +pkgrel=0 pkgdesc="Settings manager for xfce" url="http://www.xfce.org/" license="GPL-2" @@ -11,7 +11,6 @@ makedepends="exo-dev libnotify-dev libxfcegui4-dev libxklavier-dev libwnck-dev libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev autoconf automake libtool" source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - xfce4-settings-4.7.1-libxklavier.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -49,5 +48,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="04985407e8e5b916c44780314a177e96 xfce4-settings-4.6.4.tar.bz2 -9a03696ed6200801d296c8adf6816a06 xfce4-settings-4.7.1-libxklavier.patch" +md5sums="f988cb732913b5fbc115ad7105d2231e xfce4-settings-4.6.5.tar.bz2" diff --git a/main/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD index 039ca22d37..946e59ad96 100644 --- a/main/xfce4-taskmanager/APKBUILD +++ b/main/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-taskmanager pkgver=0.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="a simple taskmanager for the Xfce Desktop Environment" url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager" license="GPL-2" diff --git a/main/xfce4-wavelan-plugin/APKBUILD b/main/xfce4-wavelan-plugin/APKBUILD index 27176f016a..108d74386b 100644 --- a/main/xfce4-wavelan-plugin/APKBUILD +++ b/main/xfce4-wavelan-plugin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-wavelan-plugin pkgver=0.5.5 -pkgrel=0 +pkgrel=1 pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/" license="custom" diff --git a/main/xfce4-xkb-plugin/APKBUILD b/main/xfce4-xkb-plugin/APKBUILD index 7b590a16ab..b69cb070f7 100644 --- a/main/xfce4-xkb-plugin/APKBUILD +++ b/main/xfce4-xkb-plugin/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-xkb-plugin pkgver=0.5.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" license="custom" diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD index f84906ba4a..704099fb97 100644 --- a/main/xfconf/APKBUILD +++ b/main/xfconf/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfconf -pkgver=4.6.1 -pkgrel=1 +pkgver=4.6.2 +pkgrel=0 pkgdesc="xfconf.. thingie" url="http://www.xfce.org/" license="GPL-2" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev" +makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev + intltool" source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" depends_dev="glib-dev dbus-dev dbus-glib-dev" @@ -27,4 +28,4 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="d4d3018767ea9eb4b57cc57d4038023b xfconf-4.6.1.tar.bz2" +md5sums="5ff93c15077c6dbbcd38c437bc1ab2ef xfconf-4.6.2.tar.bz2" diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD index 9634c0852c..5374a44795 100644 --- a/main/xfdesktop/APKBUILD +++ b/main/xfdesktop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfdesktop -pkgver=4.6.1 -pkgrel=2 +pkgver=4.6.2 +pkgrel=0 pkgdesc="A desktop manager for Xfce" url="http://www.xfce.org/" license="GPL-2" @@ -12,7 +12,7 @@ makedepends="pkgconfig libxfce4menu-dev thunar-dev intltool gettext-dev libglade-dev xfce4-panel-dev libsm-dev libice-dev expat-dev e2fsprogs-dev" install= -source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver build() { @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="ae15cacc3e3834cca7238a8e1035c50d xfdesktop-4.6.1.tar.bz2" +md5sums="e800ea9fee7a5c5eaf2ae96e23a83e3a xfdesktop-4.6.2.tar.bz2" diff --git a/main/xfprint/APKBUILD b/main/xfprint/APKBUILD index f09202ab37..daa695367c 100644 --- a/main/xfprint/APKBUILD +++ b/main/xfprint/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfprint pkgver=4.6.1 -pkgrel=1 +pkgrel=3 pkgdesc="A print dialog and a printer manager for Xfce" url="http://www.xfce.org/" license="GPL2" diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD index 638c4b72f0..dadad1d44c 100644 --- a/main/xfsprogs/APKBUILD +++ b/main/xfsprogs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfsprogs -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=0 pkgdesc="XFS filesystem utilities" url="http://oss.sgi.com/projects/xfs/" @@ -36,4 +36,4 @@ package() { cd "$_builddir" make -j1 DIST_ROOT="$pkgdir" install install-dev } -md5sums="c2308b46ee707597ac50aae418d321b8 xfsprogs-3.1.1.tar.gz" +md5sums="86d10178ee6897cb099c97303e6d9da0 xfsprogs-3.1.2.tar.gz" diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD index 5f90698e7d..9ca4fa568f 100644 --- a/main/xfwm4/APKBUILD +++ b/main/xfwm4/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfwm4 pkgver=4.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3" url="http://www.xfce.org/" license="GPL-2" diff --git a/main/xgamma/APKBUILD b/main/xgamma/APKBUILD index a980fcf4ce..920d2c8be3 100644 --- a/main/xgamma/APKBUILD +++ b/main/xgamma/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xgamma pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Alter a monitor's gamma correction through the X server" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xhost/APKBUILD b/main/xhost/APKBUILD index eb4989ed67..e1c2b65895 100644 --- a/main/xhost/APKBUILD +++ b/main/xhost/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xhost pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Controls host and/or user access to a running X server." url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD index be135ed7a7..86eb500e51 100644 --- a/main/xinit/APKBUILD +++ b/main/xinit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xinit pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="X.Org initialisation program " url="http://xorg.freedesktop.org/" license="GPL" diff --git a/main/xkbcomp/APKBUILD b/main/xkbcomp/APKBUILD index 13a7fd3ebe..c3eb7b4724 100644 --- a/main/xkbcomp/APKBUILD +++ b/main/xkbcomp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xkbcomp pkgver=1.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="compile XKB keyboard description" url="http://xorg.freedesktop.org" license="custom" diff --git a/main/xmodmap/APKBUILD b/main/xmodmap/APKBUILD index 87d0d4ba87..35f0b361c6 100644 --- a/main/xmodmap/APKBUILD +++ b/main/xmodmap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xmodmap pkgver=1.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="utility for modifying keymaps and pointer button mappings in X" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index b62bbca10d..2ae98aba28 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" -subpackages="$pkgname-dev $pkgname-doc xfbdev" +subpackages="$pkgname-dev $pkgname-doc xfbdev xvfb" depends=" font-misc-misc font-cursor-misc @@ -112,6 +112,7 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver make -j1 DESTDIR="$pkgdir" install || return 1 + chmod u+s "$pkgdir"/usr/bin/Xorg install -m755 -d "$pkgdir"/etc/X11 || return 1 install -m755 -d "$pkgdir"/var/lib/xkb || return 1 @@ -126,6 +127,12 @@ xfbdev() { mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/ } +xvfb() { + pkgdesc="Virtual Framebuffer 'fake' X server" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/Xvfb "$subpkgdir"/usr/bin/ +} + xephyr() { pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer" depends= @@ -133,5 +140,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="178225f499ec10fa9d312d1c339e6a39 xorg-server-1.7.6.tar.bz2 +md5sums="8c0146330fb155c23d947ac37d431d4b xorg-server-1.7.7.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" diff --git a/main/xrandr/APKBUILD b/main/xrandr/APKBUILD index fefa3aa843..c52fea1a4b 100644 --- a/main/xrandr/APKBUILD +++ b/main/xrandr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xrandr pkgver=1.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="primitive command line interface to RandR extension" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xrdb/APKBUILD b/main/xrdb/APKBUILD index 271fdb2934..0ea72ca8e7 100644 --- a/main/xrdb/APKBUILD +++ b/main/xrdb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xrdb pkgver=1.0.6 -pkgrel=0 +pkgrel=1 pkgdesc="X server resource database utility" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xrefresh/APKBUILD b/main/xrefresh/APKBUILD index f82d406213..83426fc66e 100644 --- a/main/xrefresh/APKBUILD +++ b/main/xrefresh/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xrefresh pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="refresh all or part of an X screen" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xset/APKBUILD b/main/xset/APKBUILD index 2a46871db5..975c63791a 100644 --- a/main/xset/APKBUILD +++ b/main/xset/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xset pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org xset application" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xsetmode/APKBUILD b/main/xsetmode/APKBUILD index 13e8fd3ebd..3bac795be8 100644 --- a/main/xsetmode/APKBUILD +++ b/main/xsetmode/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xsetmode pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="set the mode for an X Input device" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xsetroot/APKBUILD b/main/xsetroot/APKBUILD index cfcdb26bec..8bd60aa1f4 100644 --- a/main/xsetroot/APKBUILD +++ b/main/xsetroot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xsetroot pkgver=1.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org xsetroot application" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD index d31d703608..46ae1bb25c 100644 --- a/main/xtables-addons/APKBUILD +++ b/main/xtables-addons/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xtables-addons pkgver=1.21 -pkgrel=1 +pkgrel=2 pkgdesc="Netfilter userspace extensions for iptables" url="http://xtables-addons.sourceforge.net/" license="GPL" diff --git a/main/xvidcore/APKBUILD b/main/xvidcore/APKBUILD index 20a071cce4..6076bfac95 100644 --- a/main/xvidcore/APKBUILD +++ b/main/xvidcore/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xvidcore pkgver=1.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="XviD is an open source MPEG-4 video codec" url="http://www.xvid.org/" license="GPL" diff --git a/main/xvinfo/APKBUILD b/main/xvinfo/APKBUILD index 7edd4d03c0..71ad0740d0 100644 --- a/main/xvinfo/APKBUILD +++ b/main/xvinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xvinfo pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Print out X-Video extension adaptor information" url="http://xorg.freedesktop.org/" license="custom" diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD index a0975f415d..34e6e30e43 100644 --- a/main/yasm/APKBUILD +++ b/main/yasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=yasm -pkgver=0.8.0 +pkgver=1.0.1 pkgrel=0 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" url="http://www.tortall.net/projects/yasm/" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="84a72204c9b452a00b39b1b00495163f yasm-0.8.0.tar.gz" +md5sums="2174fc3b6b74de07667f42d47514c336 yasm-1.0.1.tar.gz" diff --git a/main/zip/APKBUILD b/main/zip/APKBUILD index 4998c35b76..6733e61e56 100644 --- a/main/zip/APKBUILD +++ b/main/zip/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Carlo Landmeter <clandmeter at gmail.com> pkgname=zip pkgver=3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Creates PKZIP-compatible .zip files" url="http://www.info-zip.org/pub/infozip/Zip.html" license="AS IS" -depends="uclibc" +depends="" makedepends="" source="ftp://ftp.info-${pkgname}.org/pub/info${pkgname}/src/${pkgname}30.zip 10-zip-3.0-build.patch diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index adf584ea97..62d3ec49d5 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,15 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib -pkgver=1.2.4 -pkgrel=0 +pkgver=1.2.5 +pkgrel=1 pkgdesc="A compression/decompression Library" license=custom:zlib url="http://zlib.net" depends= -source="http://zlib.net/$pkgname-$pkgver.tar.gz" +source="http://zlib.net/$pkgname-$pkgver.tar.gz + zlib-1.2.5-lfs-decls.patch + " subpackages="$pkgname-dev $pkgname-doc" _builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/zlib-1.2.5-lfs-decls.patch +} + build() { cd "$_builddir" # we trade size for a little more speed. @@ -31,4 +38,5 @@ dev() { mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a } -md5sums="47f6ed51b3c83a8534f9228531effa18 zlib-1.2.4.tar.gz" +md5sums="c735eab2d659a96e5a594c9e8541ad63 zlib-1.2.5.tar.gz +4cb279ea3beab621f3526bf7b7ab99e5 zlib-1.2.5-lfs-decls.patch" diff --git a/main/zlib/gzflush.patch b/main/zlib/gzflush.patch deleted file mode 100644 index 5e97e6573c..0000000000 --- a/main/zlib/gzflush.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gzwrite.c 2010-01-18 21:18:27.000000000 +0100 -+++ b/gzwrite.c 2010-01-28 04:37:20.330530306 +0100 -@@ -435,7 +435,8 @@ - state = (gz_statep)file; - - /* check that we're writing and that there's no error */ -- if (state->mode != GZ_WRITE|| state->err != Z_OK) -+ if (state->mode != GZ_WRITE || state->err != Z_OK) -+ return Z_STREAM_ERROR; - - /* check flush parameter */ - if (flush < 0 || flush > Z_FINISH) diff --git a/main/zlib/zlib-1.2.5-lfs-decls.patch b/main/zlib/zlib-1.2.5-lfs-decls.patch new file mode 100644 index 0000000000..36e26af035 --- /dev/null +++ b/main/zlib/zlib-1.2.5-lfs-decls.patch @@ -0,0 +1,13 @@ +Index: zlib-1.2.5/zlib.h +=================================================================== +--- zlib-1.2.5.orig/zlib.h ++++ zlib-1.2.5/zlib.h +@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( + # define gzoffset gzoffset64 + # define adler32_combine adler32_combine64 + # define crc32_combine crc32_combine64 +-# ifdef _LARGEFILE64_SOURCE ++# ifndef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/main/zonenotify/APKBUILD b/main/zonenotify/APKBUILD index 9709eba4ee..b442458d0a 100644 --- a/main/zonenotify/APKBUILD +++ b/main/zonenotify/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zonenotify pkgver=0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Utility to send NS_NOTIFY packets to slave DNS servers" arch="" url="http://www.morettoni.net/zonenotify.en.html" license='BSD' -depends="uclibc" +depends="" source="http://www.morettoni.net/bsd/$pkgname-$pkgver.tar.gz" build() { diff --git a/main/zsnes/APKBUILD b/main/zsnes/APKBUILD index 2dcb1bd630..04a44516d3 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=1 +pkgrel=2 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" license="GPL" |