[arch-commits] Commit in iniparser/trunk (2 files)

[Tobias Powalowski]

Date: Saturday, November 25, 2017 @ 07:04:27
  Author: tpowa
Revision: 310867

upgpkg: iniparser 4.1-1

bump to latest version

Modified:
  iniparser/trunk/PKGBUILD
Deleted:
  iniparser/trunk/0001-allocate-memory-for-string-termination.patch

---+
 0001-allocate-memory-for-string-termination.patch |   26 
 PKGBUILD  |   19 --
 2 files changed, 6 insertions(+), 39 deletions(-)

Deleted: 0001-allocate-memory-for-string-termination.patch
===
--- 0001-allocate-memory-for-string-termination.patch   2017-11-25 06:55:56 UTC 
(rev 310866)
+++ 0001-allocate-memory-for-string-termination.patch   2017-11-25 07:04:27 UTC 
(rev 310867)
@@ -1,26 +0,0 @@
-From 3d385e4f2aba5122d9e40481c4aec9135b96428a Mon Sep 17 00:00:00 2001
-From: Christian Hesse 
-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
-

Modified: PKGBUILD
===
--- PKGBUILD2017-11-25 06:55:56 UTC (rev 310866)
+++ PKGBUILD2017-11-25 07:04:27 UTC (rev 310867)
@@ -4,8 +4,8 @@
 # Contributor: Roman Kyrylych 
 
 pkgname=iniparser
-pkgver=4.0
-pkgrel=2
+pkgver=4.1
+pkgrel=1
 pkgdesc="A free stand-alone ini file parsing library written in portable ANSI 
C"
 arch=('x86_64')
 url="http://ndevilla.free.fr/iniparser/;
@@ -12,16 +12,9 @@
 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')
+source=($pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz)
+md5sums=('e43b722c71b399ab17c329c04dbdf1d7')
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../0001-allocate-memory-for-string-termination.patch
-}
-
 build() {
   cd $srcdir/$pkgname-$pkgver
   make
@@ -32,8 +25,8 @@
   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 libiniparser.so.1 $pkgdir/usr/lib/libiniparser.so.1
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE
-  ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so
+  ln -sf libiniparser.so.1 $pkgdir/usr/lib/libiniparser.so
   chrpath -d $pkgdir/usr/lib/libiniparser.so
 }

[arch-commits] Commit in iniparser/trunk (2 files)

[Evangelos Foutras]

Date: Tuesday, June 30, 2015 @ 09:49:52
  Author: foutrelis
Revision: 241418

upgpkg: iniparser 4.0-2

Fix memory corruption (FS#45039).

Added:
  iniparser/trunk/0001-allocate-memory-for-string-termination.patch
Modified:
  iniparser/trunk/PKGBUILD

---+
 0001-allocate-memory-for-string-termination.patch |   26 
 PKGBUILD  |   13 +++---
 2 files changed, 36 insertions(+), 3 deletions(-)

Added: 0001-allocate-memory-for-string-termination.patch
===
--- 0001-allocate-memory-for-string-termination.patch   
(rev 0)
+++ 0001-allocate-memory-for-string-termination.patch   2015-06-30 07:49:52 UTC 
(rev 241418)
@@ -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
+

Modified: PKGBUILD
===
--- PKGBUILD2015-06-30 05:47:00 UTC (rev 241417)
+++ PKGBUILD2015-06-30 07:49:52 UTC (rev 241418)
@@ -5,7 +5,7 @@
 
 pkgname=iniparser
 pkgver=4.0
-pkgrel=1
+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/;
@@ -12,9 +12,16 @@
 license=('MIT')
 depends=('glibc')
 makedepends=('chrpath')
-source=(https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz)
-md5sums=('94c7278f8d22de1a31320219b27634b0')
+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