From: Clinton Ebadi Date: Sun, 16 Feb 2020 03:16:37 +0000 (-0500) Subject: Merge branch 'debian' X-Git-Tag: debian/0.69.0-2+hcoop1~1 X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/commitdiff_plain/c4b6c7dec3b65316d62340fbd218f1ac73cbdcd2?hp=463a5c942956f42fce366796356201639cb0d92b Merge branch 'debian' --- diff --git a/debian/changelog b/debian/changelog index 099be25..011269d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,18 @@ courier-authlib (0.67.0-1) experimental; urgency=medium -- Markus Wanner Sun, 09 Apr 2017 20:54:30 +0200 +courier-authlib (0.66.4-9+hcoop2) unstable; urgency=medium + + * HCoop release with fixed build + + -- Clinton Ebadi Sun, 22 Apr 2018 04:15:05 -0400 + +courier-authlib (0.66.4-9+hcoop1) unstable; urgency=medium + + * HCoop release + + -- Clinton Ebadi Sun, 22 Apr 2018 03:53:22 -0400 + courier-authlib (0.66.4-9) unstable; urgency=medium * Orphan the package. @@ -211,6 +223,27 @@ courier-authlib (0.66.3-1) unstable; urgency=medium -- Ondřej Surý Mon, 29 Jun 2015 12:23:12 +0200 +courier-authlib (0.66.1-1+hcoop3) unstable; urgency=medium + + * Replace system() with fork()+setuid()+exec() when calling afs + get-token script. Fixes issues with modern libafs-pam-session / PAG + behavior (courier must still run nopag) + + -- Clinton Ebadi Mon, 18 May 2015 23:36:51 -0400 + +courier-authlib (0.66.1-1+hcoop2) unstable; urgency=medium + + * Rebuild for Jessie + + -- Clinton Ebadi Wed, 13 May 2015 11:08:11 -0400 + +courier-authlib (0.66.1-1~bpo70+hcoop1) wheezy-backports; urgency=medium + + * Merge hcoop changes + * Backport to wheezy + + -- Clinton Ebadi Tue, 29 Apr 2014 23:08:29 -0400 + courier-authlib (0.66.1-1) unstable; urgency=low * New upstream release. @@ -221,6 +254,12 @@ courier-authlib (0.66.1-1) unstable; urgency=low -- Stefan Hornburg (Racke) Mon, 28 Oct 2013 11:38:37 +0100 +courier-authlib (0.63.0-6+hcoop1) unstable; urgency=medium + + * Merged HCoop changes + + -- Clinton Ebadi Tue, 29 Apr 2014 20:17:45 -0400 + courier-authlib (0.63.0-6) unstable; urgency=low [Martin Orr ] @@ -313,6 +352,18 @@ courier-authlib (0.62.2-1) unstable; urgency=low -- Stefan Hornburg (Racke) Mon, 02 Mar 2009 16:09:05 +0100 +courier-authlib (0.61.0-1+lenny1hcoop1) lenny; urgency=low + + * Merge from Debian. Remaining changes: + + authpam.c: + - Revert the disabling of pam_setcred so that IMAP works on AFS. + + courier_auth_config.h: + - Set the userdb path to be /etc/courier/userdb. + + preauthuserdbcommon.c: + - Get AFS tokens. + + -- Michael Olson (HCoop) Thu, 09 Apr 2009 23:43:21 -0400 + courier-authlib (0.61.0-1+lenny1) testing-security; urgency=high * Non-maintainer upload by the security team @@ -341,6 +392,50 @@ courier-authlib (0.60.1-2.1) unstable; urgency=high -- Steffen Joeris Mon, 09 Jun 2008 15:29:23 +0000 +courier-authlib (0.60.2-0hcoop7) unstable; urgency=low + + * Revert last change. Now the AFS token code is before the callback. + + -- Michael Olson (HCoop) Thu, 07 Feb 2008 22:37:30 -0500 + +courier-authlib (0.60.2-0hcoop6) unstable; urgency=low + + * Move acquiting of AFS vmail tokens to just after callback. + + -- Michael Olson (HCoop) Sat, 02 Feb 2008 20:29:01 -0500 + +courier-authlib (0.60.2-0hcoop5) unstable; urgency=low + + * Move acquiring of AFS vmail tokens to preauthuserdbcommon.c. + + -- Michael Olson (HCoop) Fri, 01 Feb 2008 21:55:37 -0500 + +courier-authlib (0.60.2-0hcoop4) unstable; urgency=low + + * authuserdb: Try using a separate get-token script. + + -- Michael Olson (HCoop) Wed, 30 Jan 2008 13:17:14 -0500 + +courier-authlib (0.60.2-0hcoop3) unstable; urgency=low + + * Fix bug in previous patch. + + -- Michael Olson (HCoop) Sun, 27 Jan 2008 16:19:18 -0500 + +courier-authlib (0.60.2-0hcoop2) unstable; urgency=low + + * Get token after authenticating a vmail user. + + -- Michael Olson (HCoop) Sat, 26 Jan 2008 15:28:19 -0500 + +courier-authlib (0.60.2-0hcoop1) unstable; urgency=low + + * New upstream release. Remaining changes: + - Revert the disabling of pam_setcred so that IMAP works as expected. + - Set the userdb path to be /etc/courier/userdb. + + -- Michael Olson (HCoop) Fri, 25 Jan 2008 19:24:41 -0500 + courier-authlib (0.60.1-2) unstable; urgency=low * added LSB dependency info to init scripts (Closes: #460221, thanks to @@ -348,6 +443,14 @@ courier-authlib (0.60.1-2) unstable; urgency=low -- Stefan Hornburg (Racke) Mon, 7 Apr 2008 13:21:37 +0200 +courier-authlib (0.60.1-1hcoop1) unstable; urgency=low + + * Sync from Debian. Remaining changes: + - Revert the disabling of pam_setcred so that IMAP works as expected. + - Set the userdb path to be /etc/courier/userdb. + + -- Michael Olson (HCoop) Fri, 25 Jan 2008 18:28:11 -0500 + courier-authlib (0.60.1-1) unstable; urgency=low * new upstream release @@ -367,6 +470,15 @@ courier-authlib (0.59.3-2) unstable; urgency=low -- Stefan Hornburg (Racke) Thu, 21 Jun 2007 20:26:38 +0200 +courier-authlib (0.59.3-1hcoop1) unstable; urgency=low + + [Adam Megacz] + * Revert the disabling of pam_setcred so that IMAP works as expected. + * Set the userdb path to be /etc/courier/userdb. + * userdb: Allow "+", ":", and "_" in usernames. + + -- Michael Olson (HCoop) Fri, 25 Jan 2008 17:46:10 -0500 + courier-authlib (0.59.3-1) unstable; urgency=low * new upstream release diff --git a/debian/patches/0006-hcoop-openafs-changes.patch b/debian/patches/0006-hcoop-openafs-changes.patch new file mode 100644 index 0000000..650cdea --- /dev/null +++ b/debian/patches/0006-hcoop-openafs-changes.patch @@ -0,0 +1,82 @@ +--- a/authpam.c ++++ b/authpam.c +@@ -128,19 +128,20 @@ + } + } + +-#if 0 + + #if HAVE_PAM_SETCRED ++ fprintf(stderr, "pam_setcred...\n"); + if (retval == PAM_SUCCESS) + { + retval=pam_setcred(*pamh, PAM_ESTABLISH_CRED); + if (retval != PAM_SUCCESS) + { +- DPRINTF("pam_setcred failed, result %d", retval); ++ fprintf(stderr, "pam_setcred failed, result %d\n", retval); + } ++ fprintf(stderr, "pam_setcred done\n"); + } + #endif +-#endif ++ + + if (retval == PAM_SUCCESS) + { +--- a/courier_auth_config.h ++++ b/courier_auth_config.h +@@ -256,7 +256,7 @@ + #define STDC_HEADERS 1 + + /* Location of the userdb database */ +-#define USERDB "/usr/local/etc/authlib/userdb" ++#define USERDB "/etc/courier/userdb" + + /* Version number of package */ + /* #undef VERSION */ +--- a/preauthuserdbcommon.c ++++ b/preauthuserdbcommon.c +@@ -14,11 +14,13 @@ + #if HAVE_UNISTD_H + #include + #endif ++#include ++#include + + #include "auth.h" + #include "courierauthdebug.h" + #include "userdb/userdb.h" +- ++#include "numlib/numlib.h" + + int auth_userdb_pre_common(const char *userid, const char *service, + int needpass, +@@ -105,6 +107,27 @@ + auth.maildir=udb->udb_mailbox; + auth.quota=udb->udb_quota; + ++ /* Get tokens for AFS */ ++ { ++ if (auth.sysuserid) ++ { ++ pid_t pid = fork (); ++ ++ if (pid == 0) ++ { ++ char uidstr[32] = ""; ++ snprintf(uidstr, sizeof(uidstr), "%ld", (long)*auth.sysuserid); ++ ++ libmail_changeuidgid (*auth.sysuserid, auth.sysgroupid); ++ execl ("/etc/courier/get-token", "get-token", uidstr, NULL); ++ } ++ else ++ { ++ waitpid (pid, NULL, 0); ++ } ++ } ++ } ++ + courier_authdebug_authinfo("DEBUG: authuserdb: ", &auth, 0, passwords); + rc= (*callback)(&auth, arg); + if (passwords) free(passwords); diff --git a/debian/patches/series b/debian/patches/series index 032b1ec..22284bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ 0001-Don-t-mangle-permissions-on-install-time-as-it-s-tak.patch 0002-Rip-AC_PROG_SYSCONFTOOL-macro-to-m4-directory.patch 0005-libcourierauth-libraries-are-normal-shared-libraries.patch +0006-hcoop-openafs-changes.patch 0007-add-missing-include.patch 0008-fix-perl-shebang.patch 0009-cross.patch