Date: Tuesday, June 30, 2015 @ 09:50:03 Author: foutrelis Revision: 241419
archrelease: copy trunk to extra-i686, extra-x86_64 Added: iniparser/repos/extra-i686/0001-allocate-memory-for-string-termination.patch (from rev 241418, iniparser/trunk/0001-allocate-memory-for-string-termination.patch) iniparser/repos/extra-i686/PKGBUILD (from rev 241418, iniparser/trunk/PKGBUILD) iniparser/repos/extra-x86_64/0001-allocate-memory-for-string-termination.patch (from rev 241418, iniparser/trunk/0001-allocate-memory-for-string-termination.patch) iniparser/repos/extra-x86_64/PKGBUILD (from rev 241418, iniparser/trunk/PKGBUILD) Deleted: iniparser/repos/extra-i686/PKGBUILD iniparser/repos/extra-x86_64/PKGBUILD ----------------------------------------------------------------+ /PKGBUILD | 78 ++++++++++ extra-i686/0001-allocate-memory-for-string-termination.patch | 26 +++ extra-i686/PKGBUILD | 32 ---- extra-x86_64/0001-allocate-memory-for-string-termination.patch | 26 +++ extra-x86_64/PKGBUILD | 32 ---- 5 files changed, 130 insertions(+), 64 deletions(-) Copied: iniparser/repos/extra-i686/0001-allocate-memory-for-string-termination.patch (from rev 241418, iniparser/trunk/0001-allocate-memory-for-string-termination.patch) =================================================================== --- extra-i686/0001-allocate-memory-for-string-termination.patch (rev 0) +++ extra-i686/0001-allocate-memory-for-string-termination.patch 2015-06-30 07:50:03 UTC (rev 241419) @@ -0,0 +1,26 @@ +From 3d385e4f2aba5122d9e40481c4aec9135b96428a Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Thu, 21 May 2015 10:07:32 +0200 +Subject: [PATCH] allocate memory for string termination + +This fixes invalid write. +--- + src/iniparser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index 1eb1004..c8a728e 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -66,7 +66,7 @@ static const char * strlwc(const char * in, char *out, unsigned len) + /*--------------------------------------------------------------------------*/ + static char * _strdup(const char *s) + { +- char * copy = (char*) malloc(strlen(s)); ++ char * copy = (char*) malloc(strlen(s) + 1); + strcpy(copy, s); + return copy ; + } +-- +2.4.5 + Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-06-30 07:49:52 UTC (rev 241418) +++ extra-i686/PKGBUILD 2015-06-30 07:50:03 UTC (rev 241419) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Roman Kyrylych <roman.kyryl...@gmail.com> -# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> - -pkgname=iniparser -pkgver=4.0 -pkgrel=1 -pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C" -arch=('i686' 'x86_64') -url="http://ndevilla.free.fr/iniparser/" -license=('MIT') -depends=('glibc') -makedepends=('chrpath') -source=(https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz) -md5sums=('94c7278f8d22de1a31320219b27634b0') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h - install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h - install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a - install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0 - install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE - ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so - chrpath -d $pkgdir/usr/lib/libiniparser.so -} Copied: iniparser/repos/extra-i686/PKGBUILD (from rev 241418, iniparser/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-06-30 07:50:03 UTC (rev 241419) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Roman Kyrylych <roman.kyryl...@gmail.com> +# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> + +pkgname=iniparser +pkgver=4.0 +pkgrel=2 +pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C" +arch=('i686' 'x86_64') +url="http://ndevilla.free.fr/iniparser/" +license=('MIT') +depends=('glibc') +makedepends=('chrpath') +source=($pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz + 0001-allocate-memory-for-string-termination.patch) +md5sums=('94c7278f8d22de1a31320219b27634b0' + '1ca2f65886484ea151d5076e09782c28') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../0001-allocate-memory-for-string-termination.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h + install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h + install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a + install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0 + install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE + ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so + chrpath -d $pkgdir/usr/lib/libiniparser.so +} Copied: iniparser/repos/extra-x86_64/0001-allocate-memory-for-string-termination.patch (from rev 241418, iniparser/trunk/0001-allocate-memory-for-string-termination.patch) =================================================================== --- extra-x86_64/0001-allocate-memory-for-string-termination.patch (rev 0) +++ extra-x86_64/0001-allocate-memory-for-string-termination.patch 2015-06-30 07:50:03 UTC (rev 241419) @@ -0,0 +1,26 @@ +From 3d385e4f2aba5122d9e40481c4aec9135b96428a Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Thu, 21 May 2015 10:07:32 +0200 +Subject: [PATCH] allocate memory for string termination + +This fixes invalid write. +--- + src/iniparser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index 1eb1004..c8a728e 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -66,7 +66,7 @@ static const char * strlwc(const char * in, char *out, unsigned len) + /*--------------------------------------------------------------------------*/ + static char * _strdup(const char *s) + { +- char * copy = (char*) malloc(strlen(s)); ++ char * copy = (char*) malloc(strlen(s) + 1); + strcpy(copy, s); + return copy ; + } +-- +2.4.5 + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-06-30 07:49:52 UTC (rev 241418) +++ extra-x86_64/PKGBUILD 2015-06-30 07:50:03 UTC (rev 241419) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Roman Kyrylych <roman.kyryl...@gmail.com> -# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> - -pkgname=iniparser -pkgver=4.0 -pkgrel=1 -pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C" -arch=('i686' 'x86_64') -url="http://ndevilla.free.fr/iniparser/" -license=('MIT') -depends=('glibc') -makedepends=('chrpath') -source=(https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz) -md5sums=('94c7278f8d22de1a31320219b27634b0') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h - install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h - install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a - install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0 - install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE - ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so - chrpath -d $pkgdir/usr/lib/libiniparser.so -} Copied: iniparser/repos/extra-x86_64/PKGBUILD (from rev 241418, iniparser/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-06-30 07:50:03 UTC (rev 241419) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Roman Kyrylych <roman.kyryl...@gmail.com> +# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> + +pkgname=iniparser +pkgver=4.0 +pkgrel=2 +pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C" +arch=('i686' 'x86_64') +url="http://ndevilla.free.fr/iniparser/" +license=('MIT') +depends=('glibc') +makedepends=('chrpath') +source=($pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz + 0001-allocate-memory-for-string-termination.patch) +md5sums=('94c7278f8d22de1a31320219b27634b0' + '1ca2f65886484ea151d5076e09782c28') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../0001-allocate-memory-for-string-termination.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h + install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h + install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a + install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0 + install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE + ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so + chrpath -d $pkgdir/usr/lib/libiniparser.so +}