Fix memset argument (noticed by GCC).

Package-Manager: portage-2.2.1_p20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 50 insertions, 7 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 9a5e3ddbf673..a149853006ba 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.306 2013/09/12 19:55:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.307 2013/09/12 20:13:21 slyfox Exp $
+
+  12 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/proftpd-1.3.4d-memset-fix.patch, proftpd-1.3.4d.ebuild:
+  Fix memset argument (noticed by GCC).
 
 *proftpd-1.3.4d (12 Sep 2013)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 3750aca1dd52..b99568a34d34 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -5,6 +5,7 @@ AUX proftpd-1.3.4a-ubug-3682.patch 4244 SHA256 310c18a525b3224edba7f1cfd0364a038
 AUX proftpd-1.3.4a-ubug-3728.patch 327 SHA256 f81256fe91be72ee8e96b18f356a55624cc080405f975760a2d17319828791cd SHA512 a3b173c398a3e3dac633488e005d7aab66373c9c0b1c32738a2cf6ef30a94024602bd96bd794036c86f214198a5d4f02f7f8097a13803bc2bc6320c53c14b023 WHIRLPOOL 8c283894f69d5bb24dfa790a232a234eb6dff9ca5e61de835129df83adf57b890e54e2a2c383904ed958656c65464c6f8e23cb3b75a5ab2c53314c116f33ed00
 AUX proftpd-1.3.4b-ubug-3795.patch 2768 SHA256 cc5f5175298408fb12de7cf268d8e59a4fa3fe2bc3c798d0f60f8c204e9831d8 SHA512 ed6eb3ed8080275c6b59b8c42dab08d6fa2653b8fd1f336b571429248c1807e95f60fa6ad491c97a689fed26e2c595e00f3a99996b472bf3bd87840fe3936790 WHIRLPOOL 61d8d6ca1aa0496fa0568a89fe2ec8ed64f6221ff14abb969541a6bf2285b2ac79a67c9ce3bf98e167236f38442ed5b6b12b0810fce001b7ec1c050af2649319
 AUX proftpd-1.3.4c-fix-build-noipv6.patch 582 SHA256 78aa3e205ca92fa2b97be2fb93d95980e1fec8b435ee858a8abb31435893909c SHA512 5ea38b94cb9f5d1a26f5bb0e3200aa72df7e5542f2041b3a33345918dc6c95859945ab8e80263d369f16f96862dc87b2511dea08080c76c14b68abe84a74bc04 WHIRLPOOL 4497bf1253be9be7663829fb1ab6ea96e45d67228219b7f099659c9f8654c9d37cdd3192d1eadc6f17430c120365375dee9fffbbc4ed6e1a3d8b0cc1e31900b7
+AUX proftpd-1.3.4d-memset-fix.patch 1271 SHA256 814c230120772449a055479447db2684cbeeacea1c709070ebaf21071e8b2b45 SHA512 bb744eee680b8c7c612c09a04bf3b85d643629e043e6a6f178e80108470b7e1324547188b31f7a7854fbca4fe8af08b4ec3918fb7a0d819194bd1f2303f977fe WHIRLPOOL 0c2e770830b70f9ca6acd9b50eee2b3e8b3b567b6ef53d32972edd9e5fd8d1e60b6c3952055a932ede11341d105c4d7662f8bf06e3c72c4ad60633dc11cf4faf
 AUX proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch 1492 SHA256 00f90994dc0514d906de68d96cc798a8158ae50a50a4719a6b070de1ef669c42 SHA512 835976728f0a3d72766c8a2da192d009b30ec5f1d6dedb711e985409708275fe250f14cde168017e5c78ed339b028186e5eecf51a6b183dd0ea85294fa609bb3 WHIRLPOOL fae4ff0ec20dcc83c6be7e2eb73d44785ac95cf4bebbec5f91228864ebd744baaecb9c9ab185eab7ac5ecfdbec0f86c073a8e316e5196f0138dd550b4a4ca00a
 AUX proftpd-tmpfiles.d.conf 34 SHA256 75288bb0c76392ae10e7ef3ff27e7b665742cdac8ce4c70dff9f29d645d0f0f3 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 WHIRLPOOL d3ef47f4e2abc178c2d153599e7b13148345a470c76410b499e41912f9e90a48c1217e7fdee3d6777b1598dd09840f8bffbd208fa9addbeaaaf9c64058d8df93
 AUX proftpd.conf.sample 1275 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df WHIRLPOOL a9f71cf50926ccdf5fe1116250c29a4048e7eb7fc7eb73732023b7c6e78c56b02356c001c203d9dc8c46f817471116977f76e961a6b2a60c03ae1d4722d9e3e1
@@ -32,13 +33,13 @@ EBUILD proftpd-1.3.4b.ebuild 7216 SHA256 f0a8cbd628cec9af0ab06fe50bc568ade35b500
 EBUILD proftpd-1.3.4c-r1.ebuild 7550 SHA256 9ee5bde4135f0c2d1de65e8425e7ebd0f127a26800f8876e0bac7b13ec9ab2e4 SHA512 9185b579528c8c0d9ea609ec574065398a9a0dddf4d85da8281da5afd94957fafe9dfc1d52cd7154f16b20990d1db473f7174abb093160056d016ee64e834ff2 WHIRLPOOL 9f8a5bd9a28bda42037d5bdfefc11dc73c33104fd54c83c98018705d473811f48e3b4d9a5fcdb5184387afafde23f76fd5d5f2b76c1c5bc98d7ee51a20e9c63a
 EBUILD proftpd-1.3.4c-r2.ebuild 7703 SHA256 f5f2be53b90e50a4cd632e5e7c969b476af9bdae068854b473faf4503d3e178e SHA512 00362d97212c7628a69e05450bbab071da8545be5f6970a20eadb69135a9bd2cc8fc034010ddfd8b8f1bd1431553934d2d13a0a3d9ccb977789e0ba4b672b449 WHIRLPOOL 915d5700a13734d03bf19b7396ea3b61092a6500532515ebf4cd6b691613e7d40cfd3707d83fdc3600d62c39309869c05c07f6de7833d52d32fc2693ee4a83d7
 EBUILD proftpd-1.3.4c.ebuild 7301 SHA256 a0480cfd66c9ecd5f6ee8a80ce09db5b67d1328d0d9397c330e76ec9cd3afd25 SHA512 5c69376a4c9f7735b046c3db7c7fa01cc17d8405dbe05fc5ebb709dc834226e69ab599de66ad943ceb6273e68201f69a2a63d99a4cef29c34b7e57f578442f76 WHIRLPOOL 0a1bc3358c59c7661463278d3eef5b6b82cc22ef11f7c603daa02567e65d309e22eaefc3ebdbc11329c7d38e2c9a71dc704f09e9d42c0bb18a21612f1280935e
-EBUILD proftpd-1.3.4d.ebuild 7709 SHA256 b30f97b8b756db415dc9c88d757a12fc1e511ca7e504bf99026fd6e103217166 SHA512 1c607eb33f0a10c2e728479fa58b97e5d4c572f6f38968734aba54b5ca42966e62d00d193cb679d9e41c67f104d6c1846e264935a6484dce1297b1e1efae298d WHIRLPOOL 03f8113321ce5d3f534233ccd4582082153f651c13c1bfae5b421eebee315185230c5f2770acb0b0012eea076acb7d9bcf99319c2ec6486ae5f3af22df87ab36
-MISC ChangeLog 53056 SHA256 4ad64e9b79bc80ebbf8c3bed2e9065bff72876a4dfa50faed24b978d210ce86b SHA512 fa9fce281b308f1a0e5de3b7fad1c9cb9bc66a67441e92c57a219ceb0f1a4a4057d2f8f7a7906cc2b47053ed9a4448708a56e13e401d6e78e15f910909a2dcf2 WHIRLPOOL c806b2f9bdc842acc37230d4e4fddf2e9d5b8bef23b6d3d39f7da968c27d6a3fb1190d30276f730197e8e051bf673fd3715ee9fe87a0ea193313db813dbcda0e
+EBUILD proftpd-1.3.4d.ebuild 7753 SHA256 7b598cc8581aef7b3774757f4fd18713fff2426f8714c7088ff571ee59e974d5 SHA512 4482707e3e32f57b0185c06c4cdd9d3b02828f3532112259a20949882f73046b3a177542d3536fb2b03f6f278a96d0df1cb3f48e5f4243070587396cf3c62db6 WHIRLPOOL c05acfcf6d9de276346e4cd8621ba6047d5c99d6a5034ee8fb35b85fb632200e45a54aaafc82ef5e30fcb449b470692045b2303536041635c3f41e022a199fce
+MISC ChangeLog 53216 SHA256 107c592b7ee28fbb1193101ba8f3815dd2bd54694cd34127b337310cbe8d284a SHA512 80cc641ab0f777ad35e194ef0225d1aaff595d7221e8cdd96a954105803db6304106c02075223ac83ac037ef6dc6d4a9d808bd0ed3c3c94e7b03d8a405ca8dbd WHIRLPOOL 5b54e79de916780d023a1fc65b02f1d095bc2825224e3ba1ace03707f01f972be28592f7e85498dcf8a7cee5bd1c7fbfdcb5612b1f5b2432d93e885c7c5d054c
 MISC metadata.xml 3191 SHA256 66e910e6dc0a9969d60941e120ae3adf75c41dca3548992a56572cd6071e2018 SHA512 efe5b66061928783ba85fd591cc78c32392f78a35cf3478c85e29e9f2851ae1dc13eaf122c9644595ecfb86329a8020867cb6cbee97bb1712f65b4c9c39679c1 WHIRLPOOL 5a8f94671535deb1f6a579af5870672b6f606980bccd1abc2538bd39098b48837252f1bb46176cbb14f3e935df5246a41e897fe8020c9808964e3f557594973c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIyGz0ACgkQcaHudmEf86p5dgCfda7so9nmyiKwsj0Gg6YPtYpg
-VTAAoIaR+REy4scUG3VLyjea6Prz/oxL
-=EWwV
+iEYEAREIAAYFAlIyH34ACgkQcaHudmEf86potwCfQgYw73NSlLnAXV/wdwFnMTvV
+8lwAn2jHiDHhfWMN9BMo51k/QjtwtKc0
+=Xt7+
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch b/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch
new file mode 100644
index 000000000000..9bec4d4d5804
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch
@@ -0,0 +1,37 @@
+From dfab55028b4282a8e8769e108518405a93cf3d87 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 12 Sep 2013 22:58:35 +0300
+Subject: [PATCH] contrib/mod_sftp_pam.c: fix size argument for memset
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Pass something string size related insteal of 'sizeof(void*)'
+(which might overflow).
+
+Found by gcc 4.8:
+> mod_sftp_pam.c:327:36: warning: argument to ‘sizeof’ in ‘memset’
+> call is the same expression as the destination; did you mean to
+> provide an explicit length? [-Wsizeof-pointer-memaccess]
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ contrib/mod_sftp_pam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/mod_sftp_pam.c b/contrib/mod_sftp_pam.c
+index 0a9de72..ba8f1c5 100644
+--- a/contrib/mod_sftp_pam.c
++++ b/contrib/mod_sftp_pam.c
+@@ -324,7 +324,7 @@ static int sftppam_driver_open(sftp_kbdint_driver_t *driver, const char *user) {
+     exit(1);
+   }
+ 
+-  memset(sftppam_user, '\0', sizeof(sftppam_user));
++  memset(sftppam_user, '\0', sftppam_userlen);
+   sstrncpy(sftppam_user, user, sftppam_userlen);
+ 
+   c = find_config(main_server->conf, CONF_PARAM, "SFTPPAMOptions", FALSE);
+-- 
+1.8.3.2
+
diff --git a/net-ftp/proftpd/proftpd-1.3.4d.ebuild b/net-ftp/proftpd/proftpd-1.3.4d.ebuild
index c1e0da386864..3ad52f91bd3d 100644
--- a/net-ftp/proftpd/proftpd-1.3.4d.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4d.ebuild,v 1.1 2013/09/12 19:55:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4d.ebuild,v 1.2 2013/09/12 20:13:21 slyfox Exp $
 
 EAPI=5
 inherit eutils multilib systemd
@@ -72,6 +72,7 @@ __prepare_module() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-sftp-kbdint-max-responses-bug3973.patch
+	epatch "${FILESDIR}"/${P}-memset-fix.patch
 
 	# Skip 'install-conf' / Support LINGUAS
 	sed -i -e "/install-all/s/ install-conf//" Makefile.in