Refresh patches

1 files changed, 89 insertions, 80 deletions

diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix
index ae00a79d..218379c0 100644
--- a/debian/patches-applied/007_modules_pam_unix
+++ b/debian/patches-applied/007_modules_pam_unix
@@ -2,7 +2,7 @@ Index: pam/modules/pam_unix/pam_unix_passwd.c
 ===================================================================
 --- pam.orig/modules/pam_unix/pam_unix_passwd.c
 +++ pam/modules/pam_unix/pam_unix_passwd.c
-@@ -98,6 +98,9 @@
+@@ -95,6 +95,9 @@
  # endif				/* GNU libc 2.1 */
  #endif
  
@@ -27,7 +27,7 @@ Index: pam/modules/pam_unix/pam_unix_passwd.c
 @@ -608,7 +616,7 @@
  	int retval;
  	int remember = -1;
- 	int rounds = -1;
+ 	int rounds = 0;
 -	int pass_min_len = 0;
 +	int pass_min_len = 6;
  
@@ -37,84 +37,93 @@ Index: pam/modules/pam_unix/support.h
 ===================================================================
 --- pam.orig/modules/pam_unix/support.h
 +++ pam/modules/pam_unix/support.h
-@@ -98,8 +98,9 @@
- #define UNIX_QUIET		 28	/* Don't print informational messages */
- #define UNIX_NO_PASS_EXPIRY      29     /* Don't check for password expiration if not used for authentication */
- #define UNIX_DES                 30     /* DES, default */
-+#define UNIX_OBSCURE_CHECKS      31     /* enable obscure checks on passwords */
+@@ -101,50 +101,52 @@
+ #define UNIX_GOST_YESCRYPT_PASS  31     /* new password hashes will use gost-yescrypt */
+ #define UNIX_YESCRYPT_PASS       32     /* new password hashes will use yescrypt */
+ #define UNIX_NULLRESETOK         33     /* allow empty password if password reset is enforced */
++#define UNIX_OBSCURE_CHECKS      34	/* enable obscure checks on passwords */
  /* -------------- */
--#define UNIX_CTRLS_              31	/* number of ctrl arguments defined */
-+#define UNIX_CTRLS_              32	/* number of ctrl arguments defined */
+-#define UNIX_CTRLS_              34	/* number of ctrl arguments defined */
++#define UNIX_CTRLS_              35	/* number of ctrl arguments defined */
  
- #define UNIX_DES_CRYPT(ctrl)	(off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl))
+ #define UNIX_DES_CRYPT(ctrl)	(off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)&&off(UNIX_GOST_YESCRYPT_PASS,ctrl)&&off(UNIX_YESCRYPT_PASS,ctrl))
  
