diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-04 20:38:02 -0600 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-04 20:38:02 -0600 |
commit | 655aabe10c5d75c91787a53a558f90489b85d1a9 (patch) | |
tree | 235675bfe3c3dada829728d2d7b59cecf266ff83 /core | |
parent | e80fbd1a17f3b41bc13792e5f43eccac19522411 (diff) | |
parent | e749dd6e64d74f4311b672936646a3b2664cecf5 (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'core')
-rw-r--r-- | core/curl/0001-include-headers-for-tcp-keepalives.patch | 31 | ||||
-rw-r--r-- | core/curl/PKGBUILD | 10 | ||||
-rw-r--r-- | core/iptables/PKGBUILD | 16 | ||||
-rw-r--r-- | core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch | 34 | ||||
-rw-r--r-- | core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch | 196 | ||||
-rw-r--r-- | core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch | 34 | ||||
-rw-r--r-- | core/kmod/0004-modprobe-remove-0-refcnt-deps.patch | 52 | ||||
-rw-r--r-- | core/kmod/PKGBUILD | 17 | ||||
-rw-r--r-- | core/run-parts/PKGBUILD | 6 | ||||
-rw-r--r-- | core/sdparm/PKGBUILD | 8 | ||||
-rw-r--r-- | core/sudo/PKGBUILD | 12 | ||||
-rw-r--r-- | core/udev/PKGBUILD | 6 | ||||
-rw-r--r-- | core/zlib/PKGBUILD | 19 |
13 files changed, 402 insertions, 39 deletions
diff --git a/core/curl/0001-include-headers-for-tcp-keepalives.patch b/core/curl/0001-include-headers-for-tcp-keepalives.patch new file mode 100644 index 000000000..780fb5b82 --- /dev/null +++ b/core/curl/0001-include-headers-for-tcp-keepalives.patch @@ -0,0 +1,31 @@ +From d906981b20d41466d040e6cc2570099c8d665f7f Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Sat, 28 Jan 2012 08:05:02 -0500 +Subject: [PATCH] include headers for tcp-keepalives + +--- + src/tool_cb_skt.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/src/tool_cb_skt.c b/src/tool_cb_skt.c +index 156c110..e74d5e4 100644 +--- a/src/tool_cb_skt.c ++++ b/src/tool_cb_skt.c +@@ -27,6 +27,14 @@ + # include <sys/socket.h> + #endif + ++#ifdef HAVE_NETINET_TCP_H ++# include <netinet/tcp.h> ++#endif ++ ++#ifdef HAVE_NETINET_IN_H ++# include <netinet/in.h> ++#endif ++ + #define ENABLE_CURLX_PRINTF + /* use our own printf() functions */ + #include "curlx.h" +-- +1.7.8.4 + diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index f8653faad..2d51b93c4 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $ +# $Id: PKGBUILD 148373 2012-01-30 19:14:16Z ibiru $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" @@ -15,11 +15,11 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - fix-J-with-O-regression.patch + 0001-include-headers-for-tcp-keepalives.patch curlbuild.h) md5sums=('b93420f80a2baaa61a0f45214eddc2ba' '710242df6bc318d16eea611e7d1b1410' - 'aa4539ec4f4a2dad1663dc22dd3ab0a1' + '84833972c2ff36abb2bfdd4ac065c2e5' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -34,6 +34,8 @@ esac build() { cd "$pkgname-$pkgver" + patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch" + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 390d6d482..604065120 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142199 2011-11-06 05:47:47Z bisson $ +# $Id: PKGBUILD 148436 2012-01-31 20:35:00Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.12.1 -pkgrel=2.1 +pkgver=1.4.12.2 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -24,7 +24,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules) backup=(etc/conf.d/iptables) -sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728' +sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -49,13 +49,19 @@ build() { ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ - --enable-devel --enable-libipq + --enable-devel --enable-libipq \ + --enable-shared --enable-static +# build fails when not enabling static, see if we can remove it on next build make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + + unset CFLAGS + unset LDFLAGS + make DESTDIR="${pkgdir}" install cd "${srcdir}" 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 <dreisner@archlinux.org> +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 <dreisner@archlinux.org> +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 <dreisner@archlinux.org> +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 <dreisner@archlinux.org> +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 956073d40..06275f062 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 <dreisner@archlinux.org> pkgname=kmod pkgver=4 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') 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 792ecf9c2..9e40eed03 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 <pierre@archlinux.de> 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' 'mips64el') @@ -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 b1497971a..2ffa37ed8 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 <giovanni@archlinux.org> # 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' 'mips64el') 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/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index a78fcaeb9..b8b02c7e0 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141376 2011-10-30 06:48:48Z allan $ +# $Id: PKGBUILD 148401 2012-01-31 11:16:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.3p1 +_ver=1.8.3p2 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1.1 +pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64' 'mips64el') url="http://www.sudo.ws/sudo/" @@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('7becc572fa97f94cf721a2ee8299c45b' - 'b0726a25694fb2cdd5e1c146eb024e9c' +md5sums=('6d4282a1530c541f7900fa8dfcf2a882' + '07e3c5c79d78db50674d5ad17963d631' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { @@ -32,6 +32,8 @@ package() { install -dm755 "$pkgdir/var/lib" make DESTDIR="$pkgdir" install + chmod 755 $pkgdir/var/db + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index ea10e0570..efe9f4fa4 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147273 2012-01-25 16:27:42Z tomegun $ +# $Id: PKGBUILD 148430 2012-01-31 19:55:52Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=179 +pkgver=180 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -99,4 +99,4 @@ package_udev-compat() { mknod cpu/microcode c 10 184 } -md5sums=('7d2880f66ea39146aae928f19ff3ca09') +md5sums=('1cf124ab5a124ea35d4748ea414926ec') diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD index e92f893de..f96090f18 100644 --- a/core/zlib/PKGBUILD +++ b/core/zlib/PKGBUILD @@ -1,26 +1,19 @@ -# $Id: PKGBUILD 135916 2011-08-20 07:14:14Z allan $ +# $Id: PKGBUILD 148444 2012-01-31 23:47:55Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zlib -pkgver=1.2.5 -pkgrel=4 +pkgver=1.2.6 +pkgrel=1 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.zlib.net/" depends=('glibc') -options=('!makeflags') -source=("http://zlib.net/zlib-${pkgver}.tar.gz" - 'zlib-1.2.5-lfs-decls.patch') -md5sums=('c735eab2d659a96e5a594c9e8541ad63' - '4cb279ea3beab621f3526bf7b7ab99e5') +source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") +md5sums=('618e944d7c7cd6521551e30b32322f4a') build() { cd ${srcdir}/zlib-$pkgver - # see http://bugs.archlinux.org/task/19280 - patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch - # work around gcc bug; see https://bugs.archlinux.org/task/20647 - export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" ./configure --prefix=/usr make @@ -29,7 +22,7 @@ build() { check() { cd ${srcdir}/zlib-$pkgver - make check + make test } package() { |