openssh-8.0p1-1

o/openssh/openssh-vl.spec

@@ -1,4 +1,4 @@
-%define ver 7.9p1
+%define ver 8.0p1
 %define rel 1%{_dist_release}
 
 # SELinux
@@ -14,8 +14,8 @@
 # Do we want to disable building of gnome-askpass? (1=yes 0=no)
 %define no_gnome_askpass 0
 
-# Use GTK2 for gnome-ssh-askpass
-%define gtk2 1
+# Use GTK3 for gnome-ssh-askpass
+%define gtk3 1
 
 # Build position-independent executables (requires toolchain support)?
 %define pie 1
@@ -67,7 +67,7 @@ URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 
 Patch0: openssh-7.6p1-vine.patch
-Patch4: openssh-7.9p1-vendor.patch
+#Patch4: openssh-8.0p1-vendor.patch
 # Patch12: openssh-selinux.patch
 # Patch20: openssh-3.9p1-gssapimitm.patch
 Patch21: openssh-7.6p1-safe-stop.patch
@@ -76,7 +76,7 @@ Patch26: openssh-5.2p1-pam-no-stack.patch
 # Patch27: openssh-5.1p1-log-in-chroot.patch
 # Patch30: openssh-5.6p1-exit-deadlock.patch
 # Patch31: openssh-3.9p1-skip-used.patch
-Patch35: openssh-7.4p1-askpass-progress.patch
+Patch35: openssh-8.0p1-askpass-progress-gtk3.patch
 
 # Vine Source
 Source100: sshd.init.vine
@@ -99,7 +99,7 @@ BuildRequires: pam-devel
 BuildRequires: zlib-devel
 %if ! %{no_gnome_askpass}
 BuildRequires: libX11-devel
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
 %endif
 BuildRequires: xorg-x11-xauth
 BuildRequires: groff
@@ -238,7 +238,7 @@ OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で
 
 %setup -q
 %patch0 -p1 -b .vine
-%patch4 -p1 -b .vendor
+#patch4 -p1 -b .vendor
 
 %if %{WITH_SELINUX}
 #SELinux
@@ -299,20 +299,20 @@ perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
 
 make
 
-%if %{gtk2}
-	gtk2=yes
+%if %{gtk3}
+	gtk3=yes
 %else
-        gtk2=no
+        gtk3=no
 %endif
 
 %if ! %{no_gnome_askpass}
 pushd contrib
-if [ $gtk2 = yes ]; then
+if [ $gtk3 = yes ]; then
+	make gnome-ssh-askpass3
+	mv gnome-ssh-askpass3 gnome-ssh-askpass
+else
 	make gnome-ssh-askpass2
 	mv gnome-ssh-askpass2 gnome-ssh-askpass
-else
-	make gnome-ssh-askpass1
-	mv gnome-ssh-askpass1 gnome-ssh-askpass
 fi
 popd
 %endif
@@ -411,8 +411,6 @@ fi
 %files
 %defattr(-,root,root)
 %doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW PROTOCOL* README* TODO
-%attr(0755,root,root) %{_bindir}/scp
-%attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli
 %attr(644,root,root) %{_mandir}/man5/moduli.5*
@@ -430,7 +428,9 @@ fi
 
 %files clients
 %defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/scp
 %attr(0755,root,root) %{_bindir}/ssh
+%attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0644,root,root) %{_mandir}/man1/ssh.1*
 %attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
 # %attr(0644,root,root) %{_mandir}/man1/slogin.1*
@@ -478,6 +478,13 @@ fi
 
 
 %changelog
+* Sat Jun 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0p1-1
+- new upstream release.
+- moved scp to openssh-clients.
+- changed "PasswordAuthentication" to "no" as default.
+- dropped Patch4.
+- update Patch35 to use GTK+3 for gnome-ssh-askpass.
+
 * Tue Nov 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.9p1-1
 - new upstream release.
 - updated Patch4.