libpam: Fix patch broken during upgrade

PATCH In review Richard Purdie 1 participant 2 messages Aug 9, 2015

Share & tools

Richard Purdie

author

2015-08-09 22:10 UTC #0 lore raw

PATCH 1/1 libpam: Fix patch broken during upgrade

"0x200" became "0200" during the upgrade to libpam 1.2.1 in:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=88dd997d9941b63ae9eead6690ecf2b785c0740c
and this broke the IMAGE_FEATURES like debug-tweaks.

I've converted all the values to octal here to match the original header file convention and make it clearer.

[YOCTO #8033]

Signed-off-by Richard Purdie <[email protected]>

meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch +2 -2

index 423267f..3241e82 100644
@@ -214,7 +214,7 @@ index 3729ce0..43cdbea 100644
  /* UNIX__PRELIM */         {NULL,              _ALL_ON_^(0600),         0200, 0},
  /* UNIX__UPDATE */         {NULL,              _ALL_ON_^(0600),         0400, 0},
 -/* UNIX__NONULL */         {NULL,              _ALL_ON_,               01000, 0},
-+/* UNIX__NONULL */         {NULL,              _ALL_ON_^(0x10000000),   0200, 0},
++/* UNIX__NONULL */         {NULL,              _ALL_ON_^(02000000000),   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},

@@ -222,7 +222,7 @@ index 3729ce0..43cdbea 100644
  /* UNIX_MIN_PASS_LEN */    {"minlen=",		_ALL_ON_,         0400000000, 0},
  /* UNIX_QUIET */           {"quiet",           _ALL_ON_,         01000000000, 0},
  /* UNIX_DES */             {"des",             _ALL_ON_^(0260420000),      0, 1},
-+/* UNIX_NULLOK_SECURE */   {"nullok_secure",   _ALL_ON_^(0x200),  0x10000000, 0},
++/* UNIX_NULLOK_SECURE */   {"nullok_secure",   _ALL_ON_^(01000),  02000000000, 0},
  };
  
  #define UNIX_DEFAULTS  (unix_args[UNIX__NONULL].flag)

Richard Purdie

author

2015-08-09 22:16 UTC #1 lore raw

Quoted 10 lines · Richard Purdie

"0x200" became "0200" during the upgrade to libpam 1.2.1 in:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=88dd997d9941b63ae9eead6690ecf2b785c0740c
and this broke the IMAGE_FEATURES like debug-tweaks.
I've converted all the values to octal here to match the original header file convention and make it clearer.
[YOCTO #8033]
Signed-off-by Richard Purdie <[email protected]>

I'm going to expidite merging this, since if I do, we can roll an M2-rc2 build today which QA can pick up tomorrow. This bug is blocking a lot of testing in M2 and the rebuild is dependent on it.

I can then likely get master-next merged and unblock patch merging a bit.

Cheers,

Richard