Stable update proposal: libpam-foreground
Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.
I propose to update the version of libpam-foreground in the stable
repository from 0.2-0.edu.etch.5 to 0.2-0.edu.etch.5
0.4-0.0.edu.etch.1. The changes are trivial, and the new package is a
clean backport from unstable while the package in the stable release
is our fork to add a few patches that later went into the upstream
version and in unstable.
Here is the diff -wr output between the two versions:
diff -uwr libpam-foreground-0.2/debian/changelog libpam-foreground-0.4/debian/changelog
--- libpam-foreground-0.2/debian/changelog 2007-09-01 11:07:35.000000000 +0200
+++ libpam-foreground-0.4/debian/changelog 2007-09-01 11:08:07.000000000 +0200
@@ -1,50 +1,39 @@
-libpam-foreground (0.2-0.edu.etch.5) terra; urgency=low
+libpam-foreground (0.4-0.0.edu.etch.1) terra; urgency=low
- * Non-maintainer upload to debian-edu.
- * Add NMU info in the changelog.
+ * Non-maintainer backport to Debian Edu/Etch.
- -- Petter Reinholdtsen <pere@debian.org> Sat, 7 Jul 2007 14:57:50 +0200
+ -- Petter Reinholdtsen <pere@debian.org> Tue, 31 Jul 2007 07:12:22 +0200
-libpam-foreground (0.2-0.edu.etch.4) terra; urgency=low
+libpam-foreground (0.4-1) unstable; urgency=low
- * Non-maintainer upload to debian-edu.
- * Try harder to correct the rhost test. Patch from Daniel Hess.
+ * Bring in the Ubuntu changes (Closes: #432066, #432067)
+ * Clean /var/run/console on boot (Closes: #431475)
+ * Check that the login isn't remote (Closes: #431730)
+ * Ensure that full library dependency information is included (Closes:
+ #432035)
- -- Petter Reinholdtsen <pere@debian.org> Sat, 7 Jul 2007 08:54:27 +0200
+ -- Matthew Garrett <mjg59@srcf.ucam.org> Fri, 13 Jul 2007 14:03:10 +0100
-libpam-foreground (0.2-0.edu.etch.3) terra; urgency=low
+libpam-foreground (0.3-0ubuntu1) gutsy; urgency=low
- * Non-maintainer upload to debian-edu.
- * Correct test for remote login.
+ * Add missing linker options (LP: #76364), thanks to Bohdan Kmit'.
+ * Split out of native packaging.
- -- Petter Reinholdtsen <pere@debian.org> Sat, 7 Jul 2007 08:49:52 +0200
+ -- Kees Cook <kees@ubuntu.com> Thu, 21 Jun 2007 12:55:26 -0700
-libpam-foreground (0.2-0.edu.etch.2) terra; urgency=low
+libpam-foreground (0.3) dapper; urgency=low
- * Non-maintainer upload to debian-edu.
- * Add --no-start to the dh_installinit call in rules, to avoid
- cleaning /var/run/console/ on upgrades.
+ * Added check-foreground-console tool
- -- Petter Reinholdtsen <pere@debian.org> Fri, 6 Jul 2007 23:37:46 +0200
+ -- Daniel Silverstone <daniel.silverstone@ubuntu.com> Thu, 11 May 2006 11:49:11 +0100
-libpam-foreground (0.2-0.edu.etch.1) terra; urgency=low
-
- * Non-maintainer upload to debian-edu.
- * Add check for remote host. Only create the lockfile if
- remote host is empty. (Closes: #431730)
- * Include init-script to cleanup stale lockfiles. (Closes: #431475)
- Thanks to Petter Reinholdtsen
- * Explicitly link libpam and libc to make lintian happier.
-
- -- Daniel Hess <daniel@rio-grande.ping.de> Fri, 6 Jul 2007 19:13:13 +0200
-
-libpam-foreground (0.2) unstable; urgency=low
+libpam-foreground (0.2) dapper; urgency=low
* Fix up minor bugs for main inclusion
-- Matthew Garrett <mjg59@srcf.ucam.org> Mon, 23 Jan 2006 22:50:45 +0000
-libpam-foreground (0.1-1) unstable; urgency=low
+libpam-foreground (0.1-1) dapper; urgency=low
* Initial release
diff -uwr libpam-foreground-0.2/debian/dirs libpam-foreground-0.4/debian/dirs
--- libpam-foreground-0.2/debian/dirs 2006-01-23 23:44:43.000000000 +0100
+++ libpam-foreground-0.4/debian/dirs 2007-07-13 14:55:49.000000000 +0200
@@ -1,2 +1,2 @@
-usr/bin
-usr/sbin
+bin
+lib/security
diff -uwr libpam-foreground-0.2/debian/rules libpam-foreground-0.4/debian/rules
--- libpam-foreground-0.2/debian/rules 2007-09-01 11:07:35.000000000 +0200
+++ libpam-foreground-0.4/debian/rules 2007-07-13 14:58:41.000000000 +0200
@@ -45,7 +45,11 @@
# Add here commands to install the package into debian/libpam-foreground.
mkdir -p debian/libpam-foreground/lib/security
+ mkdir -p debian/libpam-foreground/bin
cp pam_foreground.so debian/libpam-foreground/lib/security
+ cp check-foreground-console debian/libpam-foreground/bin/
+ chown root:root debian/libpam-foreground/bin/check-foreground-console
+ chmod u=rwxs,g=rx,o=rx debian/libpam-foreground/bin/check-foreground-console
# Build architecture-independent files here.
@@ -73,7 +77,7 @@
dh_link
dh_strip
dh_compress
- dh_fixperms
+ dh_fixperms -Xcheck-foreground-console
# dh_perl
# dh_python
# dh_makeshlibs
diff -uwr libpam-foreground-0.2/Makefile libpam-foreground-0.4/Makefile
--- libpam-foreground-0.2/Makefile 2007-09-01 11:07:35.000000000 +0200
+++ libpam-foreground-0.4/Makefile 2007-07-13 15:03:07.000000000 +0200
@@ -1,7 +1,11 @@
+all: pam_foreground.so check-foreground-console
+
+check-foreground-console: check-foreground-console.c
+ gcc -O0 -g -Wall -o check-foreground-console check-foreground-console.c
+
pam_foreground.so: pam_foreground.c
gcc -fPIC -O2 -Wall -c pam_foreground.c
- ld -x --shared -o pam_foreground.so pam_foreground.o -lpam -lc
+ ld -lpam -x --shared -o pam_foreground.so pam_foreground.o -lpam -lc
clean:
- - rm *.o *.so
+ - rm *.o *.so check-foreground-console
-default: pam_foreground.so
Only in libpam-foreground-0.2: Makefile.old
diff -uwr libpam-foreground-0.2/pam_foreground.c libpam-foreground-0.4/pam_foreground.c
--- libpam-foreground-0.2/pam_foreground.c 2007-09-01 11:07:35.000000000 +0200
+++ libpam-foreground-0.4/pam_foreground.c 2007-07-13 15:01:43.000000000 +0200
@@ -76,7 +76,7 @@
struct vt_stat vtstat;
size_t len;
int retval;
- const void *rhost=NULL;
+ void *rhost=NULL;
retval = pam_get_user(pamh, &user, NULL);
if (retval != PAM_SUCCESS) {
@@ -84,9 +84,10 @@
return retval;
}
- retval = pam_get_item(pamh, PAM_RHOST, &rhost);
+ retval = pam_get_item(pamh, PAM_RHOST, (const void **)&rhost);
if (retval != PAM_SUCCESS) {
- D(("get remote host returned error: %s", pam_strerror(pamh,retval)));
+ D(("get remote host returned error: %s",
+ pam_strerror(pamh,retval)));
return retval;
}
@@ -94,7 +95,6 @@
if (rhost != NULL && *(char *)rhost != '\0') {
return PAM_SUCCESS;
}
-
if (stat (AUTH_DIR, &finfo)) {
if (errno != ENOENT) {
D(("Can't access %s - %s\n", AUTH_DIR,
Reply to: