[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 03:02:42 Author: andrea Revision: 109316 fix symlink (FS#22811) Modified: kdebase-workspace/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-02-07 23:03:51 UTC (rev 109315) +++ PKGBUILD2011-02-08 08:02:42 UTC (rev 109316) @@ -75,7 +75,7 @@ install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver install -d -m755 ${pkgdir}/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/ install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
[arch-commits] Commit in mysql/trunk (4 files)
Date: Tuesday, February 8, 2011 @ 03:12:46 Author: andrea Revision: 109317 upgpkg: mysql 5.5.9-1 upstream release Modified: mysql/trunk/PKGBUILD Deleted: mysql/trunk/fix-embedded-crash.patch mysql/trunk/fix-mysql-home.patch mysql/trunk/fix-set-default-charset.patch ---+ PKGBUILD | 24 +++-- fix-embedded-crash.patch | 19 - fix-mysql-home.patch | 16 --- fix-set-default-charset.patch | 55 4 files changed, 5 insertions(+), 109 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 08:02:42 UTC (rev 109316) +++ PKGBUILD2011-02-08 08:12:46 UTC (rev 109317) @@ -5,8 +5,8 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.8 -pkgrel=9 +pkgver=5.5.9 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url=http://www.mysql.com/; @@ -14,23 +14,12 @@ options=('!libtool') source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz; 'mysqld' -'my.cnf' -'fix-set-default-charset.patch' -'fix-mysql-home.patch' -'fix-embedded-crash.patch') -md5sums=('42e866302b61f5e213afd33e04677017' +'my.cnf') +md5sums=('701c0c44b7f1c2300adc0dc45729f903' '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6' - '6f72b482580d020933ea9a7a4f638051' - '56fe8b724ca7ae73b9f96cdf4cca1220' - 'b2b7ed0289a6d8cce17a68512c0286cc') + '1c949c0dbea5206af0db14942d9927b6') build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/fix-set-default-charset.patch - patch -Np1 -i ${srcdir}/fix-mysql-home.patch - patch -Np1 -i ${srcdir}/fix-embedded-crash.patch - cd ${srcdir} mkdir build cd build @@ -88,9 +77,6 @@ for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 ${pkgdir}/usr/share/man/man1/$man.1 done - - #fix permissions - chmod 644 ${pkgdir}/usr/lib/libmysqlclient_r.a } package_mysql-clients(){ Deleted: fix-embedded-crash.patch === --- fix-embedded-crash.patch2011-02-08 08:02:42 UTC (rev 109316) +++ fix-embedded-crash.patch2011-02-08 08:12:46 UTC (rev 109317) @@ -1,19 +0,0 @@ -Fix crash in embedded mysql library when mysql_library_init() is invoked -with argc = 0, as is supposed to be a supported thing to do. -Patch from upstream bug #57931. - - -diff -Naur mysql-5.5.8.orig/libmysqld/lib_sql.cc mysql-5.5.8/libmysqld/lib_sql.cc mysql-5.5.8.orig/libmysqld/lib_sql.cc 2010-12-03 12:58:26.0 -0500 -+++ mysql-5.5.8/libmysqld/lib_sql.cc 2011-01-12 23:10:55.837471629 -0500 -@@ -510,8 +510,8 @@ - return 1; - defaults_argc= *argcp; - defaults_argv= *argvp; -- remaining_argc= argc; -- remaining_argv= argv; -+ remaining_argc= *argcp; -+ remaining_argv= *argvp; - - /* Must be initialized early for comparison of options name */ - system_charset_info= my_charset_utf8_general_ci; Deleted: fix-mysql-home.patch === --- fix-mysql-home.patch2011-02-08 08:02:42 UTC (rev 109316) +++ fix-mysql-home.patch2011-02-08 08:12:46 UTC (rev 109317) @@ -1,16 +0,0 @@ -mysql 5.5's new cmake-based build scripts forgot about defining -DEFAULT_HOME_ENV. Upstream at http://bugs.mysql.com/bug.php?id=59280 - - -diff -Naur mysql-5.5.8.orig/mysys/CMakeLists.txt mysql-5.5.8/mysys/CMakeLists.txt mysql-5.5.8.orig/mysys/CMakeLists.txt 2010-12-03 12:58:26.0 -0500 -+++ mysql-5.5.8/mysys/CMakeLists.txt 2011-01-13 11:58:42.583471734 -0500 -@@ -69,6 +69,8 @@ - SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_port.c) - ENDIF() - -+ADD_DEFINITIONS( -DDEFAULT_HOME_ENV=MYSQL_HOME) -+ - ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) - TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT}) Deleted: fix-set-default-charset.patch === --- fix-set-default-charset.patch 2011-02-08 08:02:42 UTC (rev 109316) +++ fix-set-default-charset.patch 2011-02-08 08:12:46 UTC (rev 109317) @@ -1,55 +0,0 @@ a/cmake/character_sets.cmake 2010-02-25 08:15:46 + -+++ b/cmake/character_sets.cmake 2010-12-22 09:23:08 + -@@ -1,4 +1,4 @@ --# Copyright (C) 2009 Sun Microsystems, Inc -+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -13,17 +13,19 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -
[arch-commits] Commit in mysql/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 03:13:12 Author: andrea Revision: 109318 archrelease: remove extra-i686 Deleted: mysql/repos/extra-i686/
[arch-commits] Commit in mysql/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 03:13:33 Author: andrea Revision: 109319 archrelease: copy trunk to extra-i686 Added: mysql/repos/extra-i686/
[arch-commits] Commit in mysql/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 03:13:56 Author: andrea Revision: 109320 archrelease: remove extra-x86_64 Deleted: mysql/repos/extra-x86_64/
[arch-commits] Commit in mysql/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 03:14:16 Author: andrea Revision: 109321 archrelease: copy trunk to extra-x86_64 Added: mysql/repos/extra-x86_64/
[arch-commits] Commit in nfs-utils/trunk (PKGBUILD nfs-common)
Date: Tuesday, February 8, 2011 @ 03:33:56 Author: ibiru Revision: 109322 upgpkg: nfs-utils 1.2.2-6 fix syntax error introduced when fixing FS#22358 Modified: nfs-utils/trunk/PKGBUILD nfs-utils/trunk/nfs-common + PKGBUILD |4 ++-- nfs-common |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 08:14:16 UTC (rev 109321) +++ PKGBUILD2011-02-08 08:33:56 UTC (rev 109322) @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.2 -pkgrel=5 +pkgrel=6 pkgdesc=Support programs for Network File Systems arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -30,7 +30,7 @@ nfs-utils-1.1.4-no-exec.patch) install=nfs-utils.install md5sums=('dad92f64db3266c7757f71bb53ee8f35' - '96f923bc1727b4207a227ab74db1e4f8' + 'fc508e10cdf5e8ddd80373b1b2bc99a1' 'f73f197a16b02c3e248488ec35c4cf43' '5ae080f6117cef3140f02bc162bdc755' 'b9b334414baec31b97f0431d9ecdcfb9' Modified: nfs-common === --- nfs-common 2011-02-08 08:14:16 UTC (rev 109321) +++ nfs-common 2011-02-08 08:33:56 UTC (rev 109322) @@ -161,7 +161,7 @@ if [ $rc -gt 0 ]; then stat_fail exit $rc - elif + else stat_done fi
[arch-commits] Commit in nfs-utils/repos (testing-i686)
Date: Tuesday, February 8, 2011 @ 03:34:03 Author: ibiru Revision: 109323 archrelease: remove testing-i686 Deleted: nfs-utils/repos/testing-i686/
[arch-commits] Commit in nfs-utils/repos (testing-i686)
Date: Tuesday, February 8, 2011 @ 03:34:17 Author: ibiru Revision: 109324 archrelease: copy trunk to testing-i686 Added: nfs-utils/repos/testing-i686/
[arch-commits] Commit in nfs-utils/repos (testing-x86_64)
Date: Tuesday, February 8, 2011 @ 03:34:22 Author: ibiru Revision: 109325 archrelease: remove testing-x86_64 Deleted: nfs-utils/repos/testing-x86_64/
[arch-commits] Commit in nfs-utils/repos (testing-x86_64)
Date: Tuesday, February 8, 2011 @ 03:34:35 Author: ibiru Revision: 109326 archrelease: copy trunk to testing-x86_64 Added: nfs-utils/repos/testing-x86_64/
[arch-commits] Commit in libofx/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 04:52:28 Author: eric Revision: 109327 upgpkg: libofx 0.9.1-1 Upstream update, Moved docs in splitted package Modified: libofx/trunk/PKGBUILD --+ PKGBUILD | 41 +++-- 1 file changed, 27 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 08:34:35 UTC (rev 109326) +++ PKGBUILD2011-02-08 09:52:28 UTC (rev 109327) @@ -1,27 +1,40 @@ # $Id: PKGBUILD,v 1.9 2009/02/06 16:41:19 abhidg Exp $ # Maintainer: Aaron Griffin aa...@archlinux.org -# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org -# Contributor: Eric Belanger belan...@astro.umontreal.ca -# Contributor: Todd Maynard a...@toddmaynard.com -pkgname=libofx -pkgver=0.9.0 -pkgrel=2 +pkgbase=libofx +pkgname=('libofx' 'libofx-doc') +pkgver=0.9.1 +pkgrel=1 pkgdesc=API for the OFX banking standard arch=('i686' 'x86_64') url=http://libofx.sourceforge.net; -license=(GPL) +license=('GPL') +depends=('opensp' 'curl' 'gcc-libs') options=('!libtool') -depends=('opensp=1.5.2' 'curl' 'gcc-libs') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \ fix_cpp_includes.patch) -md5sums=('6e2172f0117f90805590bf755190b79e' - '17b65fe122dbb2df222aeee698bdf049') +md5sums=('e634f47ca12e82d860912d48c93b8e50' '17b65fe122dbb2df222aeee698bdf049') +sha1sums=('a12110ddcbff596e26496865570fb4dcb75c08d0' 'adbab270bbd2ea938a5392217c87a268a43b4991') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/fix_cpp_includes.patch || return 1 + cd $srcdir/$pkgname-$pkgver + patch -p1 -i $srcdir/fix_cpp_includes.patch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install + make } + +package_libofx() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + rm -r $pkgdir/usr/share/doc +} + +package_libofx-doc() { + pkgdesc=Documention of the OFX banking standard API + depends=() + + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install-docDATA + cd doc + make DESTDIR=$pkgdir install +}
[arch-commits] Commit in libofx/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 04:52:39 Author: eric Revision: 109328 archrelease: remove extra-i686 Deleted: libofx/repos/extra-i686/
[arch-commits] Commit in libofx/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 04:52:47 Author: eric Revision: 109329 archrelease: copy trunk to extra-i686 Added: libofx/repos/extra-i686/
[arch-commits] Commit in libofx/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 04:52:57 Author: eric Revision: 109330 archrelease: remove extra-x86_64 Deleted: libofx/repos/extra-x86_64/
[arch-commits] Commit in libofx/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 04:53:05 Author: eric Revision: 109331 archrelease: copy trunk to extra-x86_64 Added: libofx/repos/extra-x86_64/
[arch-commits] Commit in libofx/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 04:57:29 Author: eric Revision: 109332 Added !docs option Modified: libofx/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 09:53:05 UTC (rev 109331) +++ PKGBUILD2011-02-08 09:57:29 UTC (rev 109332) @@ -10,7 +10,6 @@ url=http://libofx.sourceforge.net; license=('GPL') depends=('opensp' 'curl' 'gcc-libs') -options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \ fix_cpp_includes.patch) md5sums=('e634f47ca12e82d860912d48c93b8e50' '17b65fe122dbb2df222aeee698bdf049') @@ -24,9 +23,10 @@ } package_libofx() { + options=('!libtool' '!docs') + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - rm -r $pkgdir/usr/share/doc } package_libofx-doc() {
[arch-commits] Commit in enlightenment/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 05:55:23 Author: eric Revision: 109333 Fixed location of sessions .desktop file Modified: enlightenment/trunk/PKGBUILD --+ PKGBUILD |1 - 1 file changed, 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 09:57:29 UTC (rev 109332) +++ PKGBUILD2011-02-08 10:55:23 UTC (rev 109333) @@ -20,7 +20,6 @@ build() { cd ${srcdir}/e16-${pkgver} - sed -i 's|xsessiondir = $(datadir)/xsessions|xsessiondir = /etc/X11/sessions|' misc/Makefile.in ./configure --prefix=/usr --sysconfdir=/etc --enable-sound --enable-mans make
[arch-commits] Commit in fluxbox/trunk (ChangeLog PKGBUILD)
Date: Tuesday, February 8, 2011 @ 06:01:25 Author: eric Revision: 109334 Fixed location of sessions .desktop file, Removed ChangeLog, Change bash depends to sh Modified: fluxbox/trunk/PKGBUILD Deleted: fluxbox/trunk/ChangeLog ---+ ChangeLog | 10 -- PKGBUILD | 23 +-- 2 files changed, 13 insertions(+), 20 deletions(-) Deleted: ChangeLog === --- ChangeLog 2011-02-08 10:55:23 UTC (rev 109333) +++ ChangeLog 2011-02-08 11:01:25 UTC (rev 109334) @@ -1,10 +0,0 @@ -2008-09-19 Eric Belanger e...@archlinux.org - - * fluxbox 1.1.1-1 - * Upstream update - -2008-09-05 Eric Belanger e...@archlinux.org - - * fluxbox 1.1.0.1-1 - * Upstream update -* Added ChangeLog Modified: PKGBUILD === --- PKGBUILD2011-02-08 10:55:23 UTC (rev 109333) +++ PKGBUILD2011-02-08 11:01:25 UTC (rev 109334) @@ -1,6 +1,5 @@ # $Id$ # Maintainer: Eric Belanger e...@archlinux.org -# Contributor: John Proctor jproc...@prium.net pkgname=fluxbox pkgver=1.1.1 @@ -9,8 +8,8 @@ arch=('i686' 'x86_64') url=http://www.fluxbox.org; license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'bash' 'imlib2') -makedepends=('pkgconfig') +depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2') +makedepends=('pkg-config') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ fluxbox.desktop) @@ -18,15 +17,19 @@ sha1sums=('6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-kde --enable-gnome \ --enable-xft --enable-xinerama \ ---enable-imlib2 --enable-nls || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 +--enable-imlib2 --enable-nls + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-( - sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide: True|' ${pkgdir}/usr/share/fluxbox/init || return 1 - install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1 - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1 + sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide: True|' ${pkgdir}/usr/share/fluxbox/init + install -D -m644 ../fluxbox.desktop ${pkgdir}/usr/share/xsessions/fluxbox.desktop + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING }
[arch-commits] Commit in fvwm-crystal/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 06:03:56 Author: eric Revision: 109335 Fixed location of sessions .desktop file Modified: fvwm-crystal/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 11:01:25 UTC (rev 109334) +++ PKGBUILD2011-02-08 11:03:56 UTC (rev 109335) @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: Eric Belanger e...@archlinux.org +# Maintainer: Eric Bélanger e...@archlinux.org pkgname=fvwm-crystal pkgver=3.0.6 @@ -23,7 +23,7 @@ make prefix=${pkgdir}/usr install install-doc sed -i 's|/usr/bin/env python|/usr/bin/env python2|' ${pkgdir}/usr/bin/fvwm-crystal.{apps,wallpaper} \ ${pkgdir}/usr/share/fvwm-crystal/fvwm/scripts/FvwmMPD/{getprevdir.py,stripnames.py} - install -D -m644 addons/fvwm-crystal.desktop ${pkgdir}/etc/X11/sessions/fvwm-crystal.desktop + install -D -m644 addons/fvwm-crystal.desktop ${pkgdir}/usr/share/xsessions/fvwm-crystal.desktop # Cleaning up files from svn tree find ${pkgdir} -depth -type d -name .svn -exec rm -rf {} \;
[arch-commits] Commit in fvwm-devel/trunk (ChangeLog PKGBUILD)
Date: Tuesday, February 8, 2011 @ 06:06:02 Author: eric Revision: 109336 Fixed location of sessions .desktop file, Removed ChangeLog Modified: fvwm-devel/trunk/PKGBUILD Deleted: fvwm-devel/trunk/ChangeLog ---+ ChangeLog | 44 PKGBUILD |6 ++ 2 files changed, 2 insertions(+), 48 deletions(-) Deleted: ChangeLog === --- ChangeLog 2011-02-08 11:03:56 UTC (rev 109335) +++ ChangeLog 2011-02-08 11:06:02 UTC (rev 109336) @@ -1,44 +0,0 @@ -2010-08-09 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.31-1 - * Upstream update - -2010-05-13 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.30-1 - * Upstream update - -2010-04-07 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.29-1 - * Upstream update - -2010-01-19 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.28-3 - * Fixed libpng patch - -2010-01-18 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.28-2 - * Rebuilt for libpng 1.4 and libjpeg 8 - -2009-09-27 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.28-1 - * Upstream update - -2009-06-18 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.27-2 - * Rebuilt against readline 6.0.00 - -2009-03-29 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.27-1 - * Upstream update - -2008-05-09 Eric Belanger e...@archlinux.org - - * fvwm-devel 2.5.26-1 - * Upstream update Modified: PKGBUILD === --- PKGBUILD2011-02-08 11:03:56 UTC (rev 109335) +++ PKGBUILD2011-02-08 11:06:02 UTC (rev 109336) @@ -1,6 +1,5 @@ # $Id$ -# Maintainer: Eric Belanger e...@archlinux.org -# Contributor: Tobias Kieslich tob...@archlinux.org +# Maintainer: Eric Bélanger e...@archlinux.org pkgname=fvwm-devel pkgver=2.5.31 @@ -13,7 +12,6 @@ makedepends=('pkg-config') conflicts=('fvwm') provides=(fvwm=${pkgver}) -changelog=ChangeLog source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop) md5sums=('bc0a64cee2b76a91b1b3f1aa716f564d' '3f5bcb246e035ff29aa5bf54487a3db4') sha1sums=('0a59ac1c17f37dbfb1e042f4df3f86a5eb2d719c' '17db773870637b410ceb4f68743dbd517bc5c599') @@ -31,6 +29,6 @@ install -d ${pkgdir}/etc/fvwm install -D -m644 sample.fvwmrc/* ${pkgdir}/etc/fvwm rm -f ${pkgdir}/etc/fvwm/Makefile* - install -D -m644 ../fvwm-devel.desktop ${pkgdir}/etc/X11/sessions/fvwm-devel.desktop + install -D -m644 ../fvwm-devel.desktop ${pkgdir}/usr/share/xsessions/fvwm-devel.desktop install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING }
[arch-commits] Commit in icewm/trunk (ChangeLog PKGBUILD)
Date: Tuesday, February 8, 2011 @ 06:08:33 Author: eric Revision: 109337 Fixed location of sessions .desktop file, Removed ChangeLog Modified: icewm/trunk/PKGBUILD Deleted: icewm/trunk/ChangeLog ---+ ChangeLog | 15 --- PKGBUILD | 15 +-- 2 files changed, 9 insertions(+), 21 deletions(-) Deleted: ChangeLog === --- ChangeLog 2011-02-08 11:06:02 UTC (rev 109336) +++ ChangeLog 2011-02-08 11:08:33 UTC (rev 109337) @@ -1,15 +0,0 @@ -2010-01-18 Eric Belanger e...@archlinux.org - - * icewm 1.2.37-3 - * Rebuilt for libpng 1.4 and libjpeg 8 - -2009-01-30 Eric Belanger e...@archlinux.org - - * icewm 1.2.37-1 - * Upstream update - -2008-10-18 Eric Belanger e...@archlinux.org - - * icewm 1.2.36-1 - * Upstream update - * Added ChangeLog Modified: PKGBUILD === --- PKGBUILD2011-02-08 11:06:02 UTC (rev 109336) +++ PKGBUILD2011-02-08 11:08:33 UTC (rev 109337) @@ -1,6 +1,5 @@ # $Id$ -# Maintainer: Eric Belanger e...@archlinux.org -# Contributor: dorphell dorph...@gmx.net +# Maintainer: Eric Bélanger e...@archlinux.org pkgname=icewm pkgver=1.2.37 @@ -17,8 +16,12 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --with-imlib \ - --enable-shaped-decorations --enable-gradients || return 1 - make || return 1 - make DESTDIR=${pkgdir} install install-man install-docs || return 1 - install -D -m644 ${srcdir}/icewm.desktop ${pkgdir}/etc/X11/sessions/icewm.desktop || return 1 + --enable-shaped-decorations --enable-gradients + make } + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install install-man install-docs + install -D -m644 ${srcdir}/icewm.desktop ${pkgdir}/usr/share/xsessions/icewm.desktop +}
[arch-commits] Commit in util-linux-ng/repos (core-i686)
Date: Tuesday, February 8, 2011 @ 08:19:21 Author: thomas Revision: 109338 db-move: util-linux-ng removed by thomas for move to [core] (i686) Deleted: util-linux-ng/repos/core-i686/
[arch-commits] Commit in util-linux-ng/repos (core-i686 testing-i686)
Date: Tuesday, February 8, 2011 @ 08:19:21 Author: thomas Revision: 109339 db-move: moved util-linux-ng from [testing] to [core] (i686) Added: util-linux-ng/repos/core-i686/ Deleted: util-linux-ng/repos/testing-i686/
[arch-commits] Commit in util-linux-ng/repos (core-x86_64)
Date: Tuesday, February 8, 2011 @ 08:19:22 Author: thomas Revision: 109340 db-move: util-linux-ng removed by thomas for move to [core] (x86_64) Deleted: util-linux-ng/repos/core-x86_64/
[arch-commits] Commit in util-linux-ng/repos (core-x86_64 testing-x86_64)
Date: Tuesday, February 8, 2011 @ 08:19:22 Author: thomas Revision: 109341 db-move: moved util-linux-ng from [testing] to [core] (x86_64) Added: util-linux-ng/repos/core-x86_64/ Deleted: util-linux-ng/repos/testing-x86_64/
[arch-commits] Commit in mkinitcpio-busybox/repos (core-i686)
Date: Tuesday, February 8, 2011 @ 08:19:23 Author: thomas Revision: 109342 db-move: mkinitcpio-busybox removed by thomas for move to [core] (i686) Deleted: mkinitcpio-busybox/repos/core-i686/
[arch-commits] Commit in mkinitcpio-busybox/repos (core-i686 testing-i686)
Date: Tuesday, February 8, 2011 @ 08:19:24 Author: thomas Revision: 109343 db-move: moved mkinitcpio-busybox from [testing] to [core] (i686) Added: mkinitcpio-busybox/repos/core-i686/ Deleted: mkinitcpio-busybox/repos/testing-i686/
[arch-commits] Commit in mkinitcpio-busybox/repos (core-x86_64)
Date: Tuesday, February 8, 2011 @ 08:19:28 Author: thomas Revision: 109344 db-move: mkinitcpio-busybox removed by thomas for move to [core] (x86_64) Deleted: mkinitcpio-busybox/repos/core-x86_64/
[arch-commits] Commit in mkinitcpio-busybox/repos (core-x86_64 testing-x86_64)
Date: Tuesday, February 8, 2011 @ 08:19:29 Author: thomas Revision: 109345 db-move: moved mkinitcpio-busybox from [testing] to [core] (x86_64) Added: mkinitcpio-busybox/repos/core-x86_64/ Deleted: mkinitcpio-busybox/repos/testing-x86_64/
[arch-commits] Commit in clamav/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 13:56:38 Author: bisson Revision: 109346 upstream update Modified: clamav/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 13:19:29 UTC (rev 109345) +++ PKGBUILD2011-02-08 18:56:38 UTC (rev 109346) @@ -3,12 +3,12 @@ # Contributor: Gregor Ibic gregor.i...@intelicom.si pkgname=clamav -pkgver=0.96.5 +pkgver=0.97 pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' arch=('i686' 'x86_64') depends=('bzip2' 'zlib' 'libtool') -options=(!libtool) +options=('!libtool') install=$pkgname.install license=('GPL') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') @@ -19,7 +19,7 @@ 'clamav.logrotate' 'config.patch') -sha1sums=('a7253e30d40e0c03964a60ed589b356a115b26c5' +sha1sums=('68f5a6736b3f67d608c4064ef839777877f09115' '7f15f0b13a1c11235bc99ef0add01efd8a442f07' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
[arch-commits] Commit in clamav/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 13:56:56 Author: bisson Revision: 109347 archrelease: remove extra-i686 Deleted: clamav/repos/extra-i686/
[arch-commits] Commit in clamav/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 13:57:09 Author: bisson Revision: 109348 archrelease: copy trunk to extra-i686 Added: clamav/repos/extra-i686/
[arch-commits] Commit in clamav/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 13:57:18 Author: bisson Revision: 109349 archrelease: remove extra-x86_64 Deleted: clamav/repos/extra-x86_64/
[arch-commits] Commit in clamav/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 13:57:30 Author: bisson Revision: 109350 archrelease: copy trunk to extra-x86_64 Added: clamav/repos/extra-x86_64/
[arch-commits] Commit in openssl/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 14:05:04 Author: pierre Revision: 109351 upgpkg: openssl 1.0.0.d-1 upstream release Modified: openssl/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 18:57:30 UTC (rev 109350) +++ PKGBUILD2011-02-08 19:05:04 UTC (rev 109351) @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz pie...@archlinux.de pkgname=openssl -_ver=1.0.0c +_ver=1.0.0d # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -18,7 +18,7 @@ 'fix-manpages.patch' 'no-rpath.patch' 'ca-dir.patch') -md5sums=('ff8fb85610aef328315a9decbb2712e4' +md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90')
[arch-commits] Commit in openssl/repos (testing-i686)
Date: Tuesday, February 8, 2011 @ 14:05:58 Author: pierre Revision: 109352 archrelease: copy trunk to testing-i686 Added: openssl/repos/testing-i686/
[arch-commits] Commit in openssl/repos (testing-x86_64)
Date: Tuesday, February 8, 2011 @ 14:06:53 Author: pierre Revision: 109353 archrelease: copy trunk to testing-x86_64 Added: openssl/repos/testing-x86_64/
[arch-commits] Commit in eric-plugins/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 15:12:53 Author: eric Revision: 109354 upgpkg: eric-plugins 4.4.4a-4 Added new plugins Modified: eric-plugins/trunk/PKGBUILD --+ PKGBUILD | 30 +++--- 1 file changed, 23 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 19:06:53 UTC (rev 109353) +++ PKGBUILD2011-02-08 20:12:53 UTC (rev 109354) @@ -4,7 +4,7 @@ pkgname=eric-plugins pkgver=4.4.4a -pkgrel=3 +pkgrel=4 pkgdesc=Plugins for the eric Python IDE arch=('any') url=http://eric-ide.python-projects.org/index.html; @@ -13,17 +13,25 @@ makedepends=('unzip') optdepends=('cx_freeze: for using CxFreeze plugin' 'pylint: for using PyLint plugin') source=(http://downloads.sourceforge.net/eric-ide/Plugin_Checker_PyLint-4.2.1.tar.gz + http://downloads.sourceforge.net/eric-ide/Plugin_Assistant_Eric-1.2.3.tar.gz + http://downloads.sourceforge.net/eric-ide/Plugin_Project_Pylons-1.0.0.tar.gz + http://downloads.sourceforge.net/eric-ide/Plugin_Project_wxPython-1.0.3.tar.gz + http://downloads.sourceforge.net/eric-ide/Plugin_Project_TurboGears-1.0.5.tar.gz http://downloads.sourceforge.net/eric-ide/Plugin_Packager_CxFreeze-4.3.0.tar.gz http://downloads.sourceforge.net/eric-ide/Plugin_Refactoring_Rope-1.1.5.tar.gz http://downloads.sourceforge.net/eric-ide/Plugin_Tools_CharTables-4.1.4.tar.gz http://downloads.sourceforge.net/eric-ide/Plugin_Vcs_CVS-4.1.12.tar.gz http://downloads.sourceforge.net/eric-ide/Plugin_Project_Django-2.1.2.tar.gz) -md5sums=('91df79eb6f6d117f64be4d441dd54fa0' - 'f1404f63f300f72352545c99d95d0b06' - '8c7bab8b84713c9a5cc20a43991554c3' - 'ee120a9950e86bb9e225a2d6d65a355f' - '119cfb72a58c48272410cb20436e0e71' - 'ac12bd9c175aaa4e77cd71c214a66233') +md5sums=('91df79eb6f6d117f64be4d441dd54fa0' '068a716bdfb2e34712fd374306cd6516'\ + '6301dec0fd21d14b3d885f699a41db3b' 'ed877f46064076a3e7319483e31ddf5a'\ + 'cd2a61fe2231c14955151764f7744561' 'f1404f63f300f72352545c99d95d0b06'\ + '8c7bab8b84713c9a5cc20a43991554c3' 'ee120a9950e86bb9e225a2d6d65a355f'\ + '119cfb72a58c48272410cb20436e0e71' 'ac12bd9c175aaa4e77cd71c214a66233') +sha1sums=('a1b53e95870dd9569b5e1644f78de361a0963927' '492b0f12b47957eb22e347a87aaf06c8d4d43c73'\ + '427768afc30d630753f5e248105e6e3bcab19d88' 'a6af2e775fdb33e12942c1d198adf9be2fa93c5b'\ + 'fd43b835448b4ca0bf07fc4e082af8f1047e8909' 'bcb9e90dd99eae45a389f1d784b8f24f788c769b'\ + 'bc5c6cd30ad461579fa5c349d55f6fc619751144' '31bc9ad875db98d4d2c3e1d7df0d74d0af370695'\ + 'dd4634e50c26c221fd09c83e024a96c6928bbfaf' 'b1db3885849d47eb4a914dda1be600ecf8afeaeb') package() { cd ${srcdir} @@ -31,6 +39,14 @@ install -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins unzip -o Plugin_Checker_PyLint-4.2.1/*.zip \ -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins + unzip -o Plugin_Assistant_Eric-1.2.3/*.zip \ + -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins +unzip -o Plugin_Project_Pylons-1.0.0/*.zip \ + -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins + unzip -o Plugin_Project_wxPython-1.0.3/*.zip \ + -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins +unzip -o Plugin_Project_TurboGears-1.0.5/*.zip \ + -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins unzip -o Plugin_Packager_CxFreeze-4.3.0/*.zip \ -d ${pkgdir}/usr/lib/python2.7/site-packages/eric4plugins unzip -o Plugin_Refactoring_Rope-1.1.5/*.zip \
[arch-commits] Commit in eric-plugins/repos (extra-any)
Date: Tuesday, February 8, 2011 @ 15:13:07 Author: eric Revision: 109355 archrelease: remove extra-any Deleted: eric-plugins/repos/extra-any/
[arch-commits] Commit in eric-plugins/repos (extra-any)
Date: Tuesday, February 8, 2011 @ 15:13:16 Author: eric Revision: 109356 archrelease: copy trunk to extra-any Added: eric-plugins/repos/extra-any/
[arch-commits] Commit in eric-plugins/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 15:16:54 Author: eric Revision: 109357 upgpkg: eric-plugins 4.4.4a-4 Updated license Modified: eric-plugins/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 20:13:16 UTC (rev 109356) +++ PKGBUILD2011-02-08 20:16:54 UTC (rev 109357) @@ -8,7 +8,7 @@ pkgdesc=Plugins for the eric Python IDE arch=('any') url=http://eric-ide.python-projects.org/index.html; -license=('GPL2') +license=('GPL3') depends=('eric') makedepends=('unzip') optdepends=('cx_freeze: for using CxFreeze plugin' 'pylint: for using PyLint plugin')
[arch-commits] Commit in eric-plugins/repos (extra-any)
Date: Tuesday, February 8, 2011 @ 15:17:07 Author: eric Revision: 109358 archrelease: remove extra-any Deleted: eric-plugins/repos/extra-any/
[arch-commits] Commit in eric-plugins/repos (extra-any)
Date: Tuesday, February 8, 2011 @ 15:17:16 Author: eric Revision: 109359 archrelease: copy trunk to extra-any Added: eric-plugins/repos/extra-any/
[arch-commits] Commit in eric/trunk (PKGBUILD)
Date: Tuesday, February 8, 2011 @ 15:18:09 Author: eric Revision: 109360 upgpkg: eric 4.4.12-1 Upstream update Modified: eric/trunk/PKGBUILD --+ PKGBUILD | 54 ++ 1 file changed, 26 insertions(+), 28 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 20:17:16 UTC (rev 109359) +++ PKGBUILD2011-02-08 20:18:09 UTC (rev 109360) @@ -1,10 +1,10 @@ +# $Id$ # Maintainer: Daniel J Griffiths ghost1...@archlinux.us -# Contributor: Eric Belanger e...@archlinux.org # Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net pkgname=eric -pkgver=4.4.9 -pkgrel=2 +pkgver=4.4.12 +pkgrel=1 pkgdesc=A full-featured Python and Ruby IDE in PyQt4 arch=('any') url=http://eric-ide.python-projects.org/index.html; @@ -17,49 +17,47 @@ changelog=eric.changelog source=(http://downloads.sourceforge.net/eric-ide/${pkgname}4-${pkgver}.tar.gz 'eric.desktop') -md5sums=('e8c9451850c70f4009785cc0d83adc25' - '77c494bb839c5744869d34355ea69095') +md5sums=('c2a689c57e80e794db9795e209dc3471' '77c494bb839c5744869d34355ea69095') +sha1sums=('94fd470a3dd61859ade7f73c52c5cd03e3083e56' '7529658c06e6c5c9ab587f0d18a2eafd42b87fee') package() { - cd ${srcdir}/${pkgname}4-${pkgver} + cd ${srcdir}/${pkgname}4-${pkgver} # our pyxml is patched # not version-depending because not critical sed -i 's/v (0, 8, 6)/v (0, 8, 4)/' install.py - python2 install.py -c -b /usr/bin -i ${pkgdir} + python2 install.py -c -b /usr/bin -i ${pkgdir} - install -D -m644 ${srcdir}/eric.desktop \ - ${pkgdir}/usr/share/applications/eric.desktop + install -D -m644 ${srcdir}/eric.desktop \ + ${pkgdir}/usr/share/applications/eric.desktop install -D -m644 eric/icons/default/eric.png \ - ${pkgdir}/usr/share/pixmaps/eric.png + ${pkgdir}/usr/share/pixmaps/eric.png # Creating version independant symlinks - ln -s /usr/bin/eric4 ${pkgdir}/usr/bin/eric - ln -s /usr/bin/eric4-api ${pkgdir}/usr/bin/eric-api - ln -s /usr/bin/eric4-compare ${pkgdir}/usr/bin/eric-compare + ln -s /usr/bin/eric4 ${pkgdir}/usr/bin/eric + ln -s /usr/bin/eric4-api ${pkgdir}/usr/bin/eric-api + ln -s /usr/bin/eric4-compare ${pkgdir}/usr/bin/eric-compare ln -s /usr/bin/eric4-configure \ - ${pkgdir}/usr/bin/eric-configure - ln -s /usr/bin/eric4-diff ${pkgdir}/usr/bin/eric-diff - ln -s /usr/bin/eric4-doc ${pkgdir}/usr/bin/eric-doc - ln -s /usr/bin/eric4-editor ${pkgdir}/usr/bin/eric-editor - ln -s /usr/bin/eric4-helpviewer \ - ${pkgdir}/usr/bin/eric-helpviewer + ${pkgdir}/usr/bin/eric-configure + ln -s /usr/bin/eric4-diff ${pkgdir}/usr/bin/eric-diff + ln -s /usr/bin/eric4-doc ${pkgdir}/usr/bin/eric-doc + ln -s /usr/bin/eric4-editor ${pkgdir}/usr/bin/eric-editor ln -s /usr/bin/eric4-plugininstall \ - ${pkgdir}/usr/bin/eric-plugininstall + ${pkgdir}/usr/bin/eric-plugininstall ln -s /usr/bin/eric4-pluginrepository \ - ${pkgdir}/usr/bin/eric-pluginrepository + ${pkgdir}/usr/bin/eric-pluginrepository ln -s /usr/bin/eric4-pluginuninstall \ - ${pkgdir}/usr/bin/eric-pluginuninstall - ln -s /usr/bin/eric4-qregexp ${pkgdir}/usr/bin/eric-qregexp - ln -s /usr/bin/eric4-re ${pkgdir}/usr/bin/eric-re - ln -s /usr/bin/eric4-tray ${pkgdir}/usr/bin/eric-tray + ${pkgdir}/usr/bin/eric-pluginuninstall + ln -s /usr/bin/eric4-qregexp ${pkgdir}/usr/bin/eric-qregexp + ln -s /usr/bin/eric4-re ${pkgdir}/usr/bin/eric-re + ln -s /usr/bin/eric4-tray ${pkgdir}/usr/bin/eric-tray ln -s /usr/bin/eric4-trpreviewer \ - ${pkgdir}/usr/bin/eric-trpreviewer + ${pkgdir}/usr/bin/eric-trpreviewer ln -s /usr/bin/eric4-uipreviewer \ - ${pkgdir}/usr/bin/eric-uipreviewer + ${pkgdir}/usr/bin/eric-uipreviewer ln -s /usr/bin/eric4-unittest \ - ${pkgdir}/usr/bin/eric-unittest + ${pkgdir}/usr/bin/eric-unittest } # vim:set ts=2 sw=2 et:
[arch-commits] Commit in eric/repos (extra-any)
Date: Tuesday, February 8, 2011 @ 15:19:16 Author: eric Revision: 109361 archrelease: remove extra-any Deleted: eric/repos/extra-any/
[arch-commits] Commit in eric/repos (extra-any)
Date: Tuesday, February 8, 2011 @ 15:19:26 Author: eric Revision: 109362 archrelease: copy trunk to extra-any Added: eric/repos/extra-any/
[arch-commits] Commit in fetchmail/repos (extra-i686)
Date: Tuesday, February 8, 2011 @ 16:02:44 Author: eric Revision: 109363 db-move: fetchmail removed by eric for move to [extra] (i686) Deleted: fetchmail/repos/extra-i686/
[arch-commits] Commit in fetchmail/repos (extra-i686 testing-i686)
Date: Tuesday, February 8, 2011 @ 16:02:44 Author: eric Revision: 109364 db-move: moved fetchmail from [testing] to [extra] (i686) Added: fetchmail/repos/extra-i686/ Deleted: fetchmail/repos/testing-i686/
[arch-commits] Commit in fetchmail/repos (extra-x86_64)
Date: Tuesday, February 8, 2011 @ 16:02:45 Author: eric Revision: 109365 db-move: fetchmail removed by eric for move to [extra] (x86_64) Deleted: fetchmail/repos/extra-x86_64/
[arch-commits] Commit in fetchmail/repos (extra-x86_64 testing-x86_64)
Date: Tuesday, February 8, 2011 @ 16:02:46 Author: eric Revision: 109366 db-move: moved fetchmail from [testing] to [extra] (x86_64) Added: fetchmail/repos/extra-x86_64/ Deleted: fetchmail/repos/testing-x86_64/
[arch-commits] Commit in wget/trunk (PKGBUILD wget-1.12-CVE-2010-2252.patch)
Date: Tuesday, February 8, 2011 @ 22:01:13 Author: stephane Revision: 109367 upgpkg: wget 1.12-3 Rebuild of old package, Tidy up PKGBUILD, Fix CVE-2010-2252 Added: wget/trunk/wget-1.12-CVE-2010-2252.patch Modified: wget/trunk/PKGBUILD ---+ PKGBUILD | 20 +++-- wget-1.12-CVE-2010-2252.patch | 155 2 files changed, 168 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-08 21:02:46 UTC (rev 109366) +++ PKGBUILD2011-02-09 03:01:13 UTC (rev 109367) @@ -4,7 +4,7 @@ pkgname=wget pkgver=1.12 -pkgrel=2 +pkgrel=3 pkgdesc=A network utility to retrieve files from the Web arch=('i686' 'x86_64') url=http://www.gnu.org/software/wget/wget.html; @@ -14,16 +14,22 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('141461b9c04e454dc8933c9d1f2abf83') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz +wget-1.12-CVE-2010-2252.patch) +md5sums=('141461b9c04e454dc8933c9d1f2abf83' + '2c8bc23eff98fd4efc3f96394fc8e61e') build() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} + + # Fix arbitrary file overwrite via 3xx redirect (CVE-2010-2252) + patch -Np1 -i ../wget-1.12-CVE-2010-2252.patch + ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } Added: wget-1.12-CVE-2010-2252.patch === --- wget-1.12-CVE-2010-2252.patch (rev 0) +++ wget-1.12-CVE-2010-2252.patch 2011-02-09 03:01:13 UTC (rev 109367) @@ -0,0 +1,155 @@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/doc/wget.texi wget/doc/wget.texi +--- wget~/doc/wget.texi2010-09-05 15:32:44.0 +0200 wget/doc/wget.texi 2010-09-05 15:32:44.0 +0200 +@@ -1487,6 +1487,13 @@ + @code{Content-Disposition} headers to describe what the name of a + downloaded file should be. + ++@cindex Trust server names ++@item --trust-server-names ++ ++If this is set to on, on a redirect the last component of the ++redirection URL will be used as the local file name. By default it is ++used the last component in the original URL. ++ + @cindex authentication + @item --auth-no-challenge + +@@ -2797,6 +2804,10 @@ + Turn on recognition of the (non-standard) @samp{Content-Disposition} + HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}. + ++@item trust_server_names = on/off ++If set to on, use the last component of a redirection URL for the local ++file name. ++ + @item continue = on/off + If set to on, force continuation of preexistent partially retrieved + files. See @samp{-c} before setting it. +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' wget~/src/http.c wget/src/http.c +--- wget~/src/http.c 2010-09-05 15:30:22.0 +0200 wget/src/http.c2010-09-05 15:32:44.0 +0200 +@@ -2410,8 +2410,9 @@ + /* The genuine HTTP loop! This is the part where the retrieval is +retried, and retried, and retried, and... */ + uerr_t +-http_loop (struct url *u, char **newloc, char **local_file, const char *referer, +- int *dt, struct url *proxy, struct iri *iri) ++http_loop (struct url *u, struct url *original_url, char **newloc, ++ char **local_file, const char *referer, int *dt, struct url *proxy, ++ struct iri *iri) + { + int count; + bool got_head = false; /* used for time-stamping and filename detection */ +@@ -2457,7 +2458,8 @@ + } + else if (!opt.content_disposition) + { +- hstat.local_file = url_file_name (u); ++ hstat.local_file = ++url_file_name (opt.trustservernames ? u : original_url); + got_name = true; + } + +@@ -2497,7 +2499,7 @@ + + /* Send preliminary HEAD request if -N is given and we have an existing +* destination file. */ +- file_name = url_file_name (u); ++ file_name = url_file_name (opt.trustservernames ? u : original_url); + if (opt.timestamping +!opt.content_disposition +file_exists_p (file_name)) +@@ -2852,9 +2854,9 @@ + + /* Remember that we downloaded the file for later .orig code. */ + if (*dt ADDED_HTML_EXTENSION) +-downloaded_file(FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); ++downloaded_file (FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED, hstat.local_file); + else +-
[arch-commits] Commit in wget/repos (testing-i686)
Date: Tuesday, February 8, 2011 @ 22:01:20 Author: stephane Revision: 109368 archrelease: copy trunk to testing-i686 Added: wget/repos/testing-i686/
[arch-commits] Commit in wget/repos (testing-x86_64)
Date: Tuesday, February 8, 2011 @ 22:01:27 Author: stephane Revision: 109369 archrelease: copy trunk to testing-x86_64 Added: wget/repos/testing-x86_64/
[arch-commits] Commit in openssl/repos (core-i686)
Date: Wednesday, February 9, 2011 @ 01:31:54 Author: pierre Revision: 109370 db-move: openssl removed by pierre for move to [core] (i686) Deleted: openssl/repos/core-i686/
[arch-commits] Commit in openssl/repos (core-i686 testing-i686)
Date: Wednesday, February 9, 2011 @ 01:31:55 Author: pierre Revision: 109371 db-move: moved openssl from [testing] to [core] (i686) Added: openssl/repos/core-i686/ Deleted: openssl/repos/testing-i686/
[arch-commits] Commit in openssl/repos (core-x86_64)
Date: Wednesday, February 9, 2011 @ 01:31:55 Author: pierre Revision: 109372 db-move: openssl removed by pierre for move to [core] (x86_64) Deleted: openssl/repos/core-x86_64/
[arch-commits] Commit in openssl/repos (core-x86_64 testing-x86_64)
Date: Wednesday, February 9, 2011 @ 01:31:56 Author: pierre Revision: 109373 db-move: moved openssl from [testing] to [core] (x86_64) Added: openssl/repos/core-x86_64/ Deleted: openssl/repos/testing-x86_64/
[arch-commits] Commit in libedit/repos (core-i686)
Date: Wednesday, February 9, 2011 @ 02:22:37 Author: allan Revision: 109374 db-move: libedit removed by allan for move to [core] (i686) Deleted: libedit/repos/core-i686/
[arch-commits] Commit in libedit/repos (core-i686 testing-i686)
Date: Wednesday, February 9, 2011 @ 02:22:38 Author: allan Revision: 109375 db-move: moved libedit from [testing] to [core] (i686) Added: libedit/repos/core-i686/ Deleted: libedit/repos/testing-i686/
[arch-commits] Commit in libedit/repos (core-x86_64)
Date: Wednesday, February 9, 2011 @ 02:22:38 Author: allan Revision: 109376 db-move: libedit removed by allan for move to [core] (x86_64) Deleted: libedit/repos/core-x86_64/
[arch-commits] Commit in libedit/repos (core-x86_64 testing-x86_64)
Date: Wednesday, February 9, 2011 @ 02:22:39 Author: allan Revision: 109377 db-move: moved libedit from [testing] to [core] (x86_64) Added: libedit/repos/core-x86_64/ Deleted: libedit/repos/testing-x86_64/