Date: Wednesday, November 30, 2011 @ 16:06:41 Author: giovanni Revision: 143925
archrelease: copy trunk to extra-i686, extra-x86_64 Added: parted/repos/extra-i686/PKGBUILD (from rev 143924, parted/trunk/PKGBUILD) parted/repos/extra-i686/linux.c.patch (from rev 143924, parted/trunk/linux.c.patch) parted/repos/extra-i686/parted.install (from rev 143924, parted/trunk/parted.install) parted/repos/extra-x86_64/PKGBUILD (from rev 143924, parted/trunk/PKGBUILD) parted/repos/extra-x86_64/linux.c.patch (from rev 143924, parted/trunk/linux.c.patch) parted/repos/extra-x86_64/parted.install (from rev 143924, parted/trunk/parted.install) Deleted: parted/repos/extra-i686/PKGBUILD parted/repos/extra-i686/linux.c.patch parted/repos/extra-i686/parted.install parted/repos/extra-x86_64/PKGBUILD parted/repos/extra-x86_64/linux.c.patch parted/repos/extra-x86_64/parted.install -----------------------------+ extra-i686/PKGBUILD | 74 +++++++++++++++++++++--------------------- extra-i686/linux.c.patch | 50 ++++++++++++++-------------- extra-i686/parted.install | 36 ++++++++++---------- extra-x86_64/PKGBUILD | 74 +++++++++++++++++++++--------------------- extra-x86_64/linux.c.patch | 50 ++++++++++++++-------------- extra-x86_64/parted.install | 36 ++++++++++---------- 6 files changed, 160 insertions(+), 160 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-11-30 21:06:10 UTC (rev 143924) +++ extra-i686/PKGBUILD 2011-11-30 21:06:41 UTC (rev 143925) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Aaron Griffin <aa...@archlinux.org> - -pkgname=parted -pkgver=3.0 -pkgrel=3 -pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/parted/parted.html" -depends=('device-mapper' 'e2fsprogs') -makedepends=('pkgconfig') -options=('!libtool') -install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" - linux.c.patch) -md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' - '08c942e212424e238271217f52c59706') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # FS#25307 - patch -Np1 -i ${srcdir}/linux.c.patch - - ./configure --prefix=/usr \ - --disable-debug \ - --disable-rpath - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} Copied: parted/repos/extra-i686/PKGBUILD (from rev 143924, parted/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-11-30 21:06:41 UTC (rev 143925) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> + +pkgname=parted +pkgver=3.0 +pkgrel=4 +pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/parted/parted.html" +depends=('device-mapper' 'e2fsprogs') +makedepends=('pkg-config') +options=('!libtool') +install=parted.install +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" + 'linux.c.patch') +md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' + '08c942e212424e238271217f52c59706') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#25307 + patch -Np1 -i ${srcdir}/linux.c.patch + + ./configure --prefix=/usr \ + --disable-debug \ + --disable-rpath + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/linux.c.patch =================================================================== --- extra-i686/linux.c.patch 2011-11-30 21:06:10 UTC (rev 143924) +++ extra-i686/linux.c.patch 2011-11-30 21:06:41 UTC (rev 143925) @@ -1,25 +0,0 @@ ---- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 -+++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 -@@ -601,17 +601,17 @@ - static int kver = -1; - - struct utsname uts; -- int major; -- int minor; -- int teeny; -+ int major = 0; -+ int minor = 0; -+ int teeny = 0; - - if (kver != -1) - return kver; - - if (uname (&uts)) - return kver = 0; -- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) -- return kver = 0; -+ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); -+ assert (n == 2 || n == 3); - - return kver = KERNEL_VERSION (major, minor, teeny); - } Copied: parted/repos/extra-i686/linux.c.patch (from rev 143924, parted/trunk/linux.c.patch) =================================================================== --- extra-i686/linux.c.patch (rev 0) +++ extra-i686/linux.c.patch 2011-11-30 21:06:41 UTC (rev 143925) @@ -0,0 +1,25 @@ +--- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 ++++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 +@@ -601,17 +601,17 @@ + static int kver = -1; + + struct utsname uts; +- int major; +- int minor; +- int teeny; ++ int major = 0; ++ int minor = 0; ++ int teeny = 0; + + if (kver != -1) + return kver; + + if (uname (&uts)) + return kver = 0; +- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) +- return kver = 0; ++ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); ++ assert (n == 2 || n == 3); + + return kver = KERNEL_VERSION (major, minor, teeny); + } Deleted: extra-i686/parted.install =================================================================== --- extra-i686/parted.install 2011-11-30 21:06:10 UTC (rev 143924) +++ extra-i686/parted.install 2011-11-30 21:06:41 UTC (rev 143925) @@ -1,18 +0,0 @@ -info_dir=/usr/share/info -info_files=(parted.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} Copied: parted/repos/extra-i686/parted.install (from rev 143924, parted/trunk/parted.install) =================================================================== --- extra-i686/parted.install (rev 0) +++ extra-i686/parted.install 2011-11-30 21:06:41 UTC (rev 143925) @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(parted.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-11-30 21:06:10 UTC (rev 143924) +++ extra-x86_64/PKGBUILD 2011-11-30 21:06:41 UTC (rev 143925) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Aaron Griffin <aa...@archlinux.org> - -pkgname=parted -pkgver=3.0 -pkgrel=3 -pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/parted/parted.html" -depends=('device-mapper' 'e2fsprogs') -makedepends=('pkgconfig') -options=('!libtool') -install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" - linux.c.patch) -md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' - '08c942e212424e238271217f52c59706') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # FS#25307 - patch -Np1 -i ${srcdir}/linux.c.patch - - ./configure --prefix=/usr \ - --disable-debug \ - --disable-rpath - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} Copied: parted/repos/extra-x86_64/PKGBUILD (from rev 143924, parted/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-11-30 21:06:41 UTC (rev 143925) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> + +pkgname=parted +pkgver=3.0 +pkgrel=4 +pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/parted/parted.html" +depends=('device-mapper' 'e2fsprogs') +makedepends=('pkg-config') +options=('!libtool') +install=parted.install +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" + 'linux.c.patch') +md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' + '08c942e212424e238271217f52c59706') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#25307 + patch -Np1 -i ${srcdir}/linux.c.patch + + ./configure --prefix=/usr \ + --disable-debug \ + --disable-rpath + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/linux.c.patch =================================================================== --- extra-x86_64/linux.c.patch 2011-11-30 21:06:10 UTC (rev 143924) +++ extra-x86_64/linux.c.patch 2011-11-30 21:06:41 UTC (rev 143925) @@ -1,25 +0,0 @@ ---- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 -+++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 -@@ -601,17 +601,17 @@ - static int kver = -1; - - struct utsname uts; -- int major; -- int minor; -- int teeny; -+ int major = 0; -+ int minor = 0; -+ int teeny = 0; - - if (kver != -1) - return kver; - - if (uname (&uts)) - return kver = 0; -- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) -- return kver = 0; -+ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); -+ assert (n == 2 || n == 3); - - return kver = KERNEL_VERSION (major, minor, teeny); - } Copied: parted/repos/extra-x86_64/linux.c.patch (from rev 143924, parted/trunk/linux.c.patch) =================================================================== --- extra-x86_64/linux.c.patch (rev 0) +++ extra-x86_64/linux.c.patch 2011-11-30 21:06:41 UTC (rev 143925) @@ -0,0 +1,25 @@ +--- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 ++++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 +@@ -601,17 +601,17 @@ + static int kver = -1; + + struct utsname uts; +- int major; +- int minor; +- int teeny; ++ int major = 0; ++ int minor = 0; ++ int teeny = 0; + + if (kver != -1) + return kver; + + if (uname (&uts)) + return kver = 0; +- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) +- return kver = 0; ++ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); ++ assert (n == 2 || n == 3); + + return kver = KERNEL_VERSION (major, minor, teeny); + } Deleted: extra-x86_64/parted.install =================================================================== --- extra-x86_64/parted.install 2011-11-30 21:06:10 UTC (rev 143924) +++ extra-x86_64/parted.install 2011-11-30 21:06:41 UTC (rev 143925) @@ -1,18 +0,0 @@ -info_dir=/usr/share/info -info_files=(parted.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} Copied: parted/repos/extra-x86_64/parted.install (from rev 143924, parted/trunk/parted.install) =================================================================== --- extra-x86_64/parted.install (rev 0) +++ extra-x86_64/parted.install 2011-11-30 21:06:41 UTC (rev 143925) @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(parted.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +}