npth: New package

[people/amarx/ipfire-3.x.git] / openssh / openssh.nm

diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index 10d43f474a4b92db586716a4571f71e3b57ad50d..59491fdebefac1c75e7e98c0d41716f09f89e1b5 100644 (file)
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = openssh
-version    = 6.1p1
+version    = 6.8p1
 release    = 1
 
 groups     = Application/Internet
@@ -37,38 +37,6 @@ build
                zlib-devel
        end
 
-       # Apply patches in a special order
-       patches
-               openssh-6.1p1-coverity.patch
-               openssh-5.8p1-fingerprint.patch
-               openssh-5.8p1-getaddrinfo.patch
-               openssh-5.8p1-packet.patch
-               openssh-6.1p1-authenticationmethods.patch
-               openssh-6.1p1-role-mls.patch
-               openssh-5.9p1-sftp-chroot.patch
-               openssh-6.1p1-akc.patch
-               openssh-5.2p1-allow-ip-opts.patch
-               openssh-5.9p1-randclean.patch
-               openssh-5.8p1-keyperm.patch
-               openssh-5.8p2-remove-stale-control-socket.patch
-               openssh-5.9p1-ipv6man.patch
-               openssh-5.8p2-sigpipe.patch
-               openssh-6.1p1-askpass-ld.patch
-               openssh-5.5p1-x11.patch
-               openssh-5.6p1-exit-deadlock.patch
-               openssh-5.1p1-askpass-progress.patch
-               openssh-4.3p2-askpass-grab-info.patch
-               openssh-5.9p1-edns.patch
-               openssh-5.1p1-scp-manpage.patch
-               openssh-5.8p1-localdomain.patch
-               openssh-5.9p1-ipfire.patch
-               openssh-6.0p1-entropy.patch
-               openssh-6.1p1-vendor.patch
-               openssh-5.8p2-force_krb.patch
-               openssh-6.1p1-kuserok.patch
-               openssh-6.1p1-required-authentications.patch
-       end
-
        configure_options += \
                --sysconfdir=%{sysconfdir}/ssh \
                --datadir=%{datadir}/sshd \
@@ -94,6 +62,13 @@ build
                # Disable GSS API authentication because KRB5 is required for that.
                sed -e "s/^.*GSSAPIAuthentication/#&/" -i %{BUILDROOT}/etc/ssh/ssh_config
 
+               # Enable PAM usage, disable ChallengeResponseAuthentication and disable Motd.
+               sed \
+                       -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
+                       -e '/^#PrintMotd yes$/c PrintMotd no' \
+                       -e '/^#UsePAM no$/c UsePAM yes' \
+                       -i %{BUILDROOT}/etc/ssh/sshd_config
+
                # Install scriptfile for key generation
                mkdir -pv %{BUILDROOT}%{sbindir}
                install -m 754 %{DIR_SOURCE}/sshd-keygen %{BUILDROOT}%{sbindir}