summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-01-27 14:27:56 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-01-27 14:27:56 +0100
commit6cc3a23ea1231ea627394677df2bebdc403acb38 (patch)
tree14c20984a10df92c0b5cbb3b4477f0358cf8b01f /core
parent8e40bdbb2496be15fdba2e683af427bc2333be42 (diff)
parent3741146d50cb93e8985f8aac937e36d35ee76446 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/torcs/PKGBUILD community/fceux/PKGBUILD core/gcc/PKGBUILD core/wireless_tools/PKGBUILD extra/gtk-xfce-engine/PKGBUILD extra/gtk2/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-sdl/PKGBUILD testing/kdebase-runtime/PKGBUILD testing/kdelibs/PKGBUILD testing/libarchive/PKGBUILD testing/systemd/PKGBUILD testing/systemd/systemd.install testing/udev/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r--core/curl/PKGBUILD20
-rw-r--r--core/gcc/PKGBUILD24
-rw-r--r--core/libarchive/PKGBUILD26
-rw-r--r--core/libarchive/interpret-non-posix-zips.patch165
-rw-r--r--core/libarchive/test-with-zip-mtime.patch23
-rw-r--r--core/udev/PKGBUILD7
-rw-r--r--core/wireless_tools/PKGBUILD30
7 files changed, 249 insertions, 46 deletions
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index eb142196f..f8653faad 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143109 2011-11-23 02:58:17Z dreisner $
+# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,20 +6,19 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=curl
-pkgver=7.23.1
-pkgrel=2
+pkgver=7.24.0
+pkgrel=1
pkgdesc="An URL retrival utility and library"
arch=('i686' 'x86_64' 'mips64el')
url="http://curl.haxx.se"
license=('MIT')
depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
options=('!libtool')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
fix-J-with-O-regression.patch
curlbuild.h)
-md5sums=('8e23151f569fb54afef093ac0695077d'
- '5d8eb7e2e38be0fb00a043f714f6d49f'
+md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
+ '710242df6bc318d16eea611e7d1b1410'
'aa4539ec4f4a2dad1663dc22dd3ab0a1'
'751bd433ede935c8fae727377625a8ae')
@@ -33,11 +32,7 @@ case $ptrsize in
esac
build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # upstream bugfix
- # http://curl.haxx.se/mail/archive-2011-11/0030.html
- patch -Np1 < "$srcdir/fix-J-with-O-regression.patch"
+ cd "$pkgname-$pkgver"
./configure \
--prefix=/usr \
@@ -52,11 +47,12 @@ build() {
--without-libidn \
--with-random=/dev/urandom \
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 748052b09..32a53b565 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145915 2012-01-04 01:24:59Z allan $
+# $Id: PKGBUILD 147558 2012-01-25 22:42:47Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,8 +10,8 @@ else
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
fi
pkgver=4.6.2
-pkgrel=5
-_snapshot=4.6-20111223
+pkgrel=6
+_snapshot=4.6-20120120
_libstdcppmanver=20111215 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,6 +30,11 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
gcc_pure64.patch
gcc_mips64el_lib.patch
gcc-hash-style-both.patch)
+md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+ '450772ce32daed97d7383199f8797f33'
+ '4030ee1c08dd1e843c0225b772360e76'
+ '67e337993d821d72fccacbed52d48c34'
+ '4df25b623799b148a0703eaeec8fdf3f')
if [ -n "${_snapshot}" ]; then
_basedir="${srcdir}/gcc-${_snapshot}"
@@ -73,11 +78,12 @@ build() {
--enable-shared --enable-threads=posix \
--with-system-zlib --enable-__cxa_atexit \
--disable-libunwind-exceptions --enable-clocale=gnu \
+ --disable-libstdcxx-pch --enable-libstdcxx-time \
--enable-gnu-unique-object --enable-linker-build-id \
--with-ppl --enable-cloog-backend=isl \
--enable-lto --enable-gold --enable-ld=default \
--enable-plugin --with-plugin-ld=ld.gold \
- --disable-multilib --disable-libssp --disable-libstdcxx-pch \
+ --disable-multilib --disable-libssp \
--enable-checking=release
make
}
@@ -158,6 +164,11 @@ package_gcc()
install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
+ # plugin headers are all over the place at the moment...
+ for i in common objc pragma pretty-print; do
+ ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
+ done
+
# POSIX conformance launcher scripts for c89 and c99
cat > $pkgdir/usr/bin/c89 <<"EOF"
#!/bin/sh
@@ -266,8 +277,3 @@ package_gcc-go()
install -Dm644 ${_basedir}/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
}
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
- '450772ce32daed97d7383199f8797f33'
- '4030ee1c08dd1e843c0225b772360e76'
- '67e337993d821d72fccacbed52d48c34'
- '4df25b623799b148a0703eaeec8fdf3f')
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index dfae5e946..a447951a5 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,16 +1,23 @@
-# $Id: PKGBUILD 146703 2012-01-16 19:48:41Z dreisner $
+# $Id: PKGBUILD 147657 2012-01-26 02:44:17Z dreisner $
# Maintainer: Dan McGee <dan@archlinux.org>
+
pkgname=libarchive
pkgver=3.0.3
-pkgrel=2
+pkgrel=3
pkgdesc="library that can create and read several streaming archive formats"
arch=('i686' 'x86_64' 'mips64el')
url="http://libarchive.googlecode.com/"
license=('BSD')
depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz")
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
+ 'interpret-non-posix-zips.patch'
+ 'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+ 'f02b88eb10877c7a7d527ed89c662e44'
+ '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+ '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+ 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
@@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz'
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # http://code.google.com/p/libarchive/issues/detail?id=225
+ patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
+
+ # http://code.google.com/p/libarchive/issues/detail?id=231
+ patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
+
./configure --prefix=/usr --without-xml2
make
}
@@ -25,8 +38,7 @@ build() {
check() {
cd "$srcdir/$pkgname-$pkgver"
- # currently fails on i686 in a minor test involving atime updates (#60)
- make check || :
+ make check
}
package() {
diff --git a/core/libarchive/interpret-non-posix-zips.patch b/core/libarchive/interpret-non-posix-zips.patch
new file mode 100644
index 000000000..63bc439d9
--- /dev/null
+++ b/core/libarchive/interpret-non-posix-zips.patch
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===================================================================
+--- libarchive/archive_read_support_format_zip.c (revision 4189)
++++ libarchive/archive_read_support_format_zip.c (revision 4190)
+@@ -217,14 +217,13 @@
+ }
+
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because it forces the read core to
++ * drop buffered data from the start of file, which will then have to
++ * be re-read again if this bidder loses.
+ *
+- * Consider passing in the winning bid value to subsequent
+- * bidders so that this bidder in particular can avoid
+- * seeking if it knows it's going to lose anyway.
++ * We workaround this a little by passing in the best bid so far so
++ * that later bidders can do nothing if they know they'll never
++ * outbid. But we can certainly do better...
+ */
+ static int
+ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
+@@ -311,19 +310,29 @@
+ external_attributes = archive_le32dec(p + 38);
+ zip_entry->local_header_offset = archive_le32dec(p + 42);
+
++ /* If we can't guess the mode, leave it zero here;
++ when we read the local file header we might get
++ more information. */
++ zip_entry->mode = 0;
+ if (zip_entry->system == 3) {
+ zip_entry->mode = external_attributes >> 16;
+- } else {
+- zip_entry->mode = AE_IFREG | 0777;
+ }
+
+- /* Do we need to parse filename here? */
+- /* Or can we wait until we read the local header? */
++ /* We don't read the filename until we get to the
++ local file header. Reading it here would speed up
++ table-of-contents operations (removing the need to
++ find and read local file header to get the
++ filename) at the cost of requiring a lot of extra
++ space. */
++ /* We don't read the extra block here. We assume it
++ will be duplicated at the local file header. */
+ __archive_read_consume(a,
+ 46 + filename_length + extra_length + comment_length);
+ }
+
+- /* TODO: Sort zip entries. */
++ /* TODO: Sort zip entries by file offset so that we
++ can optimize get_next_header() to use skip instead of
++ seek. */
+
+ return ARCHIVE_OK;
+ }
+@@ -434,6 +443,11 @@
+ return (30);
+ }
+
++ /* TODO: It's worth looking ahead a little bit for a valid
++ * PK signature. In particular, that would make it possible
++ * to read some UUEncoded SFX files or SFX files coming from
++ * a network socket. */
++
+ return (0);
+ }
+
+Index: libarchive/test/test_compat_zip_6.zip.uu
+===================================================================
+--- libarchive/test/test_compat_zip_6.zip.uu (revision 0)
++++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190)
+@@ -0,0 +1,10 @@
++begin 755 test_compat_zip_6.zip
++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@
++M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD
++M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0-
++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$```````
++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+
++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E
++M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B```````
++`
++end
+Index: libarchive/test/test_compat_zip.c
+===================================================================
+--- libarchive/test/test_compat_zip.c (revision 4189)
++++ libarchive/test/test_compat_zip.c (revision 4190)
+@@ -348,6 +348,53 @@
+ free(p);
+ }
+
++/*
++ * Issue 225: Errors extracting MSDOS Zip archives with directories.
++ */
++static void
++compat_zip_6_verify(struct archive *a)
++{
++ struct archive_entry *ae;
++
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
++ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
++ assertEqualInt(1327314468, archive_entry_mtime(ae));
++ assertEqualInt(0, archive_entry_size(ae));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
++ assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
++ assertEqualInt(1327314476, archive_entry_mtime(ae));
++ assertEqualInt(11, archive_entry_size(ae));
++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++}
++
++static void
++test_compat_zip_6(void)
++{
++ const char *refname = "test_compat_zip_6.zip";
++ struct archive *a;
++ void *p;
++ size_t s;
++
++ extract_reference_file(refname);
++ p = slurpfile(&s, refname);
++
++ assert((a = archive_read_new()) != NULL);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
++ compat_zip_6_verify(a);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
++
++ assert((a = archive_read_new()) != NULL);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7));
++ compat_zip_6_verify(a);
++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
++}
++
+ DEFINE_TEST(test_compat_zip)
+ {
+ test_compat_zip_1();
+@@ -355,6 +402,7 @@
+ test_compat_zip_3();
+ test_compat_zip_4();
+ test_compat_zip_5();
++ test_compat_zip_6();
+ }
+
+
+Index: Makefile.am
+===================================================================
+--- Makefile.am (revision 4189)
++++ Makefile.am (revision 4190)
+@@ -462,6 +462,7 @@
+ libarchive/test/test_compat_zip_3.zip.uu \
+ libarchive/test/test_compat_zip_4.zip.uu \
+ libarchive/test/test_compat_zip_5.zip.uu \
++ libarchive/test/test_compat_zip_6.zip.uu \
+ libarchive/test/test_fuzz_1.iso.Z.uu \
+ libarchive/test/test_fuzz.cab.uu \
+ libarchive/test/test_fuzz.lzh.uu \
diff --git a/core/libarchive/test-with-zip-mtime.patch b/core/libarchive/test-with-zip-mtime.patch
new file mode 100644
index 000000000..79e2f3c7e
--- /dev/null
+++ b/core/libarchive/test-with-zip-mtime.patch
@@ -0,0 +1,23 @@
+Index: libarchive/test/test_compat_zip.c
+===================================================================
+--- libarchive/test/test_compat_zip.c (revision 4197)
++++ libarchive/test/test_compat_zip.c (revision 4198)
+@@ -359,12 +359,16 @@
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
+ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
+- assertEqualInt(1327314468, archive_entry_mtime(ae));
++ /* Zip timestamps are local time, so vary by time zone. */
++ /* TODO: A more complex assert would work here; we could
++ verify that it's within +/- 24 hours of a particular value. */
++ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */
+ assertEqualInt(0, archive_entry_size(ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
+ assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
+- assertEqualInt(1327314476, archive_entry_mtime(ae));
++ /* Zip timestamps are local time, so vary by time zone. */
++ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */
+ assertEqualInt(11, archive_entry_size(ae));
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ }
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 5564ec3b9..ea10e0570 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147123 2012-01-22 11:00:58Z tpowa $
+# $Id: PKGBUILD 147273 2012-01-25 16:27:42Z 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=178
+pkgver=179
pkgrel=1
arch=(i686 x86_64 mips64el)
url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
@@ -15,7 +15,6 @@ groups=('base')
options=(!makeflags !libtool)
makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
-md5sums=('173cc6061e3a82dd6e9a1a5cf767a858')
build() {
cd $srcdir/$pkgbase-$pkgver
@@ -100,4 +99,4 @@ package_udev-compat() {
mknod cpu/microcode c 10 184
}
-md5sums=('173cc6061e3a82dd6e9a1a5cf767a858')
+md5sums=('7d2880f66ea39146aae928f19ff3ca09')
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 1b996d604..8019d8ae4 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 142302 2011-11-08 06:06:08Z tomegun $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributer: Jason Chu <jchu@xentac.net>
+# $Id: PKGBUILD 147661 2012-01-26 03:32:18Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Jason Chu <jchu@xentac.net>
pkgname=wireless_tools
pkgver=29
-pkgrel=5.1
-pkgdesc="Wireless Tools"
+pkgrel=6
+pkgdesc='Wireless Tools'
+url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
license=('GPL')
-depends=('glibc')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver}.tar.gz")
-md5sums=('e06c222e186f7cc013fd272d023710cb')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
build() {
- cd ${srcdir}/wireless_tools.${pkgver}
- make
+ cd "${srcdir}/${pkgname}.${pkgver}"
+ make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}"
}
package() {
- cd ${srcdir}/wireless_tools.${pkgver}
- make INSTALL_DIR="${pkgdir}/usr/sbin" \
+ cd "${srcdir}/${pkgname}.${pkgver}"
+ make \
+ INSTALL_DIR="${pkgdir}/usr/sbin" \
INSTALL_LIB="${pkgdir}/usr/lib" \
INSTALL_INC="${pkgdir}/usr/include" \
- INSTALL_MAN="${pkgdir}/usr/share/man" install
+ INSTALL_MAN="${pkgdir}/usr/share/man" \
+ install
}