- (djm) Update Redhat specfile to allow --define "skip_x11_askpass
--define "skip_gnome_askpass 1", --define "rh7 1" and make the
implicit rpm-3.0.5 dependancy explicit. Patch and suggestions fro
Pekka Savola <pekkas@netcore.fi>
diff --git a/ChangeLog b/ChangeLog
index 34a7ef0..4e9c4f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010212
+ - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1",
+ --define "skip_gnome_askpass 1", --define "rh7 1" and make the
+ implicit rpm-3.0.5 dependancy explicit. Patch and suggestions from
+ Pekka Savola <pekkas@netcore.fi>
+
20010211
- (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/02/07 22:35:46
@@ -3893,4 +3899,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.744 2001/02/11 18:49:23 stevesk Exp $
+$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 3629db4..dc0954a 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -10,6 +10,18 @@
# Do we want to disable building of gnome-askpass? (1=yes 0=no)
%define no_gnome_askpass 0
+# Use Redhat 7.0 pam control file
+%define redhat7 0
+
+# Reserve options to override askpass settings with:
+# rpm -ba|--rebuild --define 'skip_xxx 1'
+%{?skip_x11_askpass:%define no_x11_askpass 1}
+%{?skip_gnome_askpass:%define no_gnome_askpass 1}
+
+# Options for Redhat version:
+# rpm -ba|--rebuild --define "rh7 1"
+%{?rh7:%define redhat7 1}
+
Summary: OpenSSH free Secure Shell (SSH) implementation
Name: openssh
Version: %{oversion}
@@ -26,8 +38,10 @@
Obsoletes: ssh
PreReq: openssl >= 0.9.5a
Requires: openssl >= 0.9.5a
+Requires: rpm >= 3.0.5
BuildPreReq: perl, openssl-devel, tcp_wrappers
BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h
+BuildPreReq: rpm >= 3.0.5
%if ! %{no_gnome_askpass}
BuildPreReq: gnome-libs-devel
%endif
@@ -175,7 +189,11 @@
install -d $RPM_BUILD_ROOT/etc/pam.d/
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh
+%if %{redhat7}
install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
+%else
+install -m644 contrib/redhat/sshd.pam-7.x $RPM_BUILD_ROOT/etc/pam.d/sshd
+%endif
install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
%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 0000000..d2ab073
--- /dev/null
+++ b/contrib/redhat/sshd.pam-7.x
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth required /lib/security/pam_stack.so service=system-auth
+auth required /lib/security/pam_nologin.so
+account required /lib/security/pam_stack.so service=system-auth
+password required /lib/security/pam_stack.so service=system-auth
+session required /lib/security/pam_stack.so service=system-auth
+session required /lib/security/pam_limits.so
+session optional /lib/security/pam_console.so