Bug#777965: libpam-chroot: diff for NMU version 0.9-4.2

[gregor herrmann]

Control: tags 777965 + pending

Dear maintainer,

I've prepared an NMU for libpam-chroot (versioned as 0.9-4.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Cranberries: Pretty

diff -u libpam-chroot-0.9/pam_chroot.c libpam-chroot-0.9/pam_chroot.c
--- libpam-chroot-0.9/pam_chroot.c
+++ libpam-chroot-0.9/pam_chroot.c
@@ -68,7 +68,7 @@
 /* initialize opts to a standard known state */
 int _pam_opts_init(struct _pam_opts* opts) {
 	if(NULL == opts) {
-		_pam_log(LOG_ERR, "%s: NULL opts pointer", __FUNCTION__);
+		_pam_log(LOG_ERR, "%s: NULL opts pointer", __extension__ __FUNCTION__);
 		return _PAM_CHROOT_INTERNALERR;
 	}
 
@@ -91,7 +91,7 @@
 	int i;
 
 	if(NULL == opts) {
-		_pam_log(LOG_ERR, "%s: NULL opts pointer", __FUNCTION__);
+		_pam_log(LOG_ERR, "%s: NULL opts pointer", __extension__ __FUNCTION__);
 		return _PAM_CHROOT_INTERNALERR;
 	}
 
@@ -162,7 +162,7 @@
 /* free the allocated memory of a struct _pam_opts */
 int _pam_opts_free(struct _pam_opts* opts) {
 	if(NULL == opts) {
-		_pam_log(LOG_ERR, "%s: NULL opts pointer", __FUNCTION__);
+		_pam_log(LOG_ERR, "%s: NULL opts pointer", __extension__ __FUNCTION__);
 	}
 	_pam_drop(opts->chroot_dir);
 	_pam_drop(opts->conf);
@@ -261,19 +261,19 @@
 	gids = (gid_t*) malloc(ngroups*sizeof(gid_t));
 	if(NULL == gids) {
 		_pam_log(LOG_ERR, "%s: %s: malloc: %s",
-				opts->module, __FUNCTION__, strerror(errno));
+				opts->module, __extension__ __FUNCTION__, strerror(errno));
 		return NULL;
 	}
 	ret = _PAM_GETUGROUPS(pwd->pw_name, pwd->pw_gid, gids, &ngroups);
 	if(-1 == ret) {
 		_pam_log(LOG_WARNING,
 				"%s: %s: _PAM_GETUGROUPS found more gids on second run",
-				opts->module, __FUNCTION__);
+				opts->module, __extension__ __FUNCTION__);
 	}
 	if(0 >= ngroups) {
 		_pam_log(LOG_ERR,
 				"%s: %s: _PAM_GETUGROUPS returned no groups for user \"%s\"",
-				opts->module, __FUNCTION__, user);
+				opts->module, __extension__ __FUNCTION__, user);
 		_pam_drop(gids);
 		return NULL;
 	}
@@ -282,7 +282,7 @@
 	groups = (char**)malloc((ngroups+1)*sizeof(char*));
 	if(NULL == groups) {
 		_pam_log(LOG_ERR, "%s: %s: malloc: %s",
-				opts->module, __FUNCTION__, strerror(errno));
+				opts->module, __extension__ __FUNCTION__, strerror(errno));
 		_pam_drop(gids);
 		return NULL;
 	}
@@ -533,7 +533,7 @@
 				char *errbuf = malloc(len);
 				if(NULL == errbuf) {
 					_pam_log(LOG_ERR, "%s: %s: malloc: %s",
-							opts->module, __FUNCTION__, strerror(errno));
+							opts->module, __extension__ __FUNCTION__, strerror(errno));
 					if(opts->flags & _PAM_OPTS_USE_GROUPS) {
 						_pam_free_groups(group_list);
 					}
diff -u libpam-chroot-0.9/debian/changelog libpam-chroot-0.9/debian/changelog
--- libpam-chroot-0.9/debian/changelog
+++ libpam-chroot-0.9/debian/changelog
@@ -1,3 +1,13 @@
+libpam-chroot (0.9-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-5": apply patch from Linn Crosetto:
+    mark the non-standard function identifier __FUNCTION__
+    with the __extension__ keyword.
+    (Closes: #777965)
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 19 Jul 2015 15:17:04 +0200
+
 libpam-chroot (0.9-4.1) unstable; urgency=low
 
   * NMU

signature.asc
Description: Digital Signature