diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 18 | ||||
-rw-r--r-- | contrib/redhat/sshd.pam-7.x | 8 |
3 files changed, 33 insertions, 1 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010212 | ||
2 | - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1", | ||
3 | --define "skip_gnome_askpass 1", --define "rh7 1" and make the | ||
4 | implicit rpm-3.0.5 dependancy explicit. Patch and suggestions from | ||
5 | Pekka Savola <pekkas@netcore.fi> | ||
6 | |||
1 | 20010211 | 7 | 20010211 |
2 | - (bal) OpenBSD Sync | 8 | - (bal) OpenBSD Sync |
3 | - markus@cvs.openbsd.org 2001/02/07 22:35:46 | 9 | - markus@cvs.openbsd.org 2001/02/07 22:35:46 |
@@ -3893,4 +3899,4 @@ | |||
3893 | - Wrote replacements for strlcpy and mkdtemp | 3899 | - Wrote replacements for strlcpy and mkdtemp |
3894 | - Released 1.0pre1 | 3900 | - Released 1.0pre1 |
3895 | 3901 | ||
3896 | $Id: ChangeLog,v 1.744 2001/02/11 18:49:23 stevesk Exp $ | 3902 | $Id: ChangeLog,v 1.745 2001/02/11 22:34:17 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 3629db47c..dc0954abb 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -10,6 +10,18 @@ | |||
10 | # Do we want to disable building of gnome-askpass? (1=yes 0=no) | 10 | # Do we want to disable building of gnome-askpass? (1=yes 0=no) |
11 | %define no_gnome_askpass 0 | 11 | %define no_gnome_askpass 0 |
12 | 12 | ||
13 | # Use Redhat 7.0 pam control file | ||
14 | %define redhat7 0 | ||
15 | |||
16 | # Reserve options to override askpass settings with: | ||
17 | # rpm -ba|--rebuild --define 'skip_xxx 1' | ||
18 | %{?skip_x11_askpass:%define no_x11_askpass 1} | ||
19 | %{?skip_gnome_askpass:%define no_gnome_askpass 1} | ||
20 | |||
21 | # Options for Redhat version: | ||
22 | # rpm -ba|--rebuild --define "rh7 1" | ||
23 | %{?rh7:%define redhat7 1} | ||
24 | |||
13 | Summary: OpenSSH free Secure Shell (SSH) implementation | 25 | Summary: OpenSSH free Secure Shell (SSH) implementation |
14 | Name: openssh | 26 | Name: openssh |
15 | Version: %{oversion} | 27 | Version: %{oversion} |
@@ -26,8 +38,10 @@ BuildRoot: /tmp/openssh-%{version}-buildroot | |||
26 | Obsoletes: ssh | 38 | Obsoletes: ssh |
27 | PreReq: openssl >= 0.9.5a | 39 | PreReq: openssl >= 0.9.5a |
28 | Requires: openssl >= 0.9.5a | 40 | Requires: openssl >= 0.9.5a |
41 | Requires: rpm >= 3.0.5 | ||
29 | BuildPreReq: perl, openssl-devel, tcp_wrappers | 42 | BuildPreReq: perl, openssl-devel, tcp_wrappers |
30 | BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h | 43 | BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h |
44 | BuildPreReq: rpm >= 3.0.5 | ||
31 | %if ! %{no_gnome_askpass} | 45 | %if ! %{no_gnome_askpass} |
32 | BuildPreReq: gnome-libs-devel | 46 | BuildPreReq: gnome-libs-devel |
33 | %endif | 47 | %endif |
@@ -175,7 +189,11 @@ rm -rf $RPM_BUILD_ROOT | |||
175 | install -d $RPM_BUILD_ROOT/etc/pam.d/ | 189 | install -d $RPM_BUILD_ROOT/etc/pam.d/ |
176 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d | 190 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d |
177 | install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh | 191 | install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh |
192 | %if %{redhat7} | ||
178 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd | 193 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd |
194 | %else | ||
195 | install -m644 contrib/redhat/sshd.pam-7.x $RPM_BUILD_ROOT/etc/pam.d/sshd | ||
196 | %endif | ||
179 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd | 197 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd |
180 | 198 | ||
181 | %if ! %{no_x11_askpass} | 199 | %if ! %{no_x11_askpass} |
diff --git a/contrib/redhat/sshd.pam-7.x b/contrib/redhat/sshd.pam-7.x new file mode 100644 index 000000000..d2ab073fc --- /dev/null +++ b/contrib/redhat/sshd.pam-7.x | |||
@@ -0,0 +1,8 @@ | |||
1 | #%PAM-1.0 | ||
2 | auth required /lib/security/pam_stack.so service=system-auth | ||
3 | auth required /lib/security/pam_nologin.so | ||
4 | account required /lib/security/pam_stack.so service=system-auth | ||
5 | password required /lib/security/pam_stack.so service=system-auth | ||
6 | session required /lib/security/pam_stack.so service=system-auth | ||
7 | session required /lib/security/pam_limits.so | ||
8 | session optional /lib/security/pam_console.so | ||