[Midnightbsd-cvs] mports: security/openssh-portable: update port version to match the
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Sep 18 10:44:15 EDT 2008
Log Message:
-----------
update port version to match the version in 0.2.1
Modified Files:
--------------
mports/security/openssh-portable:
Makefile (r1.7 -> r1.8)
distinfo (r1.5 -> r1.6)
mports/security/openssh-portable/files:
patch-auth2.c (r1.1 -> r1.2)
patch-session.c (r1.1 -> r1.2)
patch-sshd.c (r1.1 -> r1.2)
scardpin.patch (r1.1 -> r1.2)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/openssh-portable/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L security/openssh-portable/Makefile -L security/openssh-portable/Makefile -u -r1.7 -r1.8
--- security/openssh-portable/Makefile
+++ security/openssh-portable/Makefile
@@ -7,13 +7,10 @@
#
PORTNAME= openssh
-DISTVERSION= 4.7p1
-PORTREVISION= 2
+DISTVERSION= 5.0p1
CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%SUBDIR%/ \
- ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/%SUBDIR%/ \
- http://mirror.mcs.anl.gov/openssh/portable/%SUBDIR%/
-MASTER_SITE_SUBDIR= # empty
+MASTER_SITES= ${MASTER_SITE_OPENBSD}
+MASTER_SITE_SUBDIR= OpenSSH/portable
PKGNAMESUFFIX= ${PORTABLE_SUFFIX}${GSSAPI_SUFFIX}${BASE_SUFFIX}
DISTNAME= # empty
@@ -130,10 +127,9 @@
.endif
.if defined(WITH_HPN)
-IGNORE= option HPN is temporary disabled, waiting patch for new openssh release
PATCH_DIST_STRIP= -p1
PATCH_SITES+= http://www.psc.edu/networking/projects/hpn-ssh/
-PATCHFILES+= openssh-4.7p1-hpn12v20.diff.gz
+PATCHFILES+= openssh-5.0p1-hpn13v3.diff.gz
.endif
.if defined(WITH_OVERWRITE_BASE)
@@ -148,6 +144,7 @@
SUB_LIST+= ETCSSH="${ETCSSH}"
PLIST_SUB+= NOTBASE="@comment "
PLIST_SUB+= BASE=""
+PLIST_SUB+= BASEPREFIX="${PREFIX}"
.else
.if exists(/var/empty)
EMPTYDIR= /var/empty
@@ -191,6 +188,10 @@
${WRKSRC}/version.h
@${ECHO_CMD} '#define SSH_RELEASE TMP_SSH_VERSION SSH_PORTABLE FREEBSD_PORT_VERSION' >> \
${WRKSRC}/version.h
+.if defined(WITH_HPN)
+ @${REINPLACE_CMD} -e 's|TMP_SSH_VERSION SSH_PORTABLE|TMP_SSH_VERSION SSH_PORTABLE SSH_HPN|' \
+ ${WRKSRC}/version.h
+.endif
pre-install:
.if defined(WITH_OVERWRITE_BASE)
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/security/openssh-portable/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L security/openssh-portable/distinfo -L security/openssh-portable/distinfo -u -r1.5 -r1.6
--- security/openssh-portable/distinfo
+++ security/openssh-portable/distinfo
@@ -1,12 +1,9 @@
-MD5 (openssh-4.7p1.tar.gz) = 50a800fd2c6def9e9a53068837e87b91
-SHA256 (openssh-4.7p1.tar.gz) = d47133f0c6737d2889bf8da7bdf389fc2268d1c7fa3cd11a52451501eab548bc
-SIZE (openssh-4.7p1.tar.gz) = 991119
-MD5 (openssh-4.7p1-gsskex-20070927.patch) = ad58a9848dcaa3ad5a2ab14182fb9212
-SHA256 (openssh-4.7p1-gsskex-20070927.patch) = 7ef9009baa842c696d356c7e5e5d022797a227531c1662dd998510e45a6dd597
-SIZE (openssh-4.7p1-gsskex-20070927.patch) = 66693
-MD5 (openssh-4.7p1-hpn12v20.diff.gz) = 7a75e87b03e4d713973c5a3330a68ab5
-SHA256 (openssh-4.7p1-hpn12v20.diff.gz) = 4b951b444f3c093ca3dbb1ae6e9825c33610719ee8ca593e660ec8248c5b09c6
-SIZE (openssh-4.7p1-hpn12v20.diff.gz) = 15211
-MD5 (openssh-lpk-4.6p1-0.3.9.patch) = f43a8aae7d69e72f0ec07bc96e46b328
-SHA256 (openssh-lpk-4.6p1-0.3.9.patch) = e12335e8bf020508ea3866db07b306f4c965e3f9de262c06f62fad494e93107e
-SIZE (openssh-lpk-4.6p1-0.3.9.patch) = 61605
+MD5 (openssh-5.0p1.tar.gz) = 1f1dfaa775f33dd3328169de9bdc292a
+SHA256 (openssh-5.0p1.tar.gz) = 73a58620cd475155be8524f46997ba1942bc9e54204eeb15f0465e54ca279f4f
+SIZE (openssh-5.0p1.tar.gz) = 1011556
+MD5 (openssh-5.0p1-gsskex-20080404.patch) = d13bf38e852e38b7f29b9e6993b00b52
+SHA256 (openssh-5.0p1-gsskex-20080404.patch) = 8f8b9910af767ce8e2a5d4854e95c8eb8b089bb250b290d22add38e9ddb1791e
+SIZE (openssh-5.0p1-gsskex-20080404.patch) = 68272
+MD5 (openssh-5.0p1-hpn13v3.diff.gz) = 95e7f78d63b419babd820c0653aa47ef
+SHA256 (openssh-5.0p1-hpn13v3.diff.gz) = e9000f969705dbdf72f7ea069e5f8a2475eb89e88e014c678ecb102ddf4bcde2
+SIZE (openssh-5.0p1-hpn13v3.diff.gz) = 24060
Index: patch-session.c
===================================================================
RCS file: /home/cvs/mports/security/openssh-portable/files/patch-session.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/openssh-portable/files/patch-session.c -L security/openssh-portable/files/patch-session.c -u -r1.1 -r1.2
--- security/openssh-portable/files/patch-session.c
+++ security/openssh-portable/files/patch-session.c
@@ -1,5 +1,5 @@
---- session.c.orig Fri Sep 1 02:38:37 2006
-+++ session.c Sat Sep 30 19:32:06 2006
+--- session.c.orig 2008-03-26 21:03:05.000000000 -0300
++++ session.c 2008-04-07 21:57:52.000000000 -0300
@@ -776,6 +776,24 @@
{
FILE *f;
@@ -25,7 +25,7 @@
if (options.print_motd) {
#ifdef HAVE_LOGIN_CAP
-@@ -1004,6 +1022,9 @@
+@@ -1005,6 +1023,9 @@
struct passwd *pw = s->pw;
#ifndef HAVE_LOGIN_CAP
char *path = NULL;
@@ -35,7 +35,7 @@
#endif
/* Initialize the environment. */
-@@ -1025,6 +1046,9 @@
+@@ -1026,6 +1047,9 @@
}
#endif
@@ -45,7 +45,7 @@
#ifdef GSSAPI
/* Allow any GSSAPI methods that we've used to alter
* the childs environment as they see fit
-@@ -1044,11 +1068,22 @@
+@@ -1045,11 +1069,22 @@
child_set_env(&env, &envsize, "LOGIN", pw->pw_name);
#endif
child_set_env(&env, &envsize, "HOME", pw->pw_dir);
@@ -72,7 +72,7 @@
#else /* HAVE_LOGIN_CAP */
# ifndef HAVE_CYGWIN
/*
-@@ -1069,15 +1104,9 @@
+@@ -1070,15 +1105,9 @@
# endif /* HAVE_CYGWIN */
#endif /* HAVE_LOGIN_CAP */
@@ -88,26 +88,20 @@
/* Set custom environment options from RSA authentication. */
if (!options.use_login) {
-@@ -1287,6 +1316,10 @@
+@@ -1344,6 +1373,9 @@
void
do_setusercontext(struct passwd *pw)
{
+#ifdef CHROOT
-+ char *user_dir;
-+ char *new_root;
++ char *user_dir, *new_root;
+#endif /* CHROOT */
- #ifndef HAVE_CYGWIN
- if (getuid() == 0 || geteuid() == 0)
- #endif /* HAVE_CYGWIN */
-@@ -1314,10 +1347,31 @@
+ char *chroot_path, *tmp;
+
+ #ifdef WITH_SELINUX
+@@ -1369,8 +1401,25 @@
+ do_pam_setcred(use_privsep);
}
# endif /* USE_PAM */
- if (setusercontext(lc, pw, pw->pw_uid,
-- (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) {
-+ (LOGIN_SETALL & ~(LOGIN_SETENV|LOGIN_SETPATH))) < 0) {
- perror("unable to set user context");
- exit(1);
- }
+#ifdef CHROOT
+ user_dir = xstrdup(pw->pw_dir);
+ new_root = user_dir + 1;
@@ -117,23 +111,22 @@
+ if(strncmp(new_root, "/./", 3) == 0) {
+ *new_root = '\0';
+ new_root += 2;
-+
+ if(chroot(user_dir) != 0)
-+ fatal("Couldn't chroot to user directory %s", user_dir);
++ fatal("Couldn't chroot to user directory %s. %s", user_dir, strerror(errno));
+ pw->pw_dir = new_root;
+ break;
+ }
-+
+ new_root += 2;
+ }
+#endif /* CHROOT */
-+ /* Permanently switch to the desired uid. */
-+ permanently_set_uid(pw);
- #else
- # if defined(HAVE_GETLUID) && defined(HAVE_SETLUID)
- /* Sets login uid for accounting */
-@@ -1472,6 +1526,9 @@
- char *argv[10];
+ if (setusercontext(lc, pw, pw->pw_uid,
+- (LOGIN_SETALL & ~(LOGIN_SETPATH|LOGIN_SETUSER))) < 0) {
++ (LOGIN_SETALL & ~(LOGIN_SETPATH|LOGIN_SETUSER|LOGIN_SETENV))) < 0) {
+ perror("unable to set user context");
+ exit(1);
+ }
+@@ -1540,6 +1589,9 @@
+ char *argv[ARGV_MAX];
const char *shell, *shell0, *hostname = NULL;
struct passwd *pw = s->pw;
+#ifdef HAVE_LOGIN_CAP
@@ -142,7 +135,7 @@
/* remove hostkey from the child's memory */
destroy_sensitive_data();
-@@ -1559,6 +1616,10 @@
+@@ -1627,6 +1679,10 @@
*/
environ = env;
@@ -153,7 +146,7 @@
#if defined(KRB5) && defined(USE_AFS)
/*
* At this point, we check to see if AFS is active and if we have
-@@ -1590,7 +1651,7 @@
+@@ -1658,7 +1714,7 @@
fprintf(stderr, "Could not chdir to home directory %s: %s\n",
pw->pw_dir, strerror(errno));
#ifdef HAVE_LOGIN_CAP
Index: patch-auth2.c
===================================================================
RCS file: /home/cvs/mports/security/openssh-portable/files/patch-auth2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/openssh-portable/files/patch-auth2.c -L security/openssh-portable/files/patch-auth2.c -u -r1.1 -r1.2
--- security/openssh-portable/files/patch-auth2.c
+++ security/openssh-portable/files/patch-auth2.c
@@ -1,14 +1,14 @@
---- auth2.c.orig Fri Aug 4 23:39:39 2006
-+++ auth2.c Sat Sep 30 10:38:04 2006
-@@ -44,6 +45,7 @@
+--- auth2.c.orig 2008-04-07 22:16:43.000000000 -0300
++++ auth2.c 2008-04-07 22:20:03.000000000 -0300
+@@ -41,6 +41,7 @@
+ #include "key.h"
+ #include "hostfile.h"
+ #include "auth.h"
++#include "canohost.h"
#include "dispatch.h"
#include "pathnames.h"
#include "buffer.h"
-+#include "canohost.h"
-
- #ifdef GSSAPI
- #include "ssh-gss.h"
-@@ -147,6 +149,13 @@
+@@ -146,6 +147,13 @@
Authmethod *m = NULL;
char *user, *service, *method, *style = NULL;
int authenticated = 0;
@@ -22,7 +22,7 @@
if (authctxt == NULL)
fatal("input_userauth_request: no authctxt");
-@@ -190,6 +199,27 @@
+@@ -194,6 +202,27 @@
"(%s,%s) -> (%s,%s)",
authctxt->user, authctxt->service, user, service);
}
Index: scardpin.patch
===================================================================
RCS file: /home/cvs/mports/security/openssh-portable/files/scardpin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/openssh-portable/files/scardpin.patch -L security/openssh-portable/files/scardpin.patch -u -r1.1 -r1.2
--- security/openssh-portable/files/scardpin.patch
+++ security/openssh-portable/files/scardpin.patch
@@ -1,3 +1,6 @@
+#
+# https://bugzilla.mindrot.org/show_bug.cgi?id=608
+#
Index: scard-opensc.c
===================================================================
RCS file: /cvs/openssh/scard-opensc.c,v
Index: patch-sshd.c
===================================================================
RCS file: /home/cvs/mports/security/openssh-portable/files/patch-sshd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/openssh-portable/files/patch-sshd.c -L security/openssh-portable/files/patch-sshd.c -u -r1.1 -r1.2
--- security/openssh-portable/files/patch-sshd.c
+++ security/openssh-portable/files/patch-sshd.c
@@ -7,7 +7,7 @@
+#ifdef __FreeBSD__
+#include <resolv.h>
+#ifdef GSSAPI
-+#include <gssapi.h>
++#include "ssh-gss.h"
+#endif
+#endif
+
More information about the Midnightbsd-cvs
mailing list