tags 625374 + patch
user ubuntu-de...@lists.ubuntu.com
usertags 625374 oneiric ubuntu-patch
user debian-...@lists.debian.org
usertags 625374 ftbfs-gcc-4.6 ftbfs-werror
thanks
Fixes the ftbfs, and allows building with -fstack-protector.
diff -u libpam-chroot-0.9/Makefile libpam-chroot-0.9/Makefile
--- libpam-chroot-0.9/Makefile
+++ libpam-chroot-0.9/Makefile
@@ -3,7 +3,7 @@
CC=gcc
CFLAGS=-fPIC -O2 -Wall -Werror -pedantic
CPPFLAGS=-I.
-LDFLAGS=-x --shared
+LDFLAGS=-shared
DESTDIR=/
OUT=pam_chroot.so
@@ -12,7 +12,7 @@
all: $(OUT)
%.so: %.o
- $(LD) $(LDFLAGS) -o $@ $< -lpam
+ $(CC) $(LDFLAGS) -o $@ $< -lpam
clean:
rm -f *.o $(OUT)
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
@@ -639,10 +639,8 @@
* then pass it to this function */
int _pam_do_chroot(pam_handle_t *pamh, struct _pam_opts *opts) {
int err,debug;
- char *name;
char const *user;
- name = NULL;
debug = opts->flags & _PAM_OPTS_DEBUG;
err = pam_get_user(pamh, &user, NULL);
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,18 @@
+libpam-chroot (0.9-4ubuntu2) oneiric; urgency=low
+
+ * Remove unused variable `name'. Closes: #625374. LP: #831203.
+ * Revert:
+ - Build with -fno-stack-protector fix FTBFS
+ * Link with gcc.
+
+ -- Matthias Klose <d...@ubuntu.com> Thu, 15 Sep 2011 08:49:55 +0200
+
+libpam-chroot (0.9-4ubuntu1) natty; urgency=low
+
+ * Build with -fno-stack-protector fix FTBFS
+
+ -- Bhavani Shankar <bh...@ubuntu.com> Thu, 04 Nov 2010 22:14:20 +0530
+
libpam-chroot (0.9-4) unstable; urgency=low
* Makefile: -lpam should go at the end of the $(LD) invocation
