From 22e5f5bf64eba5c65674eeb3a8167de2854dbe0e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 2 Feb 2012 23:14:44 +0000 Subject: Thu Feb 2 23:14:44 UTC 2012 --- community-testing/gnubiff/PKGBUILD | 29 +++ community/collectd/PKGBUILD | 15 +- community/collectd/libperl.patch | 1 - community/collectd/rtnl_dump_filter.patch | 23 ++ community/qtcreator/PKGBUILD | 10 +- ...-partially-fix-parsing-of-alias-with-dots.patch | 34 +++ ...odule-used-shared-code-in-module-creation.patch | 196 +++++++++++++++ ...handle-all-error-returns-from-init_module.patch | 34 +++ core/kmod/0004-modprobe-remove-0-refcnt-deps.patch | 52 ++++ core/kmod/PKGBUILD | 17 +- core/run-parts/PKGBUILD | 6 +- core/sdparm/PKGBUILD | 8 +- kde-unstable/calligra/PKGBUILD | 4 +- libre/crosstool-ng/PKGBUILD | 4 +- libre/filesystem/PKGBUILD | 22 +- libre/filesystem/filesystem.install | 3 - libre/filesystem/issue | 1 - libre/filesystem/modprobe.d.usb-load-ehci-first | 4 +- libre/initscripts/PKGBUILD | 4 +- libre/linux-libre/CVE-2012-0056.patch | 268 +++++++++++++++++++++ libre/linux-libre/PKGBUILD | 6 +- libre/linux-libre/linux-libre.install | 2 +- libre/pacman/PKGBUILD | 5 +- libre/pacman/rePKGBUILD | 2 +- multilib/lib32-udev/PKGBUILD | 6 +- testing/emacs/PKGBUILD | 21 +- testing/libssh2/PKGBUILD | 35 +++ ~fauno/notmuch/PKGBUILD | 22 +- ~fauno/notmuch/SRCBUILD | 39 +++ 29 files changed, 795 insertions(+), 78 deletions(-) create mode 100644 community-testing/gnubiff/PKGBUILD create mode 100644 community/collectd/rtnl_dump_filter.patch create mode 100644 core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch create mode 100644 core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch create mode 100644 core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch create mode 100644 core/kmod/0004-modprobe-remove-0-refcnt-deps.patch create mode 100644 libre/linux-libre/CVE-2012-0056.patch create mode 100644 testing/libssh2/PKGBUILD create mode 100644 ~fauno/notmuch/SRCBUILD diff --git a/community-testing/gnubiff/PKGBUILD b/community-testing/gnubiff/PKGBUILD new file mode 100644 index 000000000..cf964e9c7 --- /dev/null +++ b/community-testing/gnubiff/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 63401 2012-02-01 22:53:12Z ibiru $ +# Maintainer: Sergej Pupykin +# Maintainer: Tom K +# Contributor: Todd Musall + +pkgname=gnubiff +pkgver=2.2.14 +pkgrel=1 +pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived" +arch=('i686' 'x86_64') +url="http://gnubiff.sourceforge.net/" +license=("GPL") +depends=('libglade' 'gtk3' 'popt') +makedepends=('perlxml' 'intltool') +conflicts=(gnubiff-gtk) +source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz) +md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24') + +build() { + [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr + cd $srcdir/gnubiff-$pkgver + + ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \ + --disable-fam --disable-gnome + make + make DESTDIR=$pkgdir install + + rm -rf ${pkgdir}/usr/share/info/dir +} diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 6dc54a8db..c566a9a43 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61911 2012-01-10 16:09:29Z foutrelis $ +# $Id: PKGBUILD 63391 2012-02-01 06:31:42Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Gerhard Brauer pkgname=collectd -pkgver=5.0.1 -pkgrel=2 +pkgver=5.0.2 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64') url='http://collectd.org/' @@ -39,13 +39,15 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' 'libvirt' 'libxml2' 'xmms' 'yajl') -depends=('libtool') +depends=('libltdl') source=("${url}files/${pkgname}-${pkgver}.tar.gz" + 'rtnl_dump_filter.patch' 'libperl.patch' 'rc.d') -sha1sums=('ec1bf97d21a27d9b53b20f7dc4fb61441b4e42e0' - 'b17793f0e7e2c94079257349a1bac7ba8d94e4a3' +sha1sums=('96b2b2c285b2334d41b6ebb2a58acd28757e69fc' + 'c92b8dacff0a71f2cc8645c2e350ff9bdc1cbd5f' + '245c098d121a4a05594553583310953b3a2f6461' '0f441718d5519cb043b1130e5a1d0379078adbcc') install=install @@ -53,6 +55,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../rtnl_dump_filter.patch patch -p1 -i ../libperl.patch autoconf diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch index 7a9ad9fc0..baa9c5397 100644 --- a/community/collectd/libperl.patch +++ b/community/collectd/libperl.patch @@ -27,4 +27,3 @@ diff -aur old/configure.in new/configure.in ) ) -Only in new: configure.in.orig diff --git a/community/collectd/rtnl_dump_filter.patch b/community/collectd/rtnl_dump_filter.patch new file mode 100644 index 000000000..d5929a621 --- /dev/null +++ b/community/collectd/rtnl_dump_filter.patch @@ -0,0 +1,23 @@ +diff -Naur old/src/netlink.c new/src/netlink.c +--- old/src/netlink.c 2012-01-22 22:10:04.000000000 +1100 ++++ new/src/netlink.c 2012-02-01 17:22:54.362752065 +1100 +@@ -570,8 +570,7 @@ + return (-1); + } + +- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL, +- NULL, NULL) != 0) ++ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0) + { + ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); + return (-1); +@@ -608,8 +607,7 @@ + continue; + } + +- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex, +- NULL, NULL) != 0) ++ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0) + { + ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); + continue; diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index fb21f0f79..ffe67ea13 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61095 2011-12-21 20:52:38Z andrea $ +# $Id: PKGBUILD 63396 2012-02-01 14:18:50Z svenstaro $ # Maintainer: Imanol Celaya # Maintainer: Sven-Hendrik Haase # Contributor: Lukas Jirkovsky @@ -7,9 +7,9 @@ # Contributor: delor pkgname="qtcreator" -pkgver=2.4.0 -_pkgver=2.4.0 -pkgrel=2 +pkgver=2.4.1 +_pkgver=2.4.1 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt.nokia.com/products/developer-tools' @@ -27,7 +27,7 @@ optdepends=('qt-doc: for the integrated Qt documentation' install=qtcreator.install source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop') -md5sums=('80c1a2be4c685ce147c42424ad977e1a' +md5sums=('e3a95b86df5ce9151b40cfbb2b8bbf3b' 'f1f4680b9838ff0b8f4cf11eb850d662') build() { diff --git a/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch b/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch new file mode 100644 index 000000000..b69d095d3 --- /dev/null +++ b/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch @@ -0,0 +1,34 @@ +From cdaf4b2f3ef60365c6b8006a63410368a7b38f39 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Tue, 31 Jan 2012 00:12:32 -0500 +Subject: [PATCH 1/4] partially fix parsing of alias with dots + +--- + libkmod/libkmod-util.c | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c +index 7c2611b..6a9f697 100644 +--- a/libkmod/libkmod-util.c ++++ b/libkmod/libkmod-util.c +@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) + case ']': + return -EINVAL; + case '[': +- while (alias[s] != ']' && +- alias[s] != '.' && alias[s] != '\0') ++ while (alias[s] != ']' && alias[s] != '\0') + s++; + + if (alias[s] != ']') +@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) + s++; + break; + case '\0': +- case '.': + goto finish; + default: + buf[s] = c; +-- +1.7.9 + diff --git a/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch new file mode 100644 index 000000000..76cc35049 --- /dev/null +++ b/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch @@ -0,0 +1,196 @@ +From 1d2f64689b2456ade81d6d489c4f5bfb5fdb92fd Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Tue, 31 Jan 2012 00:13:43 -0500 +Subject: [PATCH 2/4] libkmod-module: used shared code in module creation + +--- + libkmod/libkmod-module.c | 135 ++++++++++++++++++++++++++------------------- + 1 files changed, 78 insertions(+), 57 deletions(-) + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index 47b1709..48e4aa1 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -162,6 +162,76 @@ fail: + return err; + } + ++/* ++ * Memory layout with alias: ++ * ++ * struct kmod_module { ++ * hashkey -----. ++ * alias -----. | ++ * name ----. | | ++ * } | | | ++ * name <----------' | | ++ * alias <-----------' | ++ * name\alias <--------' ++ * ++ * Memory layout without alias: ++ * ++ * struct kmod_module { ++ * hashkey ---. ++ * alias -----|----> NULL ++ * name ----. | ++ * } | | ++ * name <----------'-' ++ * ++ * @key is "name\alias" or "name" (in which case alias == NULL) ++ */ ++static int kmod_module_new(struct kmod_ctx *ctx, const char *key, ++ const char *name, size_t namelen, ++ const char *alias, size_t aliaslen, ++ struct kmod_module **mod) ++{ ++ struct kmod_module *m; ++ size_t keylen; ++ ++ m = kmod_pool_get_module(ctx, key); ++ if (m != NULL) { ++ *mod = kmod_module_ref(m); ++ return 0; ++ } ++ ++ if (alias == NULL) ++ keylen = namelen; ++ else ++ keylen = namelen + aliaslen + 1; ++ ++ m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1)); ++ if (m == NULL) { ++ free(m); ++ return -ENOMEM; ++ } ++ ++ memset(m, 0, sizeof(*m)); ++ ++ m->ctx = kmod_ref(ctx); ++ m->name = (char *)m + sizeof(*m); ++ memcpy(m->name, key, keylen + 1); ++ if (alias == NULL) { ++ m->hashkey = m->name; ++ m->alias = NULL; ++ } else { ++ m->name[namelen] = '\0'; ++ m->alias = m->name + namelen + 1; ++ m->hashkey = m->name + keylen + 1; ++ memcpy(m->hashkey, key, keylen + 1); ++ } ++ ++ m->refcount = 1; ++ kmod_pool_add_module(ctx, m, m->hashkey); ++ *mod = m; ++ ++ return 0; ++} ++ + /** + * kmod_module_new_from_name: + * @ctx: kmod library context +@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx, + const char *name, + struct kmod_module **mod) + { +- struct kmod_module *m; + size_t namelen; + char name_norm[PATH_MAX]; +- char *namesep; + + if (ctx == NULL || name == NULL || mod == NULL) + return -ENOENT; + +- if (alias_normalize(name, name_norm, &namelen) < 0) { +- DBG(ctx, "invalid alias: %s\n", name); +- return -EINVAL; +- } ++ modname_normalize(name, name_norm, &namelen); + +- m = kmod_pool_get_module(ctx, name_norm); +- if (m != NULL) { +- *mod = kmod_module_ref(m); +- return 0; +- } +- +- namesep = strchr(name_norm, '/'); +- m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2); +- if (m == NULL) { +- free(m); +- return -ENOMEM; +- } +- +- memset(m, 0, sizeof(*m)); +- +- m->ctx = kmod_ref(ctx); +- m->name = (char *)m + sizeof(*m); +- memcpy(m->name, name_norm, namelen + 1); +- +- if (namesep) { +- size_t len = namesep - name_norm; +- +- m->name[len] = '\0'; +- m->alias = m->name + len + 1; +- m->hashkey = m->name + namelen + 1; +- memcpy(m->hashkey, name_norm, namelen + 1); +- } else { +- m->hashkey = m->name; +- } +- +- m->refcount = 1; +- kmod_pool_add_module(ctx, m, m->hashkey); +- *mod = m; +- +- return 0; ++ return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod); + } + + int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias, +@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias, + + memcpy(key, name, namelen); + memcpy(key + namelen + 1, alias, aliaslen + 1); +- key[namelen] = '/'; ++ key[namelen] = '\\'; + +- err = kmod_module_new_from_name(ctx, key, mod); ++ err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod); + if (err < 0) + return err; + +@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx, + free(abspath); + else { + ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n", +- name, abspath, m->path); ++ name, abspath, m->path); + free(abspath); + return -EEXIST; + } +@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx, + return 0; + } + +- m = malloc(sizeof(*m) + namelen + 1); +- if (m == NULL) +- return -errno; +- +- memset(m, 0, sizeof(*m)); ++ err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m); ++ if (err < 0) ++ return err; + +- m->ctx = kmod_ref(ctx); +- m->name = (char *)m + sizeof(*m); +- memcpy(m->name, name, namelen + 1); + m->path = abspath; +- m->hashkey = m->name; +- m->refcount = 1; +- +- kmod_pool_add_module(ctx, m, m->hashkey); +- + *mod = m; + + return 0; +-- +1.7.9 + diff --git a/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch b/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch new file mode 100644 index 000000000..5bbc93a90 --- /dev/null +++ b/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch @@ -0,0 +1,34 @@ +From fdf78d80d298353c29e1fe8c00602669dd9662bb Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Mon, 30 Jan 2012 23:05:26 -0500 +Subject: [PATCH 3/4] modprobe: handle all error returns from init_module + +--- + tools/kmod-modprobe.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c +index 3e51506..c882856 100644 +--- a/tools/kmod-modprobe.c ++++ b/tools/kmod-modprobe.c +@@ -551,6 +551,8 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts) + + err = kmod_module_insert_module(mod, flags, opts); + switch (err) { ++ case 0: ++ break; + case -EEXIST: + /* + * We checked for EEXIST with an earlier call to +@@ -564,7 +566,7 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts) + ERR("Module %s already in kernel.\n", + kmod_module_get_name(mod)); + break; +- case -EPERM: ++ default: + ERR("could not insert '%s': %s\n", kmod_module_get_name(mod), + strerror(-err)); + break; +-- +1.7.9 + diff --git a/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch b/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch new file mode 100644 index 000000000..80cc73130 --- /dev/null +++ b/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch @@ -0,0 +1,52 @@ +From 4e3dd21aff55b5bbaa08b037fc2a5625bfffc0a5 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Mon, 30 Jan 2012 23:39:30 -0500 +Subject: [PATCH 4/4] modprobe: remove 0 refcnt deps + +--- + tools/kmod-modprobe.c | 15 +++++++++++++-- + 1 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c +index c882856..bd991a5 100644 +--- a/tools/kmod-modprobe.c ++++ b/tools/kmod-modprobe.c +@@ -381,7 +381,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) + static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) + { + const char *modname = kmod_module_get_name(mod); +- struct kmod_list *pre = NULL, *post = NULL; ++ struct kmod_list *pre = NULL, *post = NULL, *deps, *itr; + const char *cmd = NULL; + int err; + +@@ -422,7 +422,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) + rmmod_do_deps_list(post, false); + + if (do_dependencies && remove_dependencies) { +- struct kmod_list *deps = kmod_module_get_dependencies(mod); ++ deps = kmod_module_get_dependencies(mod); + + err = rmmod_do_deps_list(deps, true); + if (err < 0) +@@ -451,6 +451,17 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) + + rmmod_do_deps_list(pre, false); + ++ deps = kmod_module_get_dependencies(mod); ++ if (deps != NULL) { ++ kmod_list_foreach_reverse(itr, deps) { ++ struct kmod_module *dep = kmod_module_get_module(itr); ++ if (kmod_module_get_refcnt(dep) == 0) ++ rmmod_do_remove_module(dep); ++ kmod_module_unref(dep); ++ } ++ kmod_module_unref_list(deps); ++ } ++ + error: + kmod_module_unref_list(pre); + kmod_module_unref_list(post); +-- +1.7.9 + diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 5147f866f..ac327eac1 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147035 2012-01-21 00:32:01Z dreisner $ +# $Id: PKGBUILD 148463 2012-02-01 13:16:33Z dreisner $ # Maintainer: Dave Reisner pkgname=kmod pkgver=4 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url="http://git.profusion.mobi/cgit.cgi/kmod.git" @@ -15,13 +15,26 @@ provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz" + 0001-partially-fix-parsing-of-alias-with-dots.patch + 0002-libkmod-module-used-shared-code-in-module-creation.patch + 0003-modprobe-handle-all-error-returns-from-init_module.patch + 0004-modprobe-remove-0-refcnt-deps.patch "depmod-search.conf") md5sums=('e14450a066a48accd0af1995b3c0232d' + '5f497ab3466ee1a616b6e6c97b330706' + '23a9257a152862753ce4c4ee7287761a' + '3a57671b0f37b1203b207f35a4442ae3' + '1fe88eee9302104b179124ce6bfc55d2' '4b8cbcbc54b9029c99fd730e257d4436') build() { cd "$pkgname-$pkgver" + patch -Np1 <"$srcdir/0001-partially-fix-parsing-of-alias-with-dots.patch" + patch -Np1 <"$srcdir/0002-libkmod-module-used-shared-code-in-module-creation.patch" + patch -Np1 <"$srcdir/0003-modprobe-handle-all-error-returns-from-init_module.patch" + patch -Np1 <"$srcdir/0004-modprobe-remove-0-refcnt-deps.patch" + ./configure \ --sysconfdir=/etc \ --with-rootprefix= \ diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD index 3ae03c979..aa67049d5 100644 --- a/core/run-parts/PKGBUILD +++ b/core/run-parts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142725 2011-11-13 21:03:15Z pierre $ +# $Id: PKGBUILD 148459 2012-02-01 09:04:29Z pierre $ # Maintainer: Pierre Schmitz pkgname=run-parts -pkgver=4.0.4 +pkgver=4.2.1 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('9a14722c7422c6d16f30c80b74201d9c803beeef2bb4c004964d0979eaa1232f') +sha256sums=('6359b273bee9b959d243d1490caa8f0f5ff8dc294690b1bdb5df755d6364be0f') build() { cd $srcdir/debianutils-$pkgver diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD index 0bf5ea56f..d983deffd 100644 --- a/core/sdparm/PKGBUILD +++ b/core/sdparm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 142819 2011-11-15 17:24:15Z andrea $ +# $Id: PKGBUILD 148461 2012-02-01 12:06:03Z stephane $ # Maintainer: # Contributor: Giovanni Scafora # Contributor: grimi@poczta.fm pkgname=sdparm -pkgver=1.06 -pkgrel=2 +pkgver=1.07 +pkgrel=1 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64') url="http://sg.danny.cz/sg/sdparm.html" license=('BSD') depends=('glibc') source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") -md5sums=('5e19913658bb4f9849ddd909e0f47cde') +md5sums=('c807f9db3dd7af175214be0d7fece494') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD index 98b8acd28..4f9242635 100644 --- a/kde-unstable/calligra/PKGBUILD +++ b/kde-unstable/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146515 2012-01-12 08:10:29Z andrea $ +# $Id: PKGBUILD 148469 2012-02-01 21:33:53Z andrea $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -24,7 +24,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.3.86 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 8843af016..5341fa6f5 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Parabola): fauno pkgname=crosstool-ng -pkgver=1.13.0 +pkgver=1.13.2 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64') @@ -26,4 +26,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('55fba9f37b9f9ed0aeb6c50fbd8b6429') +md5sums=('749cf70568ad07d1b13fdcd25b163553') diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index ea1e0e4f9..733d34aa3 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140217 2011-10-09 23:32:13Z dreisner $ +# $Id: PKGBUILD 147201 2012-01-24 06:36:12Z bisson $ # Maintainer: Tom Gundersen # Maintainer (Parabola): fauno pkgname=filesystem -pkgver=2011.10 -pkgrel=1 +pkgver=2011.12 +pkgrel=2 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -19,7 +19,7 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') md5sums=('772fe869b921698cc3e6fde73c4ac85a' - '140787c0dc6f3f1272cfd381b92b0155' + '6be47d893fd49b2e4a8c0e811b350861' '13753e4e0964f3652b0cc60a28528bdf' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' @@ -34,7 +34,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a' '22518e922891f9359f971f4f5b4e793c' 'd2dc4e39dbdea75b107f91789e3274ab' 'f3b6ae7db8adffaaa4bffc6099dcbd50' - '8098ffd9fbf890468d3198277596b85a') + 'a8a962370cd0128465d514e6a1f74130') package() { cd ${srcdir} @@ -56,6 +56,7 @@ package() { for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do install -m644 ${srcdir}/${f} ${pkgdir}/etc/ done + ln -s /proc/self/mounts ${pkgdir}/etc/mtab for f in gshadow shadow crypttab; do install -m600 ${srcdir}/${f} ${pkgdir}/etc/ done @@ -63,16 +64,15 @@ package() { install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf # setup /var - for d in cache/man local opt run log/old lib/misc empty; do + for d in cache/man local opt log/old lib/misc empty; do install -d -m755 ${pkgdir}/var/${d} done - install -d -m1777 ${pkgdir}/var/{lock,tmp,spool/mail} + install -d -m1777 ${pkgdir}/var/{tmp,spool/mail} # allow setgid games to write scores install -d -m775 -g games ${pkgdir}/var/games - ln -s spool/mail ${pkgdir}/var/mail - # prevent pacman from removing directory (FS#16886) - touch ${pkgdir}/var/empty/.keep - + ln -s /var/spool/mail ${pkgdir}/var/mail + ln -s /run ${pkgdir}/var/run + ln -s /run/lock ${pkgdir}/var/lock # # setup /usr hierarchy diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 640cd5c1d..0ecc27e65 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -1,9 +1,6 @@ post_install() { [ -f var/log/lastlog ] || : >var/log/lastlog [ -f var/log/wtmp ] || : >var/log/wtmp - [ -f var/run/utmp ] || : >var/run/utmp - chown root:20 var/run/utmp - chmod 664 var/run/utmp [ -f var/log/btmp ] || (: >var/log/btmp && bin/chmod 600 var/log/btmp) # workaround for bug #7194 # readded due to bug #9465 diff --git a/libre/filesystem/issue b/libre/filesystem/issue index 323abdbf7..b001c55dd 100644 --- a/libre/filesystem/issue +++ b/libre/filesystem/issue @@ -1,3 +1,2 @@ - Parabola GNU/Linux-libre \r (\n) (\l) diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first index 3b5db0e7a..947379411 100644 --- a/libre/filesystem/modprobe.d.usb-load-ehci-first +++ b/libre/filesystem/modprobe.d.usb-load-ehci-first @@ -1,2 +1,2 @@ -install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd $CMDLINE_OPTS -install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd $CMDLINE_OPTS +softdep ohci_hcd pre: ehci_hcd +softdep uhci_hcd pre: ehci_hcd diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 9ce6cd8ae..f8b70de29 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2011.12.14 +pkgver=2012.02.1 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -28,5 +28,5 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('55f010509c91d2a236df49a82af48b4b' +md5sums=('db7506749d240cbe1e5988d3a81d72a9' '027576534885b8d5dded9be546057b12') diff --git a/libre/linux-libre/CVE-2012-0056.patch b/libre/linux-libre/CVE-2012-0056.patch new file mode 100644 index 000000000..6a83fef1c --- /dev/null +++ b/libre/linux-libre/CVE-2012-0056.patch @@ -0,0 +1,268 @@ +From e268337dfe26dfc7efd422a804dbb27977a3cccc Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Tue, 17 Jan 2012 15:21:19 -0800 +Subject: [PATCH] proc: clean up and fix /proc//mem handling +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Jüri Aedla reported that the /proc//mem handling really isn't very +robust, and it also doesn't match the permission checking of any of the +other related files. + +This changes it to do the permission checks at open time, and instead of +tracking the process, it tracks the VM at the time of the open. That +simplifies the code a lot, but does mean that if you hold the file +descriptor open over an execve(), you'll continue to read from the _old_ +VM. + +That is different from our previous behavior, but much simpler. If +somebody actually finds a load where this matters, we'll need to revert +this commit. + +I suspect that nobody will ever notice - because the process mapping +addresses will also have changed as part of the execve. So you cannot +actually usefully access the fd across a VM change simply because all +the offsets for IO would have changed too. + +Reported-by: Jüri Aedla +Cc: Al Viro +Signed-off-by: Linus Torvalds +--- + fs/proc/base.c | 145 +++++++++++++++----------------------------------------- + 1 files changed, 39 insertions(+), 106 deletions(-) + +diff --git a/fs/proc/base.c b/fs/proc/base.c +index 5485a53..662ddf2 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -198,65 +198,7 @@ static int proc_root_link(struct dentry *dentry, struct path *path) + return result; + } + +-static struct mm_struct *__check_mem_permission(struct task_struct *task) +-{ +- struct mm_struct *mm; +- +- mm = get_task_mm(task); +- if (!mm) +- return ERR_PTR(-EINVAL); +- +- /* +- * A task can always look at itself, in case it chooses +- * to use system calls instead of load instructions. +- */ +- if (task == current) +- return mm; +- +- /* +- * If current is actively ptrace'ing, and would also be +- * permitted to freshly attach with ptrace now, permit it. +- */ +- if (task_is_stopped_or_traced(task)) { +- int match; +- rcu_read_lock(); +- match = (ptrace_parent(task) == current); +- rcu_read_unlock(); +- if (match && ptrace_may_access(task, PTRACE_MODE_ATTACH)) +- return mm; +- } +- +- /* +- * No one else is allowed. +- */ +- mmput(mm); +- return ERR_PTR(-EPERM); +-} +- +-/* +- * If current may access user memory in @task return a reference to the +- * corresponding mm, otherwise ERR_PTR. +- */ +-static struct mm_struct *check_mem_permission(struct task_struct *task) +-{ +- struct mm_struct *mm; +- int err; +- +- /* +- * Avoid racing if task exec's as we might get a new mm but validate +- * against old credentials. +- */ +- err = mutex_lock_killable(&task->signal->cred_guard_mutex); +- if (err) +- return ERR_PTR(err); +- +- mm = __check_mem_permission(task); +- mutex_unlock(&task->signal->cred_guard_mutex); +- +- return mm; +-} +- +-struct mm_struct *mm_for_maps(struct task_struct *task) ++static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) + { + struct mm_struct *mm; + int err; +@@ -267,7 +209,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task) + + mm = get_task_mm(task); + if (mm && mm != current->mm && +- !ptrace_may_access(task, PTRACE_MODE_READ)) { ++ !ptrace_may_access(task, mode)) { + mmput(mm); + mm = ERR_PTR(-EACCES); + } +@@ -276,6 +218,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task) + return mm; + } + ++struct mm_struct *mm_for_maps(struct task_struct *task) ++{ ++ return mm_access(task, PTRACE_MODE_READ); ++} ++ + static int proc_pid_cmdline(struct task_struct *task, char * buffer) + { + int res = 0; +@@ -752,38 +699,39 @@ static const struct file_operations proc_single_file_operations = { + + static int mem_open(struct inode* inode, struct file* file) + { +- file->private_data = (void*)((long)current->self_exec_id); ++ struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode); ++ struct mm_struct *mm; ++ ++ if (!task) ++ return -ESRCH; ++ ++ mm = mm_access(task, PTRACE_MODE_ATTACH); ++ put_task_struct(task); ++ ++ if (IS_ERR(mm)) ++ return PTR_ERR(mm); ++ + /* OK to pass negative loff_t, we can catch out-of-range */ + file->f_mode |= FMODE_UNSIGNED_OFFSET; ++ file->private_data = mm; ++ + return 0; + } + + static ssize_t mem_read(struct file * file, char __user * buf, + size_t count, loff_t *ppos) + { +- struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode); ++ int ret; + char *page; + unsigned long src = *ppos; +- int ret = -ESRCH; +- struct mm_struct *mm; ++ struct mm_struct *mm = file->private_data; + +- if (!task) +- goto out_no_task; ++ if (!mm) ++ return 0; + +- ret = -ENOMEM; + page = (char *)__get_free_page(GFP_TEMPORARY); + if (!page) +- goto out; +- +- mm = check_mem_permission(task); +- ret = PTR_ERR(mm); +- if (IS_ERR(mm)) +- goto out_free; +- +- ret = -EIO; +- +- if (file->private_data != (void*)((long)current->self_exec_id)) +- goto out_put; ++ return -ENOMEM; + + ret = 0; + +@@ -810,13 +758,7 @@ static ssize_t mem_read(struct file * file, char __user * buf, + } + *ppos = src; + +-out_put: +- mmput(mm); +-out_free: + free_page((unsigned long) page); +-out: +- put_task_struct(task); +-out_no_task: + return ret; + } + +@@ -825,27 +767,15 @@ static ssize_t mem_write(struct file * file, const char __user *buf, + { + int copied; + char *page; +- struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode); + unsigned long dst = *ppos; +- struct mm_struct *mm; ++ struct mm_struct *mm = file->private_data; + +- copied = -ESRCH; +- if (!task) +- goto out_no_task; ++ if (!mm) ++ return 0; + +- copied = -ENOMEM; + page = (char *)__get_free_page(GFP_TEMPORARY); + if (!page) +- goto out_task; +- +- mm = check_mem_permission(task); +- copied = PTR_ERR(mm); +- if (IS_ERR(mm)) +- goto out_free; +- +- copied = -EIO; +- if (file->private_data != (void *)((long)current->self_exec_id)) +- goto out_mm; ++ return -ENOMEM; + + copied = 0; + while (count > 0) { +@@ -869,13 +799,7 @@ static ssize_t mem_write(struct file * file, const char __user *buf, + } + *ppos = dst; + +-out_mm: +- mmput(mm); +-out_free: + free_page((unsigned long) page); +-out_task: +- put_task_struct(task); +-out_no_task: + return copied; + } + +@@ -895,11 +819,20 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig) + return file->f_pos; + } + ++static int mem_release(struct inode *inode, struct file *file) ++{ ++ struct mm_struct *mm = file->private_data; ++ ++ mmput(mm); ++ return 0; ++} ++ + static const struct file_operations proc_mem_operations = { + .llseek = mem_lseek, + .read = mem_read, + .write = mem_write, + .open = mem_open, ++ .release = mem_release, + }; + + static ssize_t environ_read(struct file *file, char __user *buf, +-- +1.7.6.5 + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3bd2c7fe6..bc6b67c12 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -341,8 +341,8 @@ package_linux-libre-docs() { rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '6e0c99536652e7deb71acbadc980b586' - 'fb12372c5c7bc4e5328b38953616c7a5' + '39d471f90b754fd60529166cd37e5e0d' + '5c654bfed9005675317794c492bd2d8c' '92f62a90c1df8d74704a510d28146c52' '576ba68b171efd4a3333736c30f334ef' 'a8a3843046926eb7ab81312cd438c5c5' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index f08840c94..6dc0e247d 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.2.1-1-LIBRE +KERNEL_VERSION=3.2.2-1-LIBRE post_install () { # updating module dependencies diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 00ed5e69c..00faf0842 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 145836 2012-01-02 19:39:43Z dreisner $ +# $Id: PKGBUILD 146568 2012-01-13 16:47:02Z dreisner $ # Maintainer: Dan McGee # Maintainer: Dave Reisner pkgname=pacman pkgver=4.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -13,6 +13,7 @@ license=('GPL') groups=('base') depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist') +makedepends=('asciidoc') optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD index 3648f2a18..3967b90ab 100644 --- a/libre/pacman/rePKGBUILD +++ b/libre/pacman/rePKGBUILD @@ -2,7 +2,7 @@ source PKGBUILD CARCH=x86_64 unset build package md5sums source -_repo=testing +_repo=core source=(PKGBUILD ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT # files for pkg modifications diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index e6637987a..562c1c471 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62861 2012-01-27 21:31:29Z lcarlier $ +# $Id: PKGBUILD 63389 2012-02-01 05:09:50Z lcarlier $ # Maintainer: Aaron Griffin # Maintainer: Tobias Powalowski # Maintainer: Thomas Bächler pkgname=('lib32-udev') -pkgver=179 +pkgver=180 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -14,7 +14,7 @@ options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev') makedepends=('gcc-multilib' 'gperf') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz) -md5sums=('7d2880f66ea39146aae928f19ff3ca09') +md5sums=('1cf124ab5a124ea35d4748ea414926ec') build() { export CC="gcc -m32" diff --git a/testing/emacs/PKGBUILD b/testing/emacs/PKGBUILD index a8f2f3654..7fa3741a5 100644 --- a/testing/emacs/PKGBUILD +++ b/testing/emacs/PKGBUILD @@ -1,28 +1,23 @@ -# $Id: PKGBUILD 148085 2012-01-30 18:45:21Z ibiru $ +# $Id: PKGBUILD 148457 2012-02-01 08:56:36Z juergen $ # Maintainer: Juergen Hoetzel # Contributor: Renchi Raju pkgname=emacs -_majorver=23.3 -_minorver=b -# We want something like "23.3.a" so pacman version comparison works, but -# upstream uses "23.3a", which is a bit silly and interpreted as alpha. -pkgver=$_majorver.$_minorver -_realver=$_majorver$_minorver -pkgrel=2 +pkgver=23.4 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.bz2{,.sig} emacs-subversion17.patch) -md5sums=('917ce0054ef63773078a6e99b55df1ee' - '4f987fbb906c0ee73e05904b0f7ce5ec' +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch) +md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' + '55eb16eb48b44987693c0e3ea5ab8075' '12e2e7a66df5cc5ded54e1d30083a1fb') build() { - cd "$srcdir"/$pkgname-$_majorver + cd "$srcdir"/$pkgname-$pkgver patch -p1 -i ../emacs-subversion17.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft @@ -30,7 +25,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$_majorver + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install # remove conflict with ctags package diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD new file mode 100644 index 000000000..76eabb1f2 --- /dev/null +++ b/testing/libssh2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 148465 2012-02-01 13:38:10Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: Angel Velasquez +# Contributor: Sergej Pupykin +# Contributor: Andrea Scarpino +# Contributor: ice-man + +pkgname=libssh2 +pkgver=1.4.0 +pkgrel=1 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +provides=('libssh2.so=1-64') +options=('!libtool') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('ee670161d8c5dff93ae84a3f34f15669' + 'd30af693479e5e88036ffb61ab8d0dc9') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index 9b02b0919..6e9c92ea4 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Richard Murri pkgname=notmuch -pkgver=0.11_rc3 +pkgver=0.11.1 pkgrel=1 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) @@ -16,13 +16,12 @@ optdepends=('emacs: for using the emacs interface' 'python2: for using the python bindings' 'ruby: for using the ruby bindings' 'gnupg: for email encryption') -_commit='310608f279150c735b9fde89f2d632f3b41abd6c' -source=(#"http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz" - "http://git.notmuchmail.org/git/notmuch/snapshot/${_commit}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz" + # "http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz" + ) build() { - #cd "$srcdir/${pkgname}-${pkgver}" - cd $srcdir/${pkgname}-* + cd "$srcdir/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make @@ -33,14 +32,12 @@ build() { } check() { - #cd "$srcdir/${pkgname}-${pkgver}" - cd $srcdir/${pkgname}-* + cd "$srcdir/${pkgname}-${pkgver}" make test } package(){ - #cd "$srcdir/${pkgname}-${pkgver}" - cd $srcdir/${pkgname}-* + cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install install -D notmuch $pkgdir/usr/sbin/notmuch @@ -65,4 +62,7 @@ package(){ sed -i -e 's,/site_ruby,,g' Makefile make prefix=${pkgdir}/usr install } -md5sums=('0383f55b5e800e626fd805919138c1b3') +md5sums=('764abeb6e277c4c03bd64914c72d89a8' + '886b9fed1326c82aa223b0cfaf717522' + 'e36987a69d0c1e57570f5a854054a729') +md5sums=('764abeb6e277c4c03bd64914c72d89a8') diff --git a/~fauno/notmuch/SRCBUILD b/~fauno/notmuch/SRCBUILD new file mode 100644 index 000000000..29a3a945f --- /dev/null +++ b/~fauno/notmuch/SRCBUILD @@ -0,0 +1,39 @@ +# Maintainer: Nicolás Reynolds + +pkgname=notmuch +pkgver=0.11.1 +pkgrel=1 +pkgdesc="Notmuch is not much of an email program" +arch=('any') +url="http://notmuchmail.org/" +license=('GPL3') +makedepends=('git') + +_gitroot="git://notmuchmail.org/git/notmuch" +_gitname="${pkgname}" + +build() { + cd "$srcdir" + msg 'Connecting to GIT server...' + + if [ -d $_gitname ] ; then + cd $_gitname; git pull origin + msg 'The local files are updated.' + else + git clone $_gitroot $_gitname + fi + + msg "GIT checkout done or server timeout" + +} + +package() { + cd ${pkgdir} + export PKGDEST=${SRCDEST} + export PKGEXT=.src.tar.xz + + git clone ${srcdir}/${pkgname} ${pkgname}-${pkgver} + +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf