Author: qboosh Date: Fri Sep 16 16:36:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- restored selinux support
- added audit support (bcond, default off for now, to be enabled)
---- Files affected:
packages/openssh:
openssh.spec (1.366 -> 1.367)
---- Diffs:
================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.366 packages/openssh/openssh.spec:1.367
--- packages/openssh/openssh.spec:1.366 Sun Sep 11 08:47:53 2011
+++ packages/openssh/openssh.spec Fri Sep 16 18:36:44 2011
@@ -1,6 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
+%bcond_with audit # sshd audit support
%bcond_with gnome # with gnome-askpass (GNOME 1.x) utility
%bcond_without gtk # without GTK+ (2.x)
%bcond_without ldap # with ldap support
@@ -63,7 +64,8 @@
Patch13: %{name}-kuserok.patch
URL: http://www.openssh.com/portable.html
BuildRequires: %{__perl}
-BuildRequires: autoconf
+%{?with_audit:BuildRequires: audit-libs-devel}
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
%{?with_gnome:BuildRequires: gnome-libs-devel}
%{?with_gtk:BuildRequires: gtk+2-devel}
@@ -527,24 +529,27 @@
CPPFLAGS="-DCHROOT"
%configure \
PERL=%{__perl} \
- --with-pam \
- --with-mantype=man \
- --with-md5-passwords \
- --with-ipaddr-display \
- %{?with_libedit:--with-libedit} \
+ --disable-strip \
+ --enable-utmpx \
+ --enable-wtmpx \
--with-4in6 \
- --with-tcp-wrappers \
- %{?with_ldap:--with-ldap} \
+ %{?with_audit:--with-audit=linux} \
+ --with-ipaddr-display \
%{?with_kerberos5:--with-kerberos5=/usr} \
- --with-privsep-path=%{_privsepdir} \
+ %{?with_ldap:--with-ldap} \
+ %{?with_libedit:--with-libedit} \
+ --with-mantype=man \
+ --with-md5-passwords \
+ --with-pam \
--with-pid-dir=%{_localstatedir}/run \
+ --with-privsep-path=%{_privsepdir} \
+ %{?with_selinux:--with-selinux} \
+ --with-tcp-wrappers \
%if "%{pld_release}" == "ac"
- --with-xauth=/usr/X11R6/bin/xauth \
+ --with-xauth=/usr/X11R6/bin/xauth
%else
- --with-xauth=%{_bindir}/xauth \
+ --with-xauth=%{_bindir}/xauth
%endif
- --enable-utmpx \
- --enable-wtmpx
echo '#define LOGIN_PROGRAM "/bin/login"' >>config.h
@@ -599,7 +604,7 @@
install -p contrib/ssh-copy-id $RPM_BUILD_ROOT%{_bindir}
cp -p contrib/ssh-copy-id.1 $RPM_BUILD_ROOT%{_mandir}/man1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
echo ".so ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd
@@ -608,8 +613,7 @@
#SSH_ASKPASS="%{_libexecdir}/ssh-askpass"
EOF
-rm -f $RPM_BUILD_ROOT%{_datadir}/Ssh.bin # ???
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.openssh-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.openssh-non-english-man-pages
%clean
rm -rf $RPM_BUILD_ROOT
@@ -762,6 +766,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.367 2011/09/16 16:36:44 qboosh
+- restored selinux support
+- added audit support (bcond, default off for now, to be enabled)
+
Revision 1.366 2011/09/11 06:47:53 arekm
- rel 1; replace lpk patch with maintained fedora ldap patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.366&r2=1.367&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
