[38530] trunk/dports/net/openssh/Portfile

[wsiegrist at apple.com]

Revision: 38530
          http://trac.macosforge.org/projects/macports/changeset/38530
Author:   wsiegrist at apple.com
Date:     2008-07-24 09:59:48 -0700 (Thu, 24 Jul 2008)
Log Message:
-----------
Temporarily backing out r38526 and r38528 since they broke more things than they fixed.

Modified Paths:
--------------
    trunk/dports/net/openssh/Portfile

Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile	2008-07-24 16:52:15 UTC (rev 38529)
+++ trunk/dports/net/openssh/Portfile	2008-07-24 16:59:48 UTC (rev 38530)
@@ -4,7 +4,6 @@
 
 name            openssh
 version         5.0p1
-revision	1
 categories      net
 maintainers     wms
 description     OpenSSH secure login server
@@ -21,9 +20,9 @@
 homepage        http://www.openssh.com/
 platforms       darwin
 checksums       ${distfiles} \
-                md5     1f1dfaa775f33dd3328169de9bdc292a \
-                sha1    121cea3a730c0b0353334b6f46f438de30ab4928 \
-                rmd160  b813234014e339fe2d9d10a5adad9f8e065918fc
+		md5 1f1dfaa775f33dd3328169de9bdc292a \
+		sha1 121cea3a730c0b0353334b6f46f438de30ab4928 \
+		rmd160 b813234014e339fe2d9d10a5adad9f8e065918fc
 
 master_sites    openbsd:OpenSSH/portable \
 	http://mirror.mcs.anl.gov/openssh/portable/ \
@@ -35,24 +34,6 @@
 	ftp://openbsd.secsup.org/pub/openbsd/OpenSSH/portable/
 depends_lib     port:openssl port:zlib
 
-patchfiles	pam.patch \
-		sacl.patch \
-		DVG-4122722+5277818_new_EA.patch \
-		DVG-3977221_manpage_tweaks.patch \
-		DVG-4212542_auth_error_logging_fix.patch \
-		DVG-4157448+4920695_corrected_UsePAM_comment.patch \
-		lastlog.patch \
-		openssh-5.0p1-gsskex-20080404.patch \
-		DVG-4853931_enable_GSSAPI.patch \
-		DVG-4648874_preserve_EA_mtime.patch \
-		DVG-4748610+4897588_ssh-agent_via_launchd.patch \
-		DVG-4694589_16_group_limit_fix.patch \
-		DVG-5142987_launchd_DISPLAY_for_X11.patch \
-		DVG-5258734_pty_permission_fix.patch \
-		AJ-5491854-fix_unsafe_usage_of_getpwuid.patch \
-		DVG-4135812_add_SACLSupport_to_sshd_conf_manpage.patch \
-		DVG-5755519_use_GSS_C_NO_NAME_with_gss_acquire_cred.patch
-
 # Specified -fno-builtin because GCC 3.3 has log() as a builtin
 # (from math.h) while OpenSSH has its own log() function
 # -- from fink.
@@ -62,9 +43,8 @@
   --with-pid-dir=${prefix}/var/run --with-tcp-wrappers \
   --with-pam --disable-suid-ssh --with-random=/dev/urandom \
   --mandir=${prefix}/share/man --with-zlib=${prefix} \
-  --with-kerberos5
+  --with-kerberos5=/usr
 
-
 destroot.target install-nokeys
 
 post-destroot {
@@ -101,17 +81,13 @@
   }
 }
 
-set keychain_patch AJ-5229538+5383306+5446006+5567447+5806868_keychain.patch
-
 platform darwin 9 {
-  pre-patch {
-	reinplace "s|/usr/bin/|${prefix}/bin/|g" "${filespath}/${keychain_patch}"
-  }
-  patchfiles-append	        ${keychain_patch}
-  configure.cflags-append	-fPIE -Wl,-pie -D_FORTIFY_SOURCE=2
-  configure.ldflags-append	-L. -Lopenbsd-compat -Wl,-pie
-  configure.cppflags-append	-D_UTMPX_COMPAT -D__APPLE_UTMPX__ -DUSE_CCAPI \
-                                -D__APPLE_LAUNCHD__ -D__APPLE_PRIVPTY__ -D__BROKEN_GLOB__ -Dcannot_audit
+  patch_sites-append   http://www.opensource.apple.com/darwinsource/10.5/OpenSSH-87/patches/
+  patchfiles-append    DVG-5142987_launchd_DISPLAY_for_X11.patch
+  checksums-append     DVG-5142987_launchd_DISPLAY_for_X11.patch \
+                       md5 e188ebbba95c4cde61e0e1b2edc9f992 \
+                       sha1 62735c5bfbbe1fa41433993435ded7767cc5f1f9 \
+                       rmd160 eb5262f554583f4925f6f91f6a6d0034c70098ad
 }
 
 startupitem.create  yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080724/aec1619f/attachment.html