[arch-commits] Commit in libxdg-basedir/repos (10 files)
Ronald van Haren
ronald at archlinux.org
Fri Nov 14 09:43:18 UTC 2014
Date: Friday, November 14, 2014 @ 10:43:18
Author: ronald
Revision: 122551
archrelease: copy trunk to community-i686, community-x86_64
Added:
libxdg-basedir/repos/community-i686/LICENSE
(from rev 122550, libxdg-basedir/trunk/LICENSE)
libxdg-basedir/repos/community-i686/PKGBUILD
(from rev 122550, libxdg-basedir/trunk/PKGBUILD)
libxdg-basedir/repos/community-i686/xdgGetRelativeHome-overflow.patch
(from rev 122550, libxdg-basedir/trunk/xdgGetRelativeHome-overflow.patch)
libxdg-basedir/repos/community-x86_64/LICENSE
(from rev 122550, libxdg-basedir/trunk/LICENSE)
libxdg-basedir/repos/community-x86_64/PKGBUILD
(from rev 122550, libxdg-basedir/trunk/PKGBUILD)
libxdg-basedir/repos/community-x86_64/xdgGetRelativeHome-overflow.patch
(from rev 122550, libxdg-basedir/trunk/xdgGetRelativeHome-overflow.patch)
Deleted:
libxdg-basedir/repos/community-i686/LICENSE
libxdg-basedir/repos/community-i686/PKGBUILD
libxdg-basedir/repos/community-x86_64/LICENSE
libxdg-basedir/repos/community-x86_64/PKGBUILD
----------------------------------------------------+
/LICENSE | 48 +++++++++++
/PKGBUILD | 80 +++++++++++++++++++
community-i686/LICENSE | 24 -----
community-i686/PKGBUILD | 31 -------
community-i686/xdgGetRelativeHome-overflow.patch | 11 ++
community-x86_64/LICENSE | 24 -----
community-x86_64/PKGBUILD | 31 -------
community-x86_64/xdgGetRelativeHome-overflow.patch | 11 ++
8 files changed, 150 insertions(+), 110 deletions(-)
Deleted: community-i686/LICENSE
===================================================================
--- community-i686/LICENSE 2014-11-14 09:43:03 UTC (rev 122550)
+++ community-i686/LICENSE 2014-11-14 09:43:18 UTC (rev 122551)
@@ -1,24 +0,0 @@
-/* Copyright (c) 2007 Mark Nevill
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
Copied: libxdg-basedir/repos/community-i686/LICENSE (from rev 122550, libxdg-basedir/trunk/LICENSE)
===================================================================
--- community-i686/LICENSE (rev 0)
+++ community-i686/LICENSE 2014-11-14 09:43:18 UTC (rev 122551)
@@ -0,0 +1,24 @@
+/* Copyright (c) 2007 Mark Nevill
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-11-14 09:43:03 UTC (rev 122550)
+++ community-i686/PKGBUILD 2014-11-14 09:43:18 UTC (rev 122551)
@@ -1,31 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ondrej Martinak <omartinak at gmail.com>
-
-pkgname=libxdg-basedir
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="An implementation of the XDG Base Directory specifications."
-arch=('i686' 'x86_64')
-url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir"
-license=('MIT')
-depends=('glibc')
-source=(https://github.com/devnev/$pkgname/archive/$pkgname-$pkgver.tar.gz
- 'LICENSE')
-sha1sums=('e671b01b17c8cf785d95dd3aefa93e7cf31e56a5'
- 'c76efede60d0632d4241d718919d8b4ec62056b3')
-
-build() {
- cd "${srcdir}/$pkgname-$pkgname-$pkgver"
-
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/$pkgname-$pkgname-$pkgver"
- make DESTDIR=${pkgdir} install
-
- # Install MIT license
- install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
Copied: libxdg-basedir/repos/community-i686/PKGBUILD (from rev 122550, libxdg-basedir/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-11-14 09:43:18 UTC (rev 122551)
@@ -0,0 +1,40 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Ondrej Martinak <omartinak at gmail.com>
+
+pkgname=libxdg-basedir
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="An implementation of the XDG Base Directory specifications."
+arch=('i686' 'x86_64')
+#url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir"
+url="https://github.com/devnev/$pkgname"
+license=('MIT')
+depends=('glibc')
+source=(https://github.com/devnev/$pkgname/archive/$pkgname-$pkgver.tar.gz
+ 'xdgGetRelativeHome-overflow.patch'
+ 'LICENSE')
+sha1sums=('e671b01b17c8cf785d95dd3aefa93e7cf31e56a5'
+ '90ce224344f8075c4ce8241b8f8bf13b8968eec5'
+ 'c76efede60d0632d4241d718919d8b4ec62056b3')
+
+prepare() {
+ cd "${srcdir}/$pkgname-$pkgname-$pkgver"
+
+# FS#39490: Fix buffer overflow
+ patch -Np0 -i "${srcdir}/xdgGetRelativeHome-overflow.patch"
+}
+
+build() {
+ cd "${srcdir}/$pkgname-$pkgname-$pkgver"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/$pkgname-$pkgname-$pkgver"
+ make DESTDIR=${pkgdir} install
+
+ # Install MIT license
+ install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
Copied: libxdg-basedir/repos/community-i686/xdgGetRelativeHome-overflow.patch (from rev 122550, libxdg-basedir/trunk/xdgGetRelativeHome-overflow.patch)
===================================================================
--- community-i686/xdgGetRelativeHome-overflow.patch (rev 0)
+++ community-i686/xdgGetRelativeHome-overflow.patch 2014-11-14 09:43:18 UTC (rev 122551)
@@ -0,0 +1,11 @@
+--- src/basedir.c.orig 2014-03-16 20:26:36.938576209 +0100
++++ src/basedir.c 2014-03-16 20:27:50.212192889 +0100
+@@ -574,7 +574,7 @@
+ unsigned int homelen;
+ if (!(home = xdgGetEnv("HOME")))
+ return NULL;
+- if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
++ if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength+1))) return NULL;
+ memcpy(relhome, home, homelen);
+ memcpy(relhome+homelen, relativefallback, fallbacklength+1);
+ }
Deleted: community-x86_64/LICENSE
===================================================================
--- community-x86_64/LICENSE 2014-11-14 09:43:03 UTC (rev 122550)
+++ community-x86_64/LICENSE 2014-11-14 09:43:18 UTC (rev 122551)
@@ -1,24 +0,0 @@
-/* Copyright (c) 2007 Mark Nevill
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
Copied: libxdg-basedir/repos/community-x86_64/LICENSE (from rev 122550, libxdg-basedir/trunk/LICENSE)
===================================================================
--- community-x86_64/LICENSE (rev 0)
+++ community-x86_64/LICENSE 2014-11-14 09:43:18 UTC (rev 122551)
@@ -0,0 +1,24 @@
+/* Copyright (c) 2007 Mark Nevill
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-11-14 09:43:03 UTC (rev 122550)
+++ community-x86_64/PKGBUILD 2014-11-14 09:43:18 UTC (rev 122551)
@@ -1,31 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ondrej Martinak <omartinak at gmail.com>
-
-pkgname=libxdg-basedir
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="An implementation of the XDG Base Directory specifications."
-arch=('i686' 'x86_64')
-url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir"
-license=('MIT')
-depends=('glibc')
-source=(https://github.com/devnev/$pkgname/archive/$pkgname-$pkgver.tar.gz
- 'LICENSE')
-sha1sums=('e671b01b17c8cf785d95dd3aefa93e7cf31e56a5'
- 'c76efede60d0632d4241d718919d8b4ec62056b3')
-
-build() {
- cd "${srcdir}/$pkgname-$pkgname-$pkgver"
-
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/$pkgname-$pkgname-$pkgver"
- make DESTDIR=${pkgdir} install
-
- # Install MIT license
- install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
Copied: libxdg-basedir/repos/community-x86_64/PKGBUILD (from rev 122550, libxdg-basedir/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-11-14 09:43:18 UTC (rev 122551)
@@ -0,0 +1,40 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Ondrej Martinak <omartinak at gmail.com>
+
+pkgname=libxdg-basedir
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="An implementation of the XDG Base Directory specifications."
+arch=('i686' 'x86_64')
+#url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir"
+url="https://github.com/devnev/$pkgname"
+license=('MIT')
+depends=('glibc')
+source=(https://github.com/devnev/$pkgname/archive/$pkgname-$pkgver.tar.gz
+ 'xdgGetRelativeHome-overflow.patch'
+ 'LICENSE')
+sha1sums=('e671b01b17c8cf785d95dd3aefa93e7cf31e56a5'
+ '90ce224344f8075c4ce8241b8f8bf13b8968eec5'
+ 'c76efede60d0632d4241d718919d8b4ec62056b3')
+
+prepare() {
+ cd "${srcdir}/$pkgname-$pkgname-$pkgver"
+
+# FS#39490: Fix buffer overflow
+ patch -Np0 -i "${srcdir}/xdgGetRelativeHome-overflow.patch"
+}
+
+build() {
+ cd "${srcdir}/$pkgname-$pkgname-$pkgver"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/$pkgname-$pkgname-$pkgver"
+ make DESTDIR=${pkgdir} install
+
+ # Install MIT license
+ install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
Copied: libxdg-basedir/repos/community-x86_64/xdgGetRelativeHome-overflow.patch (from rev 122550, libxdg-basedir/trunk/xdgGetRelativeHome-overflow.patch)
===================================================================
--- community-x86_64/xdgGetRelativeHome-overflow.patch (rev 0)
+++ community-x86_64/xdgGetRelativeHome-overflow.patch 2014-11-14 09:43:18 UTC (rev 122551)
@@ -0,0 +1,11 @@
+--- src/basedir.c.orig 2014-03-16 20:26:36.938576209 +0100
++++ src/basedir.c 2014-03-16 20:27:50.212192889 +0100
+@@ -574,7 +574,7 @@
+ unsigned int homelen;
+ if (!(home = xdgGetEnv("HOME")))
+ return NULL;
+- if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
++ if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength+1))) return NULL;
+ memcpy(relhome, home, homelen);
+ memcpy(relhome+homelen, relativefallback, fallbacklength+1);
+ }
More information about the arch-commits
mailing list