[pam_ssh] update to 1.98
Dmitry Butskoy
buc at fedoraproject.org
Thu Jun 13 16:06:45 UTC 2013
commit fd725dd6055d482772ea8dacc0c7055cc1d5420f
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Jun 13 20:05:52 2013 +0400
update to 1.98
.gitignore | 1 +
pam_ssh-1.97-setgid.patch | 13 -------
....97-var_run.patch => pam_ssh-1.98-var_run.patch | 34 ++++++++++----------
pam_ssh.spec | 11 +++---
sources | 2 +-
5 files changed, 25 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23d18c1..2c2e86c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
pam_ssh-1.97.tar.bz2
+/pam_ssh-1.98.tar.bz2
diff --git a/pam_ssh-1.97-var_run.patch b/pam_ssh-1.98-var_run.patch
similarity index 82%
rename from pam_ssh-1.97-var_run.patch
rename to pam_ssh-1.98-var_run.patch
index 94342a7..a8a4a03 100644
--- a/pam_ssh-1.97-var_run.patch
+++ b/pam_ssh-1.98-var_run.patch
@@ -1,6 +1,6 @@
-diff -Nrbu pam_ssh-1.97/pam_ssh.8 pam_ssh-1.97-OK/pam_ssh.8
---- pam_ssh-1.97/pam_ssh.8 2008-05-12 22:57:12.000000000 +0400
-+++ pam_ssh-1.97-OK/pam_ssh.8 2010-12-13 19:54:24.000000000 +0300
+diff -Nrbu pam_ssh-1.98/pam_ssh.8 pam_ssh-1.98-OK/pam_ssh.8
+--- pam_ssh-1.98/pam_ssh.8 2013-04-29 14:24:46.000000000 +0400
++++ pam_ssh-1.98-OK/pam_ssh.8 2013-06-13 19:49:13.069869407 +0400
@@ -148,6 +148,10 @@
SSH2 RSA keys
.It Pa $HOME/.ssh2/id_dsa_*
@@ -12,10 +12,10 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.8 pam_ssh-1.97-OK/pam_ssh.8
.El
.Sh SEE ALSO
.Xr ssh-agent 1 ,
-diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
---- pam_ssh-1.97/pam_ssh.c 2008-05-12 22:57:12.000000000 +0400
-+++ pam_ssh-1.97-OK/pam_ssh.c 2010-12-13 20:19:36.000000000 +0300
-@@ -114,6 +114,7 @@
+diff -Nrbu pam_ssh-1.98/pam_ssh.c pam_ssh-1.98-OK/pam_ssh.c
+--- pam_ssh-1.98/pam_ssh.c 2013-04-29 14:24:46.000000000 +0400
++++ pam_ssh-1.98-OK/pam_ssh.c 2013-06-13 19:55:04.193100993 +0400
+@@ -116,6 +116,7 @@
#define PAM_OPT_NULLOK_NAME "nullok"
#define SEP_KEYFILES ","
#define SSH_CLIENT_DIR ".ssh"
@@ -23,7 +23,7 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
enum {
#if HAVE_OPENPAM || HAVE_PAM_STRUCT_OPTIONS || !HAVE_PAM_STD_OPTION
-@@ -540,7 +541,6 @@
+@@ -542,7 +543,6 @@
char env_string[BUFSIZ]; /* environment string */
char *env_value; /* envariable value */
int env_write; /* env file descriptor */
@@ -31,7 +31,7 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
char *per_agent; /* to store env */
char *per_session; /* per-session filename */
const struct passwd *pwent; /* user's passwd entry */
-@@ -583,17 +583,16 @@
+@@ -586,17 +586,16 @@
* Technique: Create an environment file containing
* information about the agent. Only one file is created, but
* it may be given many names. One name is given for the
@@ -53,7 +53,7 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
== -1) {
pam_ssh_log(LOG_CRIT, "out of memory");
openpam_restore_cred(pamh);
-@@ -644,7 +643,12 @@
+@@ -647,7 +646,12 @@
}
if (start_agent) {
@@ -61,13 +61,13 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
+ openpam_restore_cred(pamh);
+ if (stat(STATE_DIR, &stat_buf) < 0)
+ mkdir(STATE_DIR, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
-+ env_write = open(per_agent, O_CREAT | O_WRONLY, S_IRUSR | S_IRGRP | S_IROTH);
++ env_write = open(per_agent, O_CREAT | O_WRONLY, S_IRUSR | S_IRGRP | S_IROTH);
+ openpam_borrow_cred(pamh, pwent);
-+ if (env_write < 0) {
++ if (env_write < 0) {
pam_ssh_log(LOG_ERR, "can't write to %s", per_agent);
- free(per_agent);
+ pam_set_data(pamh, "ssh_agent_env_agent", NULL, NULL);
openpam_restore_cred(pamh);
-@@ -880,7 +884,7 @@
+@@ -888,7 +892,7 @@
for (cp = tty_nodir; (cp = strchr(cp, '/')); )
*cp = '_';
@@ -76,7 +76,7 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
tty_nodir) == -1) {
pam_ssh_log(LOG_CRIT, "out of memory");
free(tty_nodir);
-@@ -899,10 +903,10 @@
+@@ -907,10 +911,10 @@
return retval;
}
@@ -88,7 +88,7 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
return PAM_SUCCESS;
}
-@@ -932,8 +936,11 @@
+@@ -940,8 +944,11 @@
}
if (pam_get_data(pamh, "ssh_agent_env_session",
@@ -101,7 +101,7 @@ diff -Nrbu pam_ssh-1.97/pam_ssh.c pam_ssh-1.97-OK/pam_ssh.c
/* Retrieve per-agent filename and check link count. If it's
greater than unity, other sessions are still using this
-@@ -948,7 +955,9 @@
+@@ -956,7 +963,9 @@
openpam_restore_cred(pamh);
return PAM_SUCCESS;
}
diff --git a/pam_ssh.spec b/pam_ssh.spec
index 21a9796..f0e001d 100644
--- a/pam_ssh.spec
+++ b/pam_ssh.spec
@@ -1,7 +1,7 @@
Summary: PAM module for use with SSH keys and ssh-agent
Name: pam_ssh
-Version: 1.97
-Release: 12%{?dist}
+Version: 1.98
+Release: 1%{?dist}
Group: System Environment/Base
License: BSD
URL: http://sourceforge.net/projects/pam-ssh/
@@ -10,8 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel, openssh-clients, openssl-devel, libtool
Requires: openssh-clients
Conflicts: selinux-policy-targeted < 3.0.8-55
-Patch0: pam_ssh-1.97-var_run.patch
-Patch1: pam_ssh-1.97-setgid.patch
+Patch0: pam_ssh-1.98-var_run.patch
%description
@@ -26,7 +25,6 @@ are set in the session phase.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# re-run autoconf utils to libtoolize properly
autoreconf -f -si
@@ -77,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 13 2013 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.98-1
+- Update to 1.98
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.97-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 9bb10b3..64a7631 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef114d67b4951c88a62893437f850784 pam_ssh-1.97.tar.bz2
+edecf7570cf2fe34910db8699dec71d2 pam_ssh-1.98.tar.bz2
More information about the scm-commits
mailing list