diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2022-09-11 23:16:27 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2022-09-11 23:16:27 +0200 |
| commit | f7c5ed7e443bf1475a9b2cdffba43d1f7d69255b (patch) | |
| tree | 4c55343300f103f7fbe9260b11e2fc2ec160be80 | |
| parent | 71b57931c83d9410a27ecdc6b65b65e86e711085 (diff) | |
| download | shadow-f7c5ed7e443bf1475a9b2cdffba43d1f7d69255b.tar.gz | |
debian/patches: Reorder patches in series to make it look sane
| -rw-r--r-- | debian/patches/301_lastlog_faillog_do_not_reset_non-existent_data | 4 | ||||
| -rw-r--r-- | debian/patches/506_relaxed_usernames | 2 | ||||
| -rw-r--r-- | debian/patches/542_useradd-O_option | 2 | ||||
| -rw-r--r-- | debian/patches/series | 15 |
4 files changed, 11 insertions, 12 deletions
diff --git a/debian/patches/301_lastlog_faillog_do_not_reset_non-existent_data b/debian/patches/301_lastlog_faillog_do_not_reset_non-existent_data index 0e20995b..d5ccbddb 100644 --- a/debian/patches/301_lastlog_faillog_do_not_reset_non-existent_data +++ b/debian/patches/301_lastlog_faillog_do_not_reset_non-existent_data @@ -13,7 +13,7 @@ high UIDs) in a lot of zeros ending up in containers and tarballs. --- a/src/useradd.c +++ b/src/useradd.c -@@ -1997,8 +1997,9 @@ static void faillog_reset (uid_t uid) +@@ -1996,8 +1996,9 @@ static void faillog_reset (uid_t uid) struct faillog fl; int fd; off_t offset_uid = (off_t) (sizeof fl) * uid; @@ -24,7 +24,7 @@ high UIDs) in a lot of zeros ending up in containers and tarballs. return; } -@@ -2034,8 +2035,9 @@ static void lastlog_reset (uid_t uid) +@@ -2033,8 +2034,9 @@ static void lastlog_reset (uid_t uid) int fd; off_t offset_uid = (off_t) (sizeof ll) * uid; uid_t max_uid; diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames index 11665465..06b31ff6 100644 --- a/debian/patches/506_relaxed_usernames +++ b/debian/patches/506_relaxed_usernames @@ -54,7 +54,7 @@ Details: } --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -692,12 +692,20 @@ +@@ -698,12 +698,20 @@ </para> <para> diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option index d594ca9b..3745826e 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -7,7 +7,7 @@ Status wrt upstream: not included as this is just specific --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -320,6 +320,11 @@ +@@ -326,6 +326,11 @@ =<replaceable>100</replaceable> <option>-K</option> <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable> </para> diff --git a/debian/patches/series b/debian/patches/series index 6ecd3726..06d11736 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,17 +2,16 @@ #900_testsuite_groupmems #901_testsuite_gcov -502_debian_useradd_defaults -503_shadowconfig.8 008_login_log_failure_in_FTMP -429_login_FAILLOG_ENAB +301_lastlog_faillog_do_not_reset_non-existent_data 401_cppw_src.dpatch # 402 should be merged in 401, but should be reviewed by SE Linux experts first 402_cppw_selinux -506_relaxed_usernames -542_useradd-O_option +429_login_FAILLOG_ENAB 463_login_delay_obeys_to_PAM -505_useradd_recommend_adduser 501_commonio_group_shadow - -301_lastlog_faillog_do_not_reset_non-existent_data +502_debian_useradd_defaults +503_shadowconfig.8 +505_useradd_recommend_adduser +506_relaxed_usernames +542_useradd-O_option |