开源软件构建与测试

_service:tar_scm:pam.spec Changed

@@ -3,8 +3,8 @@
 %define _secconfdir %{_sysconfdir}/security
 %define _pamconfdir %{_sysconfdir}/pam.d
 Name: pam
-Version: 1.5.2
-Release: 6
+Version: 1.5.3
+Release: 1
 Summary: Pluggable Authentication Modules for Linux
 License: BSD and GPLv2+
 URL: http://www.linux-pam.org/
@@ -23,7 +23,6 @@
 Patch1: bugfix-pam-1.1.8-faillock-systemtime.patch
 Patch9000:change-ndbm-to-gdbm.patch
 Patch9001:add-sm3-crypt-support.patch
-Patch9002:1003-Change-chinese-translation.patch
 
 BuildRequires: autoconf automake libtool bison flex sed cracklib-devel gdbm-devel
 BuildRequires: perl-interpreter pkgconfig gettext-devel libtirpc-devel libnsl2-devel
@@ -61,7 +60,8 @@
 	--includedir=%{_includedir}/security \
 	--disable-static \
 	--disable-prelude \
-	--enable-db=ndbm
+	--enable-db=ndbm \
+	--enable-lastlog
 
 make -C po update-gmo
 %make_build
@@ -155,6 +155,7 @@
 %config(noreplace) %{_secconfdir}/opasswd
 %config(noreplace) %{_secconfdir}/sepermit.conf
 %config(noreplace) %{_secconfdir}/faillock.conf
+%config(noreplace) %{_secconfdir}/pwhistory.conf
 %dir /var/run/sepermit
 %ghost %verify(not md5 size mtime) /var/log/tallylog
 %dir /var/run/faillock
@@ -178,6 +179,9 @@
 
 
 %changelog
+* Fri Jul 14 2023 dongyuzhen <dongyuzhen@h-partners.com> - 1.5.3-1
+- upgrade version to 1.5.3
+
 * Thu Mar 09 2023 wangyu <wangyu283@huawei.com> - 1.5.2-6
 - revert: bugfix with cannot open database file

_service:tar_scm:1003-Change-chinese-translation.patch Deleted

_service:tar_scm:add-sm3-crypt-support.patch Changed

@@ -4,8 +4,8 @@
 Subject: PATCH add sm3 crypt support
 
 ---
- modules/pam_unix/pam_unix.8.xml |  16 +++-
  modules/pam_unix/pam_unix.8     |   9 +-
+ modules/pam_unix/pam_unix.8.xml |  16 +++-
  modules/pam_unix/passverify.c   |   5 +-
  modules/pam_unix/support.c      |   4 +-
  modules/pam_unix/support.h      |   6 +-
@@ -18,17 +18,39 @@
  create mode 100644 xtests/tst-pam_unix5.pamd
  create mode 100644 xtests/tst-pam_unix5.sh
 
+diff --git a/modules/pam_unix/pam_unix.8 b/modules/pam_unix/pam_unix.8
+index 438717f..6f31c10 100644
+--- a/modules/pam_unix/pam_unix.8
++++ b/modules/pam_unix/pam_unix.8
+@@ -201,9 +201,16 @@ When a user changes their password next, encrypt it with the yescrypt algorithm\
+ function\&.
+ .RE
+ .PP
++sm3
++.RS 4
++When a user changes their password next, encrypt it with the SM3 algorithm\&. The SM3 algorithm must be supported by the
++\fBcrypt\fR(3)
++function\&.
++.RE
++.PP
+ rounds=n
+ .RS 4
+-Set the optional number of rounds of the SHA256, SHA512, blowfish, gost\-yescrypt, and yescrypt password hashing algorithms to
++Set the optional number of rounds of the SHA256, SHA512, blowfish, gost\-yescrypt, yescrypt and SM3 password hashing algorithms to
+ \fIn\fR\&.
+ .RE
+ .PP
 diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml
-index 9f9c818..02713ce 100644
+index dfc0427..7d61869 100644
 --- a/modules/pam_unix/pam_unix.8.xml
 +++ b/modules/pam_unix/pam_unix.8.xml
-@@ -369,6 +369,20 @@
+@@ -366,6 +366,20 @@
            </para>
          </listitem>
        </varlistentry>
 +      <varlistentry>
 +        <term>
-+          <option>sm3</option>
++          sm3
 +        </term>
 +        <listitem>
 +          <para>
@@ -42,8 +64,8 @@
 +      </varlistentry>
        <varlistentry>
          <term>
-           <option>rounds=<replaceable>n</replaceable></option>
-@@ -376,7 +390,7 @@
+           rounds=n
+@@ -373,7 +387,7 @@
          <listitem>
            <para>
              Set the optional number of rounds of the SHA256, SHA512,
@@ -52,30 +74,8 @@
              algorithms to
              <replaceable>n</replaceable>.
            </para>
-diff --git a/modules/pam_unix/pam_unix.8 b/modules/pam_unix/pam_unix.8
-index d9cdea5..d37a3f3 100644
---- a/modules/pam_unix/pam_unix.8
-+++ b/modules/pam_unix/pam_unix.8
-@@ -201,9 +201,16 @@ When a user changes their password next, encrypt it with the yescrypt algorithm\
- function\&.
- .RE
- .PP
-+\fBsm3\fR
-+.RS 4
-+When a user changes their password next, encrypt it with the SM3 algorithm\&. The SM3 algorithm must be supported by the
-+\fBcrypt\fR(3)
-+function\&.
-+.RE
-+.PP
- \fBrounds=\fR\fB\fIn\fR\fR
- .RS 4
--Set the optional number of rounds of the SHA256, SHA512, blowfish, gost\-yescrypt, and yescrypt password hashing algorithms to
-+Set the optional number of rounds of the SHA256, SHA512, blowfish, gost\-yescrypt, yescrypt and SM3 password hashing algorithms to
- \fIn\fR\&.
- .RE
- .PP
 diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
-index f2474a5..a54785d 100644
+index 81b10d8..1aee153 100644
 --- a/modules/pam_unix/passverify.c
 +++ b/modules/pam_unix/passverify.c
 @@ -445,6 +445,8 @@ PAMH_ARG_DECL(char * create_password_hash,
@@ -95,10 +95,10 @@
 +			   on(UNIX_SHA512_PASS, ctrl) ? "sha512" :
 +			   on(UNIX_SM3_PASS, ctrl) ? "sm3" : algoid);
  		if(sp) {
- 		   memset(sp, '\0', strlen(sp));
+ 		   pam_overwrite_string(sp);
  		}
 diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c