-@@ -108,37 +109,38 @@
- /* symbol                  token name          ctrl mask             ctrl     *
-  * ----------------------- ------------------- --------------------- -------- */
+ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] =
+ {
+-/* symbol                      token name          ctrl mask                  ctrl             *
+- * --------------------------- -------------------- ------------------------- ---------------- */
++/* symbol                      token name          ctrl mask                  ctrl         *
++ * --------------------------- -------------------- ------------------------- ------------ */
  
--/* UNIX__OLD_PASSWD */     {NULL,              _ALL_ON_,                  01, 0},
--/* UNIX__VERIFY_PASSWD */  {NULL,              _ALL_ON_,                  02, 0},
--/* UNIX__IAMROOT */        {NULL,              _ALL_ON_,                  04, 0},
--/* UNIX_AUDIT */           {"audit",           _ALL_ON_,                 010, 0},
--/* UNIX_USE_FIRST_PASS */  {"use_first_pass",  _ALL_ON_^(060),           020, 0},
--/* UNIX_TRY_FIRST_PASS */  {"try_first_pass",  _ALL_ON_^(060),           040, 0},
--/* UNIX_AUTHTOK_TYPE */    {"authtok_type=",   _ALL_ON_,                0100, 0},
--/* UNIX__PRELIM */         {NULL,              _ALL_ON_^(0600),         0200, 0},
--/* UNIX__UPDATE */         {NULL,              _ALL_ON_^(0600),         0400, 0},
--/* UNIX__NONULL */         {NULL,              _ALL_ON_,               01000, 0},
--/* UNIX__QUIET */          {NULL,              _ALL_ON_,               02000, 0},
--/* UNIX_USE_AUTHTOK */     {"use_authtok",     _ALL_ON_,               04000, 0},
--/* UNIX_SHADOW */          {"shadow",          _ALL_ON_,              010000, 0},
--/* UNIX_MD5_PASS */        {"md5",            _ALL_ON_^(0260420000),  020000, 1},
--/* UNIX__NULLOK */         {"nullok",          _ALL_ON_^(01000),           0, 0},
--/* UNIX_DEBUG */           {"debug",           _ALL_ON_,              040000, 0},
--/* UNIX_NODELAY */         {"nodelay",         _ALL_ON_,             0100000, 0},
--/* UNIX_NIS */             {"nis",             _ALL_ON_,             0200000, 0},
--/* UNIX_BIGCRYPT */        {"bigcrypt",       _ALL_ON_^(0260420000), 0400000, 1},
--/* UNIX_LIKE_AUTH */       {"likeauth",        _ALL_ON_,            01000000, 0},
--/* UNIX_REMEMBER_PASSWD */ {"remember=",       _ALL_ON_,            02000000, 0},
--/* UNIX_NOREAP */          {"noreap",          _ALL_ON_,            04000000, 0},
--/* UNIX_BROKEN_SHADOW */   {"broken_shadow",   _ALL_ON_,           010000000, 0},
--/* UNIX_SHA256_PASS */     {"sha256",       _ALL_ON_^(0260420000), 020000000, 1},
--/* UNIX_SHA512_PASS */     {"sha512",       _ALL_ON_^(0260420000), 040000000, 1},
--/* UNIX_ALGO_ROUNDS */     {"rounds=",         _ALL_ON_,          0100000000, 0},
--/* UNIX_BLOWFISH_PASS */   {"blowfish",    _ALL_ON_^(0260420000), 0200000000, 1},
--/* UNIX_MIN_PASS_LEN */    {"minlen=",		_ALL_ON_,         0400000000, 0},
--/* UNIX_QUIET */           {"quiet",           _ALL_ON_,         01000000000, 0},
--/* UNIX_NO_PASS_EXPIRY */  {"no_pass_expiry",  _ALL_ON_,         02000000000, 0},
--/* UNIX_DES */             {"des",             _ALL_ON_^(0260420000),      0, 1},
-+/* UNIX__OLD_PASSWD */     {NULL,              _ALL_ON_,                  0x1, 0},
-+/* UNIX__VERIFY_PASSWD */  {NULL,              _ALL_ON_,                  0x2, 0},
-+/* UNIX__IAMROOT */        {NULL,              _ALL_ON_,                  0x4, 0},
-+/* UNIX_AUDIT */           {"audit",           _ALL_ON_,                  0x8, 0},
-+/* UNIX_USE_FIRST_PASS */  {"use_first_pass",  _ALL_ON_^(0x30),          0x10, 0},
-+/* UNIX_TRY_FIRST_PASS */  {"try_first_pass",  _ALL_ON_^(0x30),          0x20, 0},
-+/* UNIX_AUTHTOK_TYPE */    {"authtok_type=",   _ALL_ON_,                 0x40, 0},
-+/* UNIX__PRELIM */         {NULL,              _ALL_ON_^(0x180),         0x80, 0},
-+/* UNIX__UPDATE */         {NULL,              _ALL_ON_^(0x180),        0x100, 0},
-+/* UNIX__NONULL */         {NULL,              _ALL_ON_,                0x200, 0},
-+/* UNIX__QUIET */          {NULL,              _ALL_ON_,                0x400, 0},
-+/* UNIX_USE_AUTHTOK */     {"use_authtok",     _ALL_ON_,                0x800, 0},
-+/* UNIX_SHADOW */          {"shadow",          _ALL_ON_,               0x1000, 0},
-+/* UNIX_MD5_PASS */        {"md5",             _ALL_ON_^(0x2C22000),   0x2000, 1},
-+/* UNIX__NULLOK */         {"nullok",          _ALL_ON_^(0x200),            0, 0},
-+/* UNIX_DEBUG */           {"debug",           _ALL_ON_,               0x4000, 0},
-+/* UNIX_NODELAY */         {"nodelay",         _ALL_ON_,               0x8000, 0},
-+/* UNIX_NIS */             {"nis",             _ALL_ON_,              0x10000, 0},
-+/* UNIX_BIGCRYPT */        {"bigcrypt",        _ALL_ON_^(0x2C22000),  0x20000, 1},
-+/* UNIX_LIKE_AUTH */       {"likeauth",        _ALL_ON_,              0x40000, 0},
-+/* UNIX_REMEMBER_PASSWD */ {"remember=",       _ALL_ON_,              0x80000, 0},
-+/* UNIX_NOREAP */          {"noreap",          _ALL_ON_,             0x100000, 0},
-+/* UNIX_BROKEN_SHADOW */   {"broken_shadow",   _ALL_ON_,             0x200000, 0},
-+/* UNIX_SHA256_PASS */     {"sha256",          _ALL_ON_^(0x2C22000), 0x400000, 1},
-+/* UNIX_SHA512_PASS */     {"sha512",          _ALL_ON_^(0x2C22000), 0x800000, 1},
-+/* UNIX_ALGO_ROUNDS */     {"rounds=",         _ALL_ON_,            0x1000000, 0},
-+/* UNIX_BLOWFISH_PASS */   {"blowfish",        _ALL_ON_^(0x2C22000),0x2000000, 1},
-+/* UNIX_MIN_PASS_LEN */    {"minlen=",         _ALL_ON_,            0x4000000, 0},
-+/* UNIX_QUIET */           {"quiet",           _ALL_ON_,            0x8000000, 0},
-+/* UNIX_NO_PASS_EXPIRY */  {"no_pass_expiry",  _ALL_ON_,           0x10000000, 0},
-+/* UNIX_DES */             {"des",             _ALL_ON_^(0x2C22000),        0, 1},
-+/* UNIX_OBSCURE_CHECKS */  {"obscure",         _ALL_ON_,           0x20000000, 0},
+-/* UNIX__OLD_PASSWD */         {NULL,               _ALL_ON_,                              01, 0},
+-/* UNIX__VERIFY_PASSWD */      {NULL,               _ALL_ON_,                              02, 0},
+-/* UNIX__IAMROOT */            {NULL,               _ALL_ON_,                              04, 0},
+-/* UNIX_AUDIT */               {"audit",            _ALL_ON_,                             010, 0},
+-/* UNIX_USE_FIRST_PASS */      {"use_first_pass",   _ALL_ON_^(060ULL),                    020, 0},
+-/* UNIX_TRY_FIRST_PASS */      {"try_first_pass",   _ALL_ON_^(060ULL),                    040, 0},
+-/* UNIX_AUTHTOK_TYPE */        {"authtok_type=",    _ALL_ON_,                            0100, 0},
+-/* UNIX__PRELIM */             {NULL,               _ALL_ON_^(0600ULL),                  0200, 0},
+-/* UNIX__UPDATE */             {NULL,               _ALL_ON_^(0600ULL),                  0400, 0},
+-/* UNIX__NONULL */             {NULL,               _ALL_ON_,                           01000, 0},
+-/* UNIX__QUIET */              {NULL,               _ALL_ON_,                           02000, 0},
+-/* UNIX_USE_AUTHTOK */         {"use_authtok",      _ALL_ON_,                           04000, 0},
+-/* UNIX_SHADOW */              {"shadow",           _ALL_ON_,                          010000, 0},
+-/* UNIX_MD5_PASS */            {"md5",              _ALL_ON_^(015660420000ULL),        020000, 1},
+-/* UNIX__NULLOK */             {"nullok",           _ALL_ON_^(01000ULL),                    0, 0},
+-/* UNIX_DEBUG */               {"debug",            _ALL_ON_,                          040000, 0},
+-/* UNIX_NODELAY */             {"nodelay",          _ALL_ON_,                         0100000, 0},
+-/* UNIX_NIS */                 {"nis",              _ALL_ON_,                         0200000, 0},
+-/* UNIX_BIGCRYPT */            {"bigcrypt",         _ALL_ON_^(015660420000ULL),       0400000, 1},
+-/* UNIX_LIKE_AUTH */           {"likeauth",         _ALL_ON_,                        01000000, 0},
+-/* UNIX_REMEMBER_PASSWD */     {"remember=",        _ALL_ON_,                        02000000, 0},
+-/* UNIX_NOREAP */              {"noreap",           _ALL_ON_,                        04000000, 0},
+-/* UNIX_BROKEN_SHADOW */       {"broken_shadow",    _ALL_ON_,                       010000000, 0},
+-/* UNIX_SHA256_PASS */         {"sha256",           _ALL_ON_^(015660420000ULL),     020000000, 1},
+-/* UNIX_SHA512_PASS */         {"sha512",           _ALL_ON_^(015660420000ULL),     040000000, 1},
+-/* UNIX_ALGO_ROUNDS */         {"rounds=",          _ALL_ON_,                      0100000000, 0},
+-/* UNIX_BLOWFISH_PASS */       {"blowfish",         _ALL_ON_^(015660420000ULL),    0200000000, 1},
+-/* UNIX_MIN_PASS_LEN */        {"minlen=",          _ALL_ON_,                      0400000000, 0},
+-/* UNIX_QUIET */               {"quiet",            _ALL_ON_,                     01000000000, 0},
+-/* UNIX_NO_PASS_EXPIRY */      {"no_pass_expiry",   _ALL_ON_,                     02000000000, 0},
+-/* UNIX_DES */                 {"des",              _ALL_ON_^(015660420000ULL),             0, 1},
+-/* UNIX_GOST_YESCRYPT_PASS */  {"gost_yescrypt",    _ALL_ON_^(015660420000ULL),   04000000000, 1},
+-/* UNIX_YESCRYPT_PASS */       {"yescrypt",         _ALL_ON_^(015660420000ULL),  010000000000, 1},
+-/* UNIX_NULLRESETOK */         {"nullresetok",      _ALL_ON_,                    020000000000, 0},
++/* UNIX__OLD_PASSWD */         {NULL,               _ALL_ON_,                         0x1, 0},
++/* UNIX__VERIFY_PASSWD */      {NULL,               _ALL_ON_,                         0x2, 0},
++/* UNIX__IAMROOT */            {NULL,               _ALL_ON_,                         0x4, 0},
++/* UNIX_AUDIT */               {"audit",            _ALL_ON_,                         0x8, 0},
++/* UNIX_USE_FIRST_PASS */      {"use_first_pass",   _ALL_ON_^(0x30ULL),              0x10, 0},
++/* UNIX_TRY_FIRST_PASS */      {"try_first_pass",   _ALL_ON_^(0x30ULL),              0x20, 0},
++/* UNIX_AUTHTOK_TYPE */        {"authtok_type=",    _ALL_ON_,                        0x40, 0},
++/* UNIX__PRELIM */             {NULL,               _ALL_ON_^(0x180ULL),             0x80, 0},
++/* UNIX__UPDATE */             {NULL,               _ALL_ON_^(0x180ULL),            0x100, 0},
++/* UNIX__NONULL */             {NULL,               _ALL_ON_,                       0x200, 0},
++/* UNIX__QUIET */              {NULL,               _ALL_ON_,                       0x400, 0},
++/* UNIX_USE_AUTHTOK */         {"use_authtok",      _ALL_ON_,                       0x800, 0},
++/* UNIX_SHADOW */              {"shadow",           _ALL_ON_,                      0x1000, 0},
++/* UNIX_MD5_PASS */            {"md5",              _ALL_ON_^(0x6EC22000ULL),      0x2000, 1},
++/* UNIX__NULLOK */             {"nullok",           _ALL_ON_^(0x200ULL),                0, 0},
++/* UNIX_DEBUG */               {"debug",            _ALL_ON_,                      0x4000, 0},
++/* UNIX_NODELAY */             {"nodelay",          _ALL_ON_,                      0x8000, 0},
++/* UNIX_NIS */                 {"nis",              _ALL_ON_,                     0x10000, 0},
++/* UNIX_BIGCRYPT */            {"bigcrypt",         _ALL_ON_^(0x6EC22000ULL),     0x20000, 1},
++/* UNIX_LIKE_AUTH */           {"likeauth",         _ALL_ON_,                     0x40000, 0},
++/* UNIX_REMEMBER_PASSWD */     {"remember=",        _ALL_ON_,                     0x80000, 0},
++/* UNIX_NOREAP */              {"noreap",           _ALL_ON_,                    0x100000, 0},
++/* UNIX_BROKEN_SHADOW */       {"broken_shadow",    _ALL_ON_,                    0x200000, 0},
++/* UNIX_SHA256_PASS */         {"sha256",           _ALL_ON_^(0x6EC22000ULL),    0x400000, 1},
++/* UNIX_SHA512_PASS */         {"sha512",           _ALL_ON_^(0x6EC22000ULL),    0x800000, 1},
++/* UNIX_ALGO_ROUNDS */         {"rounds=",          _ALL_ON_,                   0x1000000, 0},
++/* UNIX_BLOWFISH_PASS */       {"blowfish",         _ALL_ON_^(0x6EC22000ULL),   0x2000000, 1},
++/* UNIX_MIN_PASS_LEN */        {"minlen=",          _ALL_ON_,                   0x4000000, 0},
++/* UNIX_QUIET */               {"quiet",            _ALL_ON_,                   0x8000000, 0},
++/* UNIX_NO_PASS_EXPIRY */      {"no_pass_expiry",   _ALL_ON_,                  0x10000000, 0},
++/* UNIX_DES */                 {"des",              _ALL_ON_^(0x6EC22000ULL),           0, 1},
++/* UNIX_GOST_YESCRYPT_PASS */  {"gost_yescrypt",    _ALL_ON_^(0x6EC22000ULL),  0x20000000, 1},
++/* UNIX_YESCRYPT_PASS */       {"yescrypt",         _ALL_ON_^(0x6EC22000ULL),  0x40000000, 1},
++/* UNIX_NULLRESETOK */         {"nullresetok",      _ALL_ON_,                  0x80000000, 0},
++/* UNIX_OBSCURE_CHECKS */      {"obscure",          _ALL_ON_,                 0x100000000, 0},
  };
  
  #define UNIX_DEFAULTS  (unix_args[UNIX__NONULL].flag)
