Date: Monday, June 10, 2013 @ 11:29:53
Author: tpowa
Revision: 188132
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
dosfstools/repos/testing-i686/3.0.18-use-memcpy-instead-of-strcpy.patch
(from rev 188131,
dosfstools/trunk/3.0.18-use-memcpy-instead-of-strcpy.patch)
dosfstools/repos/testing-i686/PKGBUILD
(from rev 188131, dosfstools/trunk/PKGBUILD)
dosfstools/repos/testing-x86_64/3.0.18-use-memcpy-instead-of-strcpy.patch
(from rev 188131,
dosfstools/trunk/3.0.18-use-memcpy-instead-of-strcpy.patch)
dosfstools/repos/testing-x86_64/PKGBUILD
(from rev 188131, dosfstools/trunk/PKGBUILD)
Deleted:
dosfstools/repos/testing-i686/PKGBUILD
dosfstools/repos/testing-x86_64/PKGBUILD
----------------------------------------------------------+
/PKGBUILD | 60 +++++++++++++
testing-i686/3.0.18-use-memcpy-instead-of-strcpy.patch | 15 +++
testing-i686/PKGBUILD | 24 -----
testing-x86_64/3.0.18-use-memcpy-instead-of-strcpy.patch | 15 +++
testing-x86_64/PKGBUILD | 24 -----
5 files changed, 90 insertions(+), 48 deletions(-)
Copied: dosfstools/repos/testing-i686/3.0.18-use-memcpy-instead-of-strcpy.patch
(from rev 188131, dosfstools/trunk/3.0.18-use-memcpy-instead-of-strcpy.patch)
===================================================================
--- testing-i686/3.0.18-use-memcpy-instead-of-strcpy.patch
(rev 0)
+++ testing-i686/3.0.18-use-memcpy-instead-of-strcpy.patch 2013-06-10
09:29:53 UTC (rev 188132)
@@ -0,0 +1,15 @@
+--- src/mkfs.fat.c.old 2013-06-09 12:30:43.626408604 -0400
++++ src/mkfs.fat.c 2013-06-09 12:30:28.306756934 -0400
+@@ -743,10 +743,10 @@
+ * differently: The jump code is only 2 bytes (and m68k machine code
+ * :-), then 6 bytes filler (ignored), then 3 byte serial number. */
+ bs.boot_jump[2] = 'm';
+- strcpy((char *)bs.system_id, "kdosf");
++ memcpy((char *)bs.system_id, "kdosf", strlen("kdosf"));
+ }
+ else
+- strcpy((char *)bs.system_id, "mkfs.fat");
++ memcpy((char *)bs.system_id, "mkfs.fat", strlen("mkfs.fat"));
+ if (sectors_per_cluster)
+ bs.cluster_size = (char)sectors_per_cluster;
+ if (size_fat == 32) {
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-06-10 09:29:38 UTC (rev 188131)
+++ testing-i686/PKGBUILD 2013-06-10 09:29:53 UTC (rev 188132)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: dorphell <[email protected]>
-# Committer: Judd Vinet <[email protected]>
-pkgname=dosfstools
-pkgver=3.0.18
-pkgrel=1
-pkgdesc="DOS filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc')
-source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-url="http://www.daniel-baumann.ch/software/dosfstools/";
-license=('GPL2')
-md5sums=('a80aab6aac9e56e937b0392a85bfadb9'
- 'SKIP')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make
-}
-
-package () {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man
DOCDIR=/usr/share/doc install
-}
Copied: dosfstools/repos/testing-i686/PKGBUILD (from rev 188131,
dosfstools/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-10 09:29:53 UTC (rev 188132)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: dorphell <[email protected]>
+# Committer: Judd Vinet <[email protected]>
+pkgname=dosfstools
+pkgver=3.0.18
+pkgrel=2
+pkgdesc="DOS filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc')
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+ 3.0.18-use-memcpy-instead-of-strcpy.patch)
+url="http://www.daniel-baumann.ch/software/dosfstools/";
+license=('GPL2')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i ../3.0.18-use-memcpy-instead-of-strcpy.patch
+}
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make
+}
+
+package () {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man
DOCDIR=/usr/share/doc install
+}
+md5sums=('a80aab6aac9e56e937b0392a85bfadb9'
+ 'SKIP'
+ '771cf771aadce6ab0b1c9944bf535011')
Copied:
dosfstools/repos/testing-x86_64/3.0.18-use-memcpy-instead-of-strcpy.patch (from
rev 188131, dosfstools/trunk/3.0.18-use-memcpy-instead-of-strcpy.patch)
===================================================================
--- testing-x86_64/3.0.18-use-memcpy-instead-of-strcpy.patch
(rev 0)
+++ testing-x86_64/3.0.18-use-memcpy-instead-of-strcpy.patch 2013-06-10
09:29:53 UTC (rev 188132)
@@ -0,0 +1,15 @@
+--- src/mkfs.fat.c.old 2013-06-09 12:30:43.626408604 -0400
++++ src/mkfs.fat.c 2013-06-09 12:30:28.306756934 -0400
+@@ -743,10 +743,10 @@
+ * differently: The jump code is only 2 bytes (and m68k machine code
+ * :-), then 6 bytes filler (ignored), then 3 byte serial number. */
+ bs.boot_jump[2] = 'm';
+- strcpy((char *)bs.system_id, "kdosf");
++ memcpy((char *)bs.system_id, "kdosf", strlen("kdosf"));
+ }
+ else
+- strcpy((char *)bs.system_id, "mkfs.fat");
++ memcpy((char *)bs.system_id, "mkfs.fat", strlen("mkfs.fat"));
+ if (sectors_per_cluster)
+ bs.cluster_size = (char)sectors_per_cluster;
+ if (size_fat == 32) {
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-06-10 09:29:38 UTC (rev 188131)
+++ testing-x86_64/PKGBUILD 2013-06-10 09:29:53 UTC (rev 188132)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: dorphell <[email protected]>
-# Committer: Judd Vinet <[email protected]>
-pkgname=dosfstools
-pkgver=3.0.18
-pkgrel=1
-pkgdesc="DOS filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc')
-source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-url="http://www.daniel-baumann.ch/software/dosfstools/";
-license=('GPL2')
-md5sums=('a80aab6aac9e56e937b0392a85bfadb9'
- 'SKIP')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make
-}
-
-package () {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man
DOCDIR=/usr/share/doc install
-}
Copied: dosfstools/repos/testing-x86_64/PKGBUILD (from rev 188131,
dosfstools/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-10 09:29:53 UTC (rev 188132)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: dorphell <[email protected]>
+# Committer: Judd Vinet <[email protected]>
+pkgname=dosfstools
+pkgver=3.0.18
+pkgrel=2
+pkgdesc="DOS filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc')
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+ 3.0.18-use-memcpy-instead-of-strcpy.patch)
+url="http://www.daniel-baumann.ch/software/dosfstools/";
+license=('GPL2')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i ../3.0.18-use-memcpy-instead-of-strcpy.patch
+}
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make
+}
+
+package () {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man
DOCDIR=/usr/share/doc install
+}
+md5sums=('a80aab6aac9e56e937b0392a85bfadb9'
+ 'SKIP'
+ '771cf771aadce6ab0b1c9944bf535011')
