openssh: Update to 6.1p1.

[people/ms/ipfire-3.x.git] / openssh / patches / openssh-6.1p1-askpass-ld.patch

diff --git a/openssh/patches/openssh-5.8p2-askpass-ld.patch b/openssh/patches/openssh-6.1p1-askpass-ld.patch
similarity index 53%
rename from openssh/patches/openssh-5.8p2-askpass-ld.patch
rename to openssh/patches/openssh-6.1p1-askpass-ld.patch
index 5b85c80b3b0c4ea485f587a64e388374ec0f85ad..f7a7facb3bcc1e1b8e46d60eb08c28161328a586 100644 (file)
--- a/openssh/patches/openssh-5.8p2-askpass-ld.patch
+++ b/openssh/patches/openssh-6.1p1-askpass-ld.patch
@@ -1,7 +1,7 @@
-diff -up openssh-5.8p2/contrib/Makefile.askpass-ld openssh-5.8p2/contrib/Makefile
---- openssh-5.8p2/contrib/Makefile.askpass-ld  2011-08-08 22:54:06.050546199 +0200
-+++ openssh-5.8p2/contrib/Makefile     2011-08-08 22:54:43.364420118 +0200
-@@ -2,12 +2,12 @@ all:
+diff -up openssh-6.1p1/contrib/Makefile.askpass-ld openssh-6.1p1/contrib/Makefile
+--- openssh-6.1p1/contrib/Makefile.askpass-ld  2012-05-19 07:24:37.000000000 +0200
++++ openssh-6.1p1/contrib/Makefile     2012-09-14 20:35:47.565704718 +0200
+@@ -4,12 +4,12 @@ all:
        @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
  
  gnome-ssh-askpass1: gnome-ssh-askpass1.c
@@ -11,8 +11,8 @@ diff -up openssh-5.8p2/contrib/Makefile.askpass-ld openssh-5.8p2/contrib/Makefil
                `gnome-config --libs gnome gnomeui`
  
  gnome-ssh-askpass2: gnome-ssh-askpass2.c
--      $(CC) `pkg-config --cflags gtk+-2.0` \
-+      $(CC) ${CFLAGS} `pkg-config --cflags gtk+-2.0` \
+-      $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \
++      $(CC) ${CFLAGS} `$(PKG_CONFIG) --cflags gtk+-2.0` \
                gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
-               `pkg-config --libs gtk+-2.0 x11`
+               `$(PKG_CONFIG) --libs gtk+-2.0 x11`