diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:47:04 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:47:04 -0300 |
| commit | 79f56eaaa1e752a2f67072051b612acf5c648f69 (patch) | |
| tree | a466c8fa3a070419d3a816b79a2d38ec80ad04ce /core | |
| parent | 37ac99de3bc1df2e6c5e0cd8b6af631d589cb4ab (diff) | |
| parent | d739da01541d53414129d3171df221cfe2440fe5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/antiword/PKGBUILD
community/apcupsd/PKGBUILD
community/busybox/PKGBUILD
community/chrpath/PKGBUILD
community/driftnet/PKGBUILD
community/emesene/PKGBUILD
community/fdm/PKGBUILD
community/fftw2/PKGBUILD
community/gsynaptics/PKGBUILD
community/gtk-rezlooks-engine/PKGBUILD
community/httptunnel/PKGBUILD
community/libnfnetlink/PKGBUILD
community/libopenraw/PKGBUILD
community/mashup/PKGBUILD
community/pcb/PKGBUILD
community/portaudio_cpp/PKGBUILD
community/preload/PKGBUILD
community/rlog/PKGBUILD
community/scponly/PKGBUILD
community/splint/PKGBUILD
community/wmname/PKGBUILD
community/xosd/PKGBUILD
community/xxkb/PKGBUILD
community/znc/PKGBUILD
core/glibc/PKGBUILD
core/libtool/PKGBUILD
extra/at/PKGBUILD
extra/autogen/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/cdrdao/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/cmt/PKGBUILD
extra/compface/PKGBUILD
extra/dasher/PKGBUILD
extra/dcfldd/PKGBUILD
extra/dmapi/PKGBUILD
extra/docker/PKGBUILD
extra/dvd+rw-tools/PKGBUILD
extra/dvdrtools/PKGBUILD
extra/fcgi/PKGBUILD
extra/festival/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gecko-sharp-2.0/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gmetadom/PKGBUILD
extra/gnome-speech/PKGBUILD
extra/gnome-vfsmm/PKGBUILD
extra/gnutls/PKGBUILD
extra/graphite/PKGBUILD
extra/i8kutils/PKGBUILD
extra/id3/PKGBUILD
extra/java-access-bridge/PKGBUILD
extra/kdelibs/PKGBUILD
extra/koffice/PKGBUILD
extra/ladspa/PKGBUILD
extra/libcddb/PKGBUILD
extra/libcroco/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libdca/PKGBUILD
extra/libgee/PKGBUILD
extra/libglademm/PKGBUILD
extra/libgnomecanvasmm/PKGBUILD
extra/libsigsegv/PKGBUILD
extra/libstdc++5/PKGBUILD
extra/libwebkit/PKGBUILD
extra/libytnef/PKGBUILD
extra/lua/PKGBUILD
extra/mcpp/PKGBUILD
extra/metalog/PKGBUILD
extra/mp3wrap/PKGBUILD
extra/mt-st/PKGBUILD
extra/naim/PKGBUILD
extra/ocaml/PKGBUILD
extra/oxine/PKGBUILD
extra/php/PKGBUILD
extra/poppler/PKGBUILD
extra/pstoedit/PKGBUILD
extra/qt/PKGBUILD
extra/speex/PKGBUILD
extra/sweep/PKGBUILD
extra/t1lib/PKGBUILD
extra/taglib-extras/PKGBUILD
extra/unixodbc/PKGBUILD
extra/wireshark/PKGBUILD
extra/ypbind-mt/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/empathy/empathy.install
gnome-unstable/eog/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gdm/fix_external_program_directories.patch
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gnome-utils/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/mash/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/mx/PKGBUILD
gnome-unstable/pulseaudio/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/pygobject2/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/totem/PKGBUILD
gnome-unstable/upower/PKGBUILD
gnome-unstable/vala/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-gtk/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nspr/PKGBUILD
multilib/lib32-nss/PKGBUILD
multilib/lib32-nss/add_spi+cacert_ca_certs.patch
multilib/lib32-openssl/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/wine/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'core')
27 files changed, 677 insertions, 84 deletions
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 614a30346..6d605164a 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $ +# $Id: PKGBUILD 137787 2011-09-11 01:35:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.12 -pkgrel=3 +pkgver=8.13 +pkgrel=2 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz coreutils-uname.patch coreutils-pam.patch su.pam) -md5sums=('0f7d43c2d2e24314b43a6c6267e25b90' +md5sums=('8e1675c6c336ff55557c698706a63d6c' 'c4fcca138b6abf6d443d48a6f0cd8833' 'aad79a2aa6d566c375d7bdd1b0767278' 'fa85e5cce5d723275b14365ba71a8aad') @@ -34,7 +34,7 @@ build() { patch -Np1 -i ${srcdir}/coreutils-uname.patch autoreconf -v - ./configure --prefix=/usr \ + ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ --enable-install-program=su \ --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD new file mode 100644 index 000000000..72cb1194c --- /dev/null +++ b/core/curl/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 138015 2011-09-14 11:16:01Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.22.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('e8c36126d21c893f085aca233906b5cc' + '1b061c348b63ea3e90c3f2c3af6a08d6' + '751bd433ede935c8fae727377625a8ae') + + +case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unsupported architecture: %s" "$CARCH" + exit 1 + ;; +esac + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --with-random=/dev/urandom \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --enable-ipv6 \ + --disable-ldaps \ + --disable-ldap \ + --enable-manual \ + --enable-versioned-symbols \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --without-libidn \ + --enable-threaded-resolver + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/core/curl/curlbuild.h b/core/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/core/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index a982f8124..1cacf025b 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $ +# $Id: PKGBUILD 138220 2011-09-19 05:03:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.08 +pkgver=5.09 pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6a2a263c20278f01fe3bb0f720b27d4e') +md5sums=('6fd7cd6c4281e68fe9ec6644ce0fac6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 98392aef7..f89aa03cc 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135924 2011-08-20 07:14:27Z allan $ +# $Id: PKGBUILD 137789 2011-09-11 01:47:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,10 +6,10 @@ pkgname=glibc pkgver=2.14 -pkgrel=5 +pkgrel=6 pkgver=2.13 #holdver pkgrel=5.1 #holdver -_glibcdate=20110617 +_glibcdate=20110908 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -17,7 +17,8 @@ license=('GPL' 'LGPL') groups=('base') depends=('linux-api-headers>=3.0' 'tzdata') makedepends=('gcc>=4.6') -backup=(etc/locale.gen +backup=(etc/gai.conf + etc/locale.gen etc/nscd.conf) options=('!strip') install=glibc.install @@ -28,23 +29,24 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch + glibc-2.13-dlclose-search-reset.patch glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch + glibc-2.14-avoid-assertion-on-empty-dns-answer.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch nscd locale.gen.txt locale-gen) -md5sums=('e441d745609d93c907b72548ba646dad' +md5sums=('069069eb9100cc7affd7ad884cb3c3e9' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' + '22d09c58718fb3d1d31c3a6c14ca6886' 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' + '13728807283f111e5d9d38cf38e0a461' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' 'b587ee3a70c9b3713099295609afde49' @@ -84,15 +86,17 @@ build() { # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=593675 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) diff --git a/core/glibc/glibc-2.13-dlclose-search-reset.patch b/core/glibc/glibc-2.13-dlclose-search-reset.patch new file mode 100644 index 000000000..3ad8b418a --- /dev/null +++ b/core/glibc/glibc-2.13-dlclose-search-reset.patch @@ -0,0 +1,196 @@ +From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Wed, 26 May 2010 18:28:59 +0200 +Subject: [PATCH] Fix scope handling during dl_close + +--- + ChangeLog | 12 ++++++++++++ + elf/Makefile | 10 +++++++++- + elf/dl-close.c | 7 +++++++ + elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ + elf/unload8mod1.c | 7 +++++++ + elf/unload8mod1x.c | 1 + + elf/unload8mod2.c | 7 +++++++ + elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ + 8 files changed, 103 insertions(+), 1 deletions(-) + create mode 100644 elf/unload8.c + create mode 100644 elf/unload8mod1.c + create mode 100644 elf/unload8mod1x.c + create mode 100644 elf/unload8mod2.c + create mode 100644 elf/unload8mod3.c + +diff --git a/elf/Makefile b/elf/Makefile +index 59e835f..65b6deb 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -89,6 +89,7 @@ distribute := rtld-Rules \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + unload6mod1.c unload6mod2.c unload6mod3.c \ + unload7mod1.c unload7mod2.c \ ++ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ + tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ + tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ + tst-auditmod4a.c tst-auditmod4b.c \ +@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-dlmodcount tst-dlopenrpath tst-deep1 \ + tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ +- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ ++ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 +@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + unload6mod1 unload6mod2 unload6mod3 \ + unload7mod1 unload7mod2 \ ++ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ + order2mod1 order2mod2 order2mod3 order2mod4 \ + tst-unique1mod1 tst-unique1mod2 \ + tst-unique2mod1 tst-unique2mod2 +@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) + $(objpfx)unload6mod3.so: $(libdl) + $(objpfx)unload7mod1.so: $(libdl) + $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so ++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so ++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so ++$(objpfx)unload8mod3.so: $(libdl) + $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so + $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so + $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so +@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) + $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so + unload7-ENV = MALLOC_PERTURB_=85 + ++$(objpfx)unload8: $(libdl) ++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so ++ + ifdef libdl + $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 700e765..f47d5f8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) + + imap->l_scope_max = new_size; + } ++ else if (new_list != NULL) ++ { ++ /* We didn't change the scope array, so reset the search ++ list. */ ++ imap->l_searchlist.r_list = NULL; ++ imap->l_searchlist.r_nlist = 0; ++ } + + /* The loader is gone, so mark the object as not having one. + Note: l_idx != IDX_STILL_USED -> object will be removed. */ +diff --git a/elf/unload8.c b/elf/unload8.c +new file mode 100644 +index 0000000..f984a38 +--- /dev/null ++++ b/elf/unload8.c +@@ -0,0 +1,33 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++ ++int ++main (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod1.so failed"); ++ return 1; ++ } ++ ++ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); ++ if (h2 == NULL) ++ { ++ puts ("dlopen unload8mod1x.so failed"); ++ return 1; ++ } ++ dlclose (h2); ++ ++ int (*mod1) (void) = dlsym (h, "mod1"); ++ if (mod1 == NULL) ++ { ++ puts ("dlsym failed"); ++ return 1; ++ } ++ ++ mod1 (); ++ dlclose (h); ++ ++ return 0; ++} +diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c +new file mode 100644 +index 0000000..fe7e81c +--- /dev/null ++++ b/elf/unload8mod1.c +@@ -0,0 +1,7 @@ ++extern void mod2 (void); ++ ++void ++mod1 (void) ++{ ++ mod2 (); ++} +diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c +new file mode 100644 +index 0000000..835b634 +--- /dev/null ++++ b/elf/unload8mod1x.c +@@ -0,0 +1 @@ ++int mod1x; +diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c +new file mode 100644 +index 0000000..2fd8b67 +--- /dev/null ++++ b/elf/unload8mod2.c +@@ -0,0 +1,7 @@ ++extern void mod3 (void); ++ ++void ++mod2 (void) ++{ ++ mod3 (); ++} +diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c +new file mode 100644 +index 0000000..d49e22b +--- /dev/null ++++ b/elf/unload8mod3.c +@@ -0,0 +1,27 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++void ++mod3_fini2 (void) ++{ ++} ++ ++void ++mod3_fini (void) ++{ ++ mod3_fini2 (); ++} ++ ++void ++mod3 (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod2.so failed"); ++ exit (1); ++ } ++ ++ atexit (mod3_fini); ++} +-- +1.7.3.4 + diff --git a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch new file mode 100644 index 000000000..ef91116e5 --- /dev/null +++ b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch @@ -0,0 +1,26 @@ +From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 1 Sep 2011 10:46:14 +0200 +Subject: [PATCH] Avoid assertion failure when first DNS answer was empty + +--- + ChangeLog | 4 ++++ + resolv/res_query.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 2f7cfaa..2ded9fb 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +-- +1.7.3.4 + diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index 87c152292..94b597eda 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100035 2010-11-20 01:15:49Z stephane $ +# $Id: PKGBUILD 137785 2011-09-11 01:35:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip pkgver=1.4 -pkgrel=2 +pkgrel=3 pkgdesc="GNU compression utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gzip/" @@ -27,6 +27,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,5 +40,4 @@ package() { install -dm755 ${pkgdir}/bin mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ cd $pkgdir/bin - ln -sf ${pkgname} compress } diff --git a/core/gzip/gzip.install b/core/gzip/gzip.install index 636f91011..24c8b8fb9 100644 --- a/core/gzip/gzip.install +++ b/core/gzip/gzip.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gzip.info) post_install() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index de5f4cbe3..d1243e382 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133073 2011-07-27 15:33:16Z dan $ +# $Id: PKGBUILD 137571 2011-09-09 20:06:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.12 -pkgrel=2 +pkgver=1.4.12.1 +pkgrel=1 pkgdesc="A 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}.tar empty-raw.rules empty-security.rules) backup=(etc/conf.d/iptables) -sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3' +sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -35,7 +35,6 @@ sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') - build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,6 +42,9 @@ build() { sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in + # FS#25358: libxt_statistic.so undefined symbol: lround + export LDFLAGS="-lm" + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index dd181956c..29edac2e7 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 77938 2010-04-19 05:37:53Z allan $ +# $Id: PKGBUILD 137795 2011-09-11 08:35:21Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libnl pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Library for applications dealing with netlink sockets" arch=('i686' 'x86_64' 'mips64el') url="http://www.infradead.org/~tgr/libnl/" license=('GPL') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/libnl/${pkgname}-${pkgver}.tar.gz - fix-compilation.patch) +source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz" + 'fix-compilation.patch') md5sums=('ae970ccd9144e132b68664f98e7ceeb1' 'e1f5e82c8aa1b3ad025c7b588178de1e') build() { cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 + patch -Np1 -i ${srcdir}/fix-compilation.patch + ./configure --prefix=/usr + make } package() { cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD new file mode 100644 index 000000000..3fcc6eccd --- /dev/null +++ b/core/libssh2/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 138017 2011-09-14 11:16:24Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.3.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') +options=('!libtool') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('6425331899ccf1015f1ed79448cb4709' + '6ddcc9f2b37941f8291d7494ee8f89b7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 079de12ca..f0ff53324 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,36 +1,49 @@ -# $Id: PKGBUILD 129474 2011-06-28 04:34:20Z allan $ +# $Id: PKGBUILD 137791 2011-09-11 02:39:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # NOTE: requires rebuilt with each new gcc version -pkgname=libtool +pkgname=('libtool' 'libltdl') pkgver=2.4 -pkgrel=4 +pkgrel=5 pkgrel=3 # holdver pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') -depends=('sh' 'tar' 'gcc=4.6.1') -groups=('base-devel') options=('!libtool') -install=libtool.install source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) md5sums=('4e6144439d95d7332dc50ace6dd24c55') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} make check } -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install +package_libtool() { + depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1') + groups=('base-devel') + install=libtool.install + + cd ${srcdir}/${pkgbase}-${pkgver} + + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -rf ${pkgdir}/usr/share/libtool/libltdl/ +} + +package_libltdl() { + pkgdesc="A system independent dlopen wrapper for GNU libtool" + + cd ${srcdir}/${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ + install-ltdlincludeHEADERS install-data-local + rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} } diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 3da9085d7..4106f80fa 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129849 2011-06-29 04:28:30Z allan $ +# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=3 +pkgrel=4 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/make" @@ -15,11 +15,13 @@ install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 bug30612.patch bug30723.patch - make-3.82-sort-blank.patch) + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' 'c8f496b22191f9fb9420ab14c1a19a47' '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4') + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') build() { @@ -34,6 +36,10 @@ build() { # https://bugs.archlinux.org/task/22733 (fix from Fedora) patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + ./configure --prefix=/usr make } diff --git a/core/make/make-3.82-makeflags.patch b/core/make/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/core/make/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 6bd73e08b..d793695f0 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134363 2011-08-03 06:56:40Z tpowa $ +# $Id: PKGBUILD 138138 2011-09-17 10:36:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -17,6 +17,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook + mdadm_udev_install disable-werror.patch linux-3.0.patch) install=mdadm.install @@ -24,8 +25,9 @@ replaces=('raidtools') md5sums=('12ee2fbf3beddb60601fb7a4c4905651' '6df172c8f77b280018cf87eb3d313f29' '00cbed931db4f15b6ce49e3e7d433966' - '4bb000166fb13e82ceaa2422fdfaac7e' - '36f7cc564ed3267888d90208e0eb7adc' + '9b01e96b6c3c218fb61628c9281fe688' + 'c8c0713f5c7da51822ee6f3911473a1c' + 'cd258e1bf430c02a25f40b4329df9f57' '4ad87b74a4bc9a34621280abe0e0c3e4' 'c499b3edbf2c400c8a1984e18c7ce7fa') @@ -33,16 +35,21 @@ build() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch patch -Np1 -i ../linux-3.0.patch - make CXiFLAGS="$CFLAGS" + make CXFLAGS="$CFLAGS" + # build static mdassemble for Arch's initramfs + make MDASSEMBLE_AUTO=1 mdassemble + } package() { cd $srcdir/$pkgname-$pkgver make INSTALL=/bin/install DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/sbin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm + install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev # symlink for backward compatibility ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid } diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 1d217a5a8..7b2dc1ad1 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -39,4 +39,6 @@ run_hook () esac done fi + # assemble everything + [ -e $mdconfig ] && /sbin/mdassemble } diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index f351cb292..b53258676 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -11,8 +11,7 @@ build() echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdadm" - add_file "/lib/udev/rules.d/64-md-raid.rules" + add_binary "/sbin/mdassemble" } help () diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install new file mode 100644 index 000000000..9fc161624 --- /dev/null +++ b/core/mdadm/mdadm_udev_install @@ -0,0 +1,23 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdadm" + add_file "/lib/udev/rules.d/64-md-raid.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads raid arrays with udev. +HELPEOF +} diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD index 7ab7e68fa..69b494888 100644 --- a/core/mkinitcpio-nfs-utils/PKGBUILD +++ b/core/mkinitcpio-nfs-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68748 2010-02-14 10:45:02Z thomas $ +# $Id: PKGBUILD 138224 2011-09-19 12:04:53Z pierre $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-nfs-utils pkgver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/" @@ -14,7 +14,7 @@ sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 + make } package() { diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index 037967a9b..caf26a1c5 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92996 2010-10-02 19:26:38Z eric $ +# $Id: PKGBUILD 137779 2011-09-10 22:03:10Z tomegun $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=2 +pkgrel=3 pkgdesc="Linux System V Init" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" @@ -24,4 +24,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}dsf" make ROOT="${pkgdir}" install + + # mountpoint is now provided by util-linux instead + cd "${pkgdir}" + rm bin/mountpoint + rm usr/share/man/man1/mountpoint.1 } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 6bb6c2676..6265ddb53 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,42 +1,56 @@ -# $Id: PKGBUILD 135595 2011-08-16 14:10:53Z tomegun $ +# $Id: PKGBUILD 137777 2011-09-10 22:03:07Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.19.1 -pkgrel=3 +pkgver=2.20 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') groups=('base') -depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') +depends=('filesystem') replaces=('linux32' 'util-linux-ng') conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2 - mount-segfault-2.19.1.patch - two-component-linux.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2 + agetty-typo.patch + write-freopen.patch + dmesg-non-printk.patch + dmesg-space.patch) optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # add support for linux 3.0, which is needed mkswap - patch -Np1 -i ../two-component-linux.patch - # fix https://bugs.archlinux.org/task/24261 - patch -Np1 -i ../mount-segfault-2.19.1.patch + + # patches from master + for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do + patch -Np1 -i "${srcdir}/${patch}" + done + # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c - ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx + sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h + + ./configure --enable-arch\ + --enable-write\ + --enable-raw\ + --disable-wall\ + --enable-partx + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + install -dm755 "${pkgdir}/var/lib/hwclock" + make DESTDIR="${pkgdir}" install } -md5sums=('3eab06f05163dfa65479c44e5231932c' - '3247b52f0e4b8044f23f2f7218e2fdea' - '6eb23edb484adf7192e107d1c6d94bd3') +md5sums=('4dcacdbdafa116635e52b977d9d0e879' + '13838c6dd8df686e0f01ad0f236d2690' + '465817ff8f7c08411c8011ee91b50318' + 'f3ca75a1a22a2a739c5c22d92dc07ab0' + 'd9768f0b42d36d72c02ac7797b922ba1') diff --git a/core/util-linux/agetty-typo.patch b/core/util-linux/agetty-typo.patch new file mode 100644 index 000000000..a333d6280 --- /dev/null +++ b/core/util-linux/agetty-typo.patch @@ -0,0 +1,27 @@ +From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 7 Sep 2011 07:37:03 +0200 +Subject: [PATCH] agetty: double equals sign typo in opentty() + +Reported-by: Francesco Cosoleto <cosoleto@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/agetty.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 733be38..35bb389 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op) + * In case of a virtual console the ioctl TIOCMGET fails and + * the error number will be set to EINVAL. + */ +- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) { ++ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { + op->flags |= F_VCONSOLE; + if (!op->term) + op->term = DEFAULT_VCTERM; +-- +1.7.6.1 + diff --git a/core/util-linux/dmesg-non-printk.patch b/core/util-linux/dmesg-non-printk.patch new file mode 100644 index 000000000..ea2354420 --- /dev/null +++ b/core/util-linux/dmesg-non-printk.patch @@ -0,0 +1,69 @@ +From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 31 Aug 2011 12:28:39 +0200 +Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels + + * dmesg(1) incorrectly assumes that lines like "<6>\n" + are broken. + + * it's more robust to assume the end of the record is "\n<" + + * print \n for empty lines + +Reported-by: "Gabor Z. Papp" <gzp@papp.hu> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 6090f4e..8e7bb4b 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + + if (!begin) + begin = p; +- if (*p == '\n') +- end = p; + if (i + 1 == rec->next_size) { + end = p + 1; + i++; +- } ++ } else if (*p == '\n' && *(p + 1) == '<') ++ end = p; ++ + if (begin && !*begin) + begin = NULL; /* zero(s) at the end of the buffer? */ + if (!begin || !end) +@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + } + } + +- if (end <= begin) +- return -1; /* error */ +- + if (*begin == '[' && (*(begin + 1) == ' ' || + isdigit(*(begin + 1)))) { + if (ctl->delta || ctl->ctime) { +@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, + } + + while (get_next_record(ctl, &rec) == 0) { +- if (!rec.mesg_size) +- continue; + + if (!accept_record(ctl, &rec)) + continue; + ++ if (!rec.mesg_size) { ++ putchar('\n'); ++ continue; ++ } ++ + if (ctl->decode && rec.level >= 0 && rec.facility >= 0) + printf("%-6s:%-6s: ", facility_names[rec.facility].name, + level_names[rec.level].name); +-- +1.7.6.1 + diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch new file mode 100644 index 000000000..2038888cc --- /dev/null +++ b/core/util-linux/dmesg-space.patch @@ -0,0 +1,31 @@ +From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 2 Sep 2011 14:42:04 +0200 +Subject: [PATCH] dmesg: remove extra space only after time stamp + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 8e7bb4b..b3713a0 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + break; + } + } ++ if (begin < end && *begin == ' ') ++ begin++; + } + +- if (begin < end && *begin == ' ') +- begin++; +- + rec->mesg = begin; + rec->mesg_size = end - begin; + +-- +1.7.6.1 + diff --git a/core/util-linux/write-freopen.patch b/core/util-linux/write-freopen.patch new file mode 100644 index 000000000..a2014a107 --- /dev/null +++ b/core/util-linux/write-freopen.patch @@ -0,0 +1,27 @@ +From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 6 Sep 2011 03:18:46 +0200 +Subject: [PATCH] write: fix path for freopen() + +Reported-by: xinglp <xinglp@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/write.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/write.c b/term-utils/write.c +index a825f62..a70eb7b 100644 +--- a/term-utils/write.c ++++ b/term-utils/write.c +@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) + + if (strlen(tty) + 6 > sizeof(path)) + errx(EXIT_FAILURE, _("tty path %s too long"), tty); +- printf(path, "/dev/%s", tty); ++ snprintf(path, sizeof(path), "/dev/%s", tty); + if ((freopen(path, "w", stdout)) == NULL) + err(EXIT_FAILURE, "%s", path); + +-- +1.7.6.1 + diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD index 3b91a1234..168ab9bda 100644 --- a/core/wget/PKGBUILD +++ b/core/wget/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136829 2011-09-01 21:49:29Z allan $ +# $Id: PKGBUILD 138218 2011-09-19 05:03:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wget -pkgver=1.13.3 +pkgver=1.13.4 pkgrel=1 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('540cbd50909885fe11bd7bc4f75268d1') +md5sums=('7f518b3a71e9efd330e9a0c3714f8463') build() { cd "${srcdir}/${pkgname}-${pkgver}" |