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

[Tobias Powalowski]

    Date: Tuesday, May 8, 2012 @ 10:31:58
  Author: tpowa
Revision: 158735

upgpkg: cifs-utils 5.4-1

bump to latest version

Added:
  cifs-utils/trunk/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
Modified:
  cifs-utils/trunk/PKGBUILD

----------------------------------------------------------+
 PKGBUILD                                                 |   12 +-
 mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch |   72 +++++++++++++
 2 files changed, 80 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-08 14:23:25 UTC (rev 158734)
+++ PKGBUILD	2012-05-08 14:31:58 UTC (rev 158735)
@@ -1,17 +1,20 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=cifs-utils
-pkgver=5.3
-pkgrel=2
+pkgver=5.4
+pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64)
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
 depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
+        mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+   # add fedora build patch
+  patch -Np1 -i ../mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
   ./configure --prefix=/usr
   make
 }
@@ -22,4 +25,5 @@
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/sbin/mount.cifs
 }
-md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7')
+md5sums=('dde98336c833b59777114145cb8f3c64'
+         'b1b0a5a21aedd5421ff6e1e1a8720771')

Added: mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
===================================================================
--- mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch	                        (rev 0)
+++ mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch	2012-05-08 14:31:58 UTC (rev 158735)
@@ -0,0 +1,72 @@
+From 900875dbda261dd8a9283bdda3c3dbe551fe0f7c Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton at samba.org>
+Date: Wed, 18 Apr 2012 21:41:05 -0400
+Subject: [PATCH] mount.cifs: fix up some -D_FORTIFY_SOURCE=2 warnings
+
+...and add -D_FORTIFY_SOURCE=2 to the default $CFLAGS.
+
+Signed-off-by: Jeff Layton <jlayton at samba.org>
+---
+ Makefile.am  |    2 +-
+ mount.cifs.c |   10 ++++++----
+ mtab.c       |    4 +++-
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d95142a..05729ca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Wextra -Werror
++AM_CFLAGS = -Wall -Wextra -Werror -D_FORTIFY_SOURCE=2
+ ACLOCAL_AMFLAGS = -I aclocal
+ 
+ root_sbindir = $(ROOTSBINDIR)
+diff --git a/mount.cifs.c b/mount.cifs.c
+index f0b073e..4f1ea40 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -928,9 +928,9 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
+ 				}
+ 			} else {
+ 				/* domain/username%password */
+-				const int max = MAX_DOMAIN_SIZE +
+-						MAX_USERNAME_SIZE +
+-						MOUNT_PASSWD_SIZE + 2;
++				const unsigned int max = MAX_DOMAIN_SIZE +
++							 MAX_USERNAME_SIZE +
++							 MOUNT_PASSWD_SIZE + 2;
+ 				if (strnlen(value, max + 1) >= max + 1) {
+ 					fprintf(stderr, "username too long\n");
+ 					return EX_USAGE;
+@@ -1603,8 +1603,10 @@ add_mtab(char *devname, char *mountpoint, unsigned long flags, const char *fstyp
+ 	mountent.mnt_passno = 0;
+ 	rc = addmntent(pmntfile, &mountent);
+ 	if (rc) {
++		int ignore __attribute__((unused));
++
+ 		fprintf(stderr, "unable to add mount entry to mtab\n");
+-		ftruncate(fd, statbuf.st_size);
++		ignore = ftruncate(fd, statbuf.st_size);
+ 		rc = EX_FILEIO;
+ 	}
+ 	tmprc = my_endmntent(pmntfile, statbuf.st_size);
+diff --git a/mtab.c b/mtab.c
+index de545b7..3d42ac0 100644
+--- a/mtab.c
++++ b/mtab.c
+@@ -271,8 +271,10 @@ my_endmntent(FILE *stream, off_t size)
+ 
+ 	/* truncate file back to "size" -- best effort here */
+ 	if (rc) {
++		int ignore __attribute__((unused));
++
+ 		rc = errno;
+-		ftruncate(fd, size);
++		ignore = ftruncate(fd, size);
+ 	}
+ 
+ 	endmntent(stream);
+-- 
+1.7.7.6
+