rpms/openssh/devel openssh-4.5p1-nss-keys.patch, 1.1, 1.2 openssh.spec, 1.109, 1.110
Tomas Mraz (tmraz)
fedora-extras-commits at redhat.com
Wed Jun 20 19:11:55 UTC 2007
- Previous message: rpms/pybluez/F-7 .cvsignore, 1.2, 1.3 pybluez.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/pybluez/FC-6 .cvsignore, 1.2, 1.3 pybluez.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tmraz
Update of /cvs/extras/rpms/openssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3870
Modified Files:
openssh-4.5p1-nss-keys.patch openssh.spec
Log Message:
- add buildrequires nss-devel to build with the nss-keys patch
openssh-4.5p1-nss-keys.patch:
Index: openssh-4.5p1-nss-keys.patch
===================================================================
RCS file: /cvs/extras/rpms/openssh/devel/openssh-4.5p1-nss-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-4.5p1-nss-keys.patch 20 Jun 2007 17:47:18 -0000 1.1
+++ openssh-4.5p1-nss-keys.patch 20 Jun 2007 19:11:49 -0000 1.2
@@ -88,7 +88,7 @@
+ AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.])
+ LIBNSS_MSG="yes"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4"
-+ AC_CHECK_HEADERS(nss.h)
++ AC_CHECK_HEADERS(pk11pub.h)
+ LIBNSS="-lnss3"
+ fi
+ ])
@@ -1127,7 +1127,7 @@
extern char *__progname;
-@@ -1227,9 +1230,12 @@ load_public_identity_files(void)
+@@ -1227,9 +1230,11 @@ load_public_identity_files(void)
int i = 0;
Key *public;
struct passwd *pw;
@@ -1136,12 +1136,11 @@
Key **keys;
+#endif
-+ debug("loaded %d keys", options.num_identity_files);
+#ifdef SMARTCARD
if (options.smartcard_device != NULL &&
options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
(keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
-@@ -1250,6 +1256,27 @@ load_public_identity_files(void)
+@@ -1250,6 +1255,27 @@ load_public_identity_files(void)
xfree(keys);
}
#endif /* SMARTCARD */
@@ -1169,14 +1168,6 @@
if ((pw = getpwuid(original_real_uid)) == NULL)
fatal("load_public_identity_files: getpwuid failed");
if (gethostname(thishost, sizeof(thishost)) == -1)
-@@ -1269,6 +1296,7 @@ load_public_identity_files(void)
- options.identity_files[i] = filename;
- options.identity_keys[i] = public;
- }
-+ debug("loaded %d keys", options.num_identity_files);
- }
-
- static void
diff -urpN openssh-4.5p1/ssh-dss.c openssh-4.5p1.nss/ssh-dss.c
--- openssh-4.5p1/ssh-dss.c 2006-11-07 13:14:42.000000000 +0100
+++ openssh-4.5p1.nss/ssh-dss.c 2007-05-25 15:45:19.000000000 +0200
Index: openssh.spec
===================================================================
RCS file: /cvs/extras/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- openssh.spec 20 Jun 2007 17:47:18 -0000 1.109
+++ openssh.spec 20 Jun 2007 19:11:49 -0000 1.110
@@ -125,6 +125,10 @@
BuildRequires: krb5-devel
%endif
+%if %{nss}
+BuildRequires: nss-devel
+%endif
+
%if %{WITH_SELINUX}
Requires: libselinux >= 1.27.7
BuildRequires: libselinux-devel >= 1.27.7
- Previous message: rpms/pybluez/F-7 .cvsignore, 1.2, 1.3 pybluez.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/pybluez/FC-6 .cvsignore, 1.2, 1.3 pybluez.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list