attached
Cheers,
--
Steve McIntyre [email protected]
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs
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/rules libpam-chroot-0.9/debian/rules
--- libpam-chroot-0.9/debian/rules
+++ libpam-chroot-0.9/debian/rules
@@ -8,7 +8,10 @@
# This is the debhelper compatability version to use.
# export DH_COMPAT=5
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
build-stamp:
dh_testdir
$(MAKE)
diff -u libpam-chroot-0.9/debian/control libpam-chroot-0.9/debian/control
--- libpam-chroot-0.9/debian/control
+++ libpam-chroot-0.9/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Javier Fernandez-Sanguino Pen~a <[email protected]>
Build-Depends: libpam0g-dev, debhelper (>> 3.0.0)
-Standards-Version: 3.6.1
+Standards-Version: 3.9.2
Homepage: http://sourceforge.net/projects/pam-chroot/
Package: libpam-chroot
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Chroot Pluggable Authentication Module for PAM
This package includes a special (but not thoroughly tested) PAM
module to provide chrooted (restricted) environments for users.
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-4.1) unstable; urgency=low
+
+ * NMU
+ * Merge changes back from Ubuntu (thanks to Matthias Klose)
+ - Remove unused variable `name'. Closes: #625374. LP: #831203.
+ - Revert:
+ + Build with -fno-stack-protector fix FTBFS
+ - Link with gcc.
+ * Lintian cleanups:
+ - Add ${misc:Depends}
+ - Add initial build-arch and build-indep rules
+ - Update Standard-Version (no changes)
+
+ -- Steve McIntyre <[email protected]> Fri, 16 Dec 2011 18:07:23 +0000
+
libpam-chroot (0.9-4) unstable; urgency=low
* Makefile: -lpam should go at the end of the $(LD) invocation