-index 27ca712..7b62c14 100644
+index 043273d..4052868 100644
 --- a/modules/pam_unix/support.c
 +++ b/modules/pam_unix/support.c
 @@ -99,7 +99,7 @@ unsigned long long _set_ctrl(pam_handle_t *pamh, int flags, int *remember,
@@ -120,7 +120,7 @@
  				/* don't care about bogus values */
  				*rounds = 0;
 diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h
-index 19754dc..c18750c 100644
+index 8105400..b5712b5 100644
 --- a/modules/pam_unix/support.h
 +++ b/modules/pam_unix/support.h
 @@ -101,10 +101,11 @@ typedef struct {
@@ -146,7 +146,7 @@
  
  #define UNIX_DEFAULTS  (unix_argsUNIX__NONULL.flag)
 diff --git a/xtests/Makefile.am b/xtests/Makefile.am
-index 70f8441..28df170 100644
+index acf9746..33693de 100644
 --- a/xtests/Makefile.am
 +++ b/xtests/Makefile.am
 @@ -14,9 +14,9 @@ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
@@ -161,7 +161,7 @@
  	access.conf tst-pam_access1.pamd tst-pam_access1.sh \
  	tst-pam_access2.pamd tst-pam_access2.sh \
  	tst-pam_access3.pamd tst-pam_access3.sh \
-@@ -39,7 +39,7 @@ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
+@@ -40,7 +40,7 @@ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
  
  XTESTS = tst-pam_dispatch1 tst-pam_dispatch2 tst-pam_dispatch3 \
  	tst-pam_dispatch4 tst-pam_dispatch5 \
@@ -386,5 +386,5 @@
 +/usr/sbin/userdel -r tstpamunix 2> /dev/null
 +exit $RET
 -- 
-2.31.1.windows.1
+2.33.0

_service:tar_scm:bugfix-pam-1.1.8-faillock-systemtime.patch Changed

@@ -4,22 +4,27 @@
 Subject: PATCH bugfix pam 1.1.8 faillock systemtime
 
 ---
- modules/pam_faillock/pam_faillock.c | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
+ modules/pam_faillock/faillock_config.h |  1 +
+ modules/pam_faillock/pam_faillock.c    | 20 ++++++++++++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
 
-diff --git a/modules/pam_faillock/pam_faillock.c b/modules/pam_faillock/pam_faillock.c
-index 5b5cc2c..600e3f6 100644
---- a/modules/pam_faillock/pam_faillock.c
-+++ b/modules/pam_faillock/pam_faillock.c
-@@ -91,6 +91,7 @@ struct options {
+diff --git a/modules/pam_faillock/faillock_config.h b/modules/pam_faillock/faillock_config.h
+index 04bc699..d649ce1 100644
+--- a/modules/pam_faillock/faillock_config.h
++++ b/modules/pam_faillock/faillock_config.h
+@@ -75,6 +75,7 @@ struct options {
  	int is_admin;
  	uint64_t now;
  	int fatal_error;
 +	int time_jumped;
- };
  
- static int read_config_file(
-@@ -121,6 +122,7 @@ args_parse(pam_handle_t *pamh, int argc, const char **argv,
+ 	unsigned int reset;
+ 	const char *progname;
+diff --git a/modules/pam_faillock/pam_faillock.c b/modules/pam_faillock/pam_faillock.c
+index ca1c703..8fbab77 100644
+--- a/modules/pam_faillock/pam_faillock.c
++++ b/modules/pam_faillock/pam_faillock.c
+@@ -76,6 +76,7 @@ args_parse(pam_handle_t *pamh, int argc, const char **argv,
  	opts->fail_interval = 900;
  	opts->unlock_time = 600;
  	opts->root_unlock_time = MAX_TIME_INTERVAL+1;
@@ -27,7 +32,7 @@
  
  	for (i = 0; i < argc; ++i) {
  		const char *str = pam_str_skip_prefix(argvi, "conf=");
-@@ -464,8 +466,6 @@ check_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies
+@@ -219,8 +220,6 @@ check_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies
  			latest_time = tallies->recordsi.time;
  	}
  
@@ -36,7 +41,7 @@
  	failures = 0;
  	for (i = 0; i < tallies->count; i++) {
  		if ((tallies->recordsi.status & TALLY_STATUS_VALID) &&
-@@ -476,6 +476,19 @@ check_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies
+@@ -231,6 +230,19 @@ check_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies
  
  	opts->failures = failures;
  
@@ -56,7 +61,7 @@
  	if (opts->deny && failures >= opts->deny) {
  		if ((!opts->is_admin && opts->unlock_time && latest_time + opts->unlock_time < opts->now) ||
  			(opts->is_admin && opts->root_unlock_time && latest_time + opts->root_unlock_time < opts->now)) {
-@@ -712,6 +725,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
+@@ -489,6 +501,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
  					rv = PAM_IGNORE; /* this return value should be ignored */
  					write_tally(pamh, &opts, &tallies, &fd);
  				}
@@ -68,5 +73,5 @@
  		}
  	}
 -- 
-2.23.0
+2.33.0

_service:tar_scm:change-ndbm-to-gdbm.patch Changed

_service:tar_scm:Linux-PAM-1.5.2.tar.xz.asc Deleted

_service:tar_scm:Linux-PAM-1.5.2.tar.xz -> _service:tar_scm:Linux-PAM-1.5.3.tar.xz Changed

_service:tar_scm:Linux-PAM-1.5.3.tar.xz.asc Added

Changes of Revision 8