@@ -122,7 +131,7 @@ Index: pam/modules/pam_unix/pam_unix.8.xml
 ===================================================================
 --- pam.orig/modules/pam_unix/pam_unix.8.xml
 +++ pam/modules/pam_unix/pam_unix.8.xml
-@@ -361,8 +361,81 @@
+@@ -400,8 +400,81 @@
          <listitem>
            <para>
              Set a minimum password length of <replaceable>n</replaceable>
@@ -413,7 +422,7 @@ Index: pam/modules/pam_unix/Makefile.am
 ===================================================================
 --- pam.orig/modules/pam_unix/Makefile.am
 +++ pam/modules/pam_unix/Makefile.am
-@@ -42,7 +42,7 @@
+@@ -39,7 +39,7 @@
  
  pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
  	pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \
@@ -426,7 +435,7 @@ Index: pam/modules/pam_unix/pam_unix.8
 ===================================================================
 --- pam.orig/modules/pam_unix/pam_unix.8
 +++ pam/modules/pam_unix/pam_unix.8
-@@ -193,7 +193,38 @@
+@@ -216,7 +216,38 @@
  .RS 4
  Set a minimum password length of
  \fIn\fR
@@ -470,7 +479,7 @@ Index: pam/modules/pam_unix/README
 ===================================================================
 --- pam.orig/modules/pam_unix/README
 +++ pam/modules/pam_unix/README
-@@ -155,8 +155,40 @@
+@@ -171,8 +171,40 @@
  
  minlen=n