Attachment 296421 Details for Bug 435521 – spec file patch

[patch] spec file patch

openssh-add-ck-support.patch (text/plain), 2.09 KB, created by David Zeuthen on 2008-02-29 21:26:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Zeuthen

Created: 2008-02-29 21:26:06 UTC

Size: 2.09 KB

patch

obsolete

>Index: openssh.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
>retrieving revision 1.124
>diff -u -r1.124 openssh.spec
>--- openssh.spec	29 Feb 2008 16:11:23 -0000	1.124
>+++ openssh.spec	29 Feb 2008 21:17:43 -0000
>@@ -32,6 +32,9 @@
> # Whether or not /sbin/nologin exists.
> %define nologin 1
> 
>+# Whether or not to use ConsoleKit
>+%define consolekit 1
>+
> # Reserve options to override askpass settings with:
> # rpm -ba|--rebuild --define 'skip_xxx 1'
> %{?skip_gnome_askpass:%define no_gnome_askpass 1}
>@@ -63,7 +66,7 @@
> Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
> Name: openssh
> Version: 4.7p1
>-Release: 9%{?dist}%{?rescue_rel}
>+Release: 9.1.davidz%{?dist}%{?rescue_rel}
> URL: http://www.openssh.com/portable.html
> #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
> #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
>@@ -100,6 +103,7 @@
> Patch55: openssh-4.7p1-cloexec.patch
> Patch56: openssh-4.7p1-sshd-v6only.patch
> Patch57: openssh-4.7p1-sftp-doclose.patch
>+Patch80: openssh-4.7p1-consolekit.patch
> 
> License: BSD
> Group: Applications/Internet
>@@ -140,6 +144,10 @@
> BuildRequires: nss-devel
> %endif
> 
>+%if %{consolekit}
>+BuildRequires: ConsoleKit-devel
>+%endif
>+
> %if %{WITH_SELINUX}
> Requires: libselinux >= 1.27.7
> BuildRequires: libselinux-devel >= 1.27.7
>@@ -240,6 +248,10 @@
> %patch56 -p0 -b .sshd-v6only
> %patch57 -p3 -b .doclose
> 
>+%if %{consolekit}
>+%patch80 -p0 -b .consolekit
>+%endif
>+
> autoreconf
> 
> %build
>@@ -282,6 +294,9 @@
> 	--enable-vendor-patchlevel="FC-%{version}-%{release}" \
> 	--disable-strip \
> 	--without-zlib-version-check \
>+%if %{consolekit}
>+        --with-consolekit \
>+%endif
> %if %{nss}
> 	--with-nss \
> %endif
>@@ -489,6 +504,9 @@
> %endif
> 
> %changelog
>+* Fri Feb 29 2008 David Zeuthen <davidz@redhat.com> - 4.7p1-9.1.davidz
>+- Add ConsoleKit support (from Colin Watson)
>+
> * Fri Feb 29 2008 Tomas Mraz <tmraz@redhat.com> - 4.7p1-9
> - set FD_CLOEXEC on client socket
> - apply real fix for window size problem (#286181) from upstream

Actions: View | Diff

Attachments on bug 435521: 296420 | 296421