From owner-freebsd-ports  Wed Dec  3 06:50:07 1997
Return-Path: <owner-freebsd-ports>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id GAA13127
          for ports-outgoing; Wed, 3 Dec 1997 06:50:07 -0800 (PST)
          (envelope-from owner-freebsd-ports)
Received: (from gnats@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id GAA13118;
          Wed, 3 Dec 1997 06:50:02 -0800 (PST)
          (envelope-from gnats)
Resent-Date: Wed, 3 Dec 1997 06:50:02 -0800 (PST)
Resent-Message-Id: <199712031450.GAA13118@hub.freebsd.org>
Resent-From: gnats (GNATS Management)
Resent-To: freebsd-ports
Resent-Reply-To: FreeBSD-gnats@FreeBSD.ORG, yssu@CCCA.NCTU.edu.tw
Received: from netflow.nctu.edu.tw (NetFlow.NCTU.edu.tw [140.113.85.1])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id GAA12694
          for <FreeBSD-gnats-submit@freebsd.org>; Wed, 3 Dec 1997 06:44:54 -0800 (PST)
          (envelope-from yssu@NetFlow.NCTU.edu.tw)
Received: (from root@localhost)
	by netflow.nctu.edu.tw (8.8.5/8.8.5) id WAA25261;
	Wed, 3 Dec 1997 22:47:19 +0800 (CST)
Message-Id: <199712031447.WAA25261@netflow.nctu.edu.tw>
Date: Wed, 3 Dec 1997 22:47:19 +0800 (CST)
From: yssu@CCCA.NCTU.edu.tw (Yen-Shuo Su.)
Reply-To: yssu@CCCA.NCTU.edu.tw
To: FreeBSD-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: 3.2
Subject: ports/5198: zh-samba-des: sync with samba-des
Sender: owner-freebsd-ports@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk


>Number:         5198
>Category:       ports
>Synopsis:       sync patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec  3 06:50:01 PST 1997
>Last-Modified:
>Originator:     Yen-Shuo Su
>Organization:
Campus Computer Communication Association
>Release:        FreeBSD 2.2-970625-RELENG i386
>Environment:


>Description:

	Sync chinese/zh-samba-des/patches/patch-ab with
	net/samba-des/patches/patch-ab

>How-To-Repeat:


>Fix:
	
The following is the patch:

diff -ruN ../chinese/samba-des/patches/patch-ab samba-des/patches/patch-ab
--- ../chinese/samba-des/patches/patch-ab	Sat Nov 29 13:28:24 1997
+++ samba-des/patches/patch-ab	Wed Dec  3 22:42:31 1997
@@ -1,14 +1,23 @@
---- Makefile.orig	Fri Apr 12 09:18:51 1996
-+++ Makefile	Thu Aug 14 00:49:39 1997
+--- Makefile.orig	Fri Apr 12 02:18:51 1996
++++ Makefile	Tue Dec  2 12:05:41 1997
 @@ -10,7 +10,7 @@
  # If you are on a DEC Alpha, edit des.h and change the DES_LONG
  # define to 'unsigned int'.  I have seen this give a %20 speedup.
  
 -OPTS0= -DRAND -DTERMIO #-DNOCONST
-+OPTS0= -DRAND -DSGTTY #-DNOCONST
++OPTS0= -DTERMIOS -DPERL5 # Don't use crypt() from libdes!
  
  # Version 1.94 has changed the strings_to_key function so that it is
  # now compatible with MITs when the string is longer than 8 characters.
+@@ -39,7 +39,7 @@
+ #CFLAGS= -O $(OPTS) $(CFLAG)
+ 
+ CC=gcc
+-CFLAGS= -O3 -fomit-frame-pointer $(OPTS) $(CFLAG)
++CFLAGS= -O3 $(OPTS) $(CFLAG)
+ 
+ LIBDIR=/usr/local/lib
+ BINDIR=/usr/local/bin
 @@ -72,7 +72,12 @@
  
  DLIB=	libdes.a
@@ -23,6 +32,27 @@
  
  test:	all
  	./destest
+@@ -85,16 +90,16 @@
+ 	else exit 0; fi; fi
+ 
+ destest: destest.o libdes.a
+-	$(CC) $(CFLAGS) -o destest destest.o libdes.a
++	$(CC) $(CFLAGS) -o destest destest.o libdes.a -lcrypt
+ 
+ rpw: rpw.o libdes.a
+-	$(CC) $(CFLAGS) -o rpw rpw.o libdes.a
++	$(CC) $(CFLAGS) -o rpw rpw.o libdes.a -lcrypt
+ 
+ speed: speed.o libdes.a
+-	$(CC) $(CFLAGS) -o speed speed.o libdes.a
++	$(CC) $(CFLAGS) -o speed speed.o libdes.a -lcrypt
+ 
+ des: des.o libdes.a
+-	$(CC) $(CFLAGS) -o des des.o libdes.a
++	$(CC) $(CFLAGS) -o des des.o libdes.a -lcrypt
+ 
+ tags:
+ 	ctags $(DES) $(TESTING) $(LIBDES)
 @@ -152,4 +157,3 @@
  	    cp des.h $(INCDIR)/des.h; \
  	    chmod 644 $(INCDIR)/des.h; \

>Audit-Trail:
>Unformatted: