cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need to link libdes for kerberos

Browse Source 
ok ajacoutot@
This commit is contained in:
jsg 2010-10-23 19:39:46 +00:00
parent 018187e552
commit d35d956338
5 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/alpine/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2010/10/18 19:59:15 espie Exp $ # $OpenBSD: Makefile,v 1.14 2010/10/23 19:41:47 jsg Exp $
COMMENT-main= UW e-mail client COMMENT-main= UW e-mail client
COMMENT-pico= UW text editor COMMENT-pico= UW text editor
@ -18,7 +18,7 @@ PKGNAME-main= alpine-${V}
PKGNAME-pico= pico-${PICO_V} PKGNAME-pico= pico-${PICO_V}
PKGNAME-pilot= pilot-${PILOT_V} PKGNAME-pilot= pilot-${PILOT_V}
REVISION-main= 1 REVISION-main= 2
REVISION-pico= 1 REVISION-pico= 1
REVISION-pilot= 3 REVISION-pilot= 3
@ -35,7 +35,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/
WANTLIB= c ncurses pthread WANTLIB= c ncurses pthread
WANTLIB-main= ${WANTLIB} asn1 com_err crypto des gssapi kafs krb5 ssl WANTLIB-main= ${WANTLIB} asn1 com_err crypto gssapi kafs krb5 ssl
MULTI_PACKAGES= -main -pico -pilot MULTI_PACKAGES= -main -pico -pilot

6
mail/alpine/patches/patch-alpine_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-alpine_Makefile_in,v 1.4 2008/10/15 14:31:04 ajacoutot Exp $ $OpenBSD: patch-alpine_Makefile_in,v 1.5 2010/10/23 19:41:47 jsg Exp $
--- alpine/Makefile.in.orig Tue Jun 3 17:54:15 2008 --- alpine/Makefile.in.orig Tue Jun 3 17:54:15 2008
+++ alpine/Makefile.in Sat Oct 11 18:58:57 2008 +++ alpine/Makefile.in Sat Oct 16 13:55:29 2010
@@ -84,14 +84,14 @@ rpdump_LDADD = $(LDADD) @@ -84,14 +84,14 @@ rpdump_LDADD = $(LDADD)
rpdump_DEPENDENCIES = ../pico/libpico.a ../pico/osdep/libpicoosd.a \ rpdump_DEPENDENCIES = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
../pith/libpith.a ../pith/osdep/libpithosd.a \ ../pith/libpith.a ../pith/osdep/libpithosd.a \
@ -23,7 +23,7 @@ $OpenBSD: patch-alpine_Makefile_in,v 1.4 2008/10/15 14:31:04 ajacoutot Exp $
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@ AM_CFLAGS = @AM_CFLAGS@
-AM_LDFLAGS = `cat $(top_srcdir)/c-client/LDFLAGS` -AM_LDFLAGS = `cat $(top_srcdir)/c-client/LDFLAGS`
+AM_LDFLAGS = -L/usr/lib -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -ldes -lssl -lcrypto +AM_LDFLAGS = -L/usr/lib -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -lssl -lcrypto
AR = @AR@ AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@

14
mail/imap-uw/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2010/10/18 21:50:39 sthen Exp $ # $OpenBSD: Makefile,v 1.65 2010/10/23 19:39:46 jsg Exp $
COMMENT-server= University of Washington IMAP4rev1/POP2/POP3 mail servers COMMENT-server= University of Washington IMAP4rev1/POP2/POP3 mail servers
COMMENT-mailutil=University of Washington IMAP4rev1/POP2/POP3 mail utility COMMENT-mailutil=University of Washington IMAP4rev1/POP2/POP3 mail utility
@ -7,9 +7,13 @@ COMMENT-c-client=University of Washington's c-client mail access routines
V= 2007e V= 2007e
DISTNAME= imap-${V} DISTNAME= imap-${V}
PKGNAME-server= imap-uw-${V}p0 PKGNAME-server= imap-uw-${V}
PKGNAME-mailutil=mailutil-uw-${V}p0 PKGNAME-mailutil=mailutil-uw-${V}
PKGNAME-c-client=c-client-${V}p0 PKGNAME-c-client=c-client-${V}
REVISION-server= 1
REVISION-mailutil= 1
REVISION-c-client= 1
#WRKDIST= ${WRKDIR}/imap-2007b #WRKDIST= ${WRKDIR}/imap-2007b
@ -35,7 +39,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= asn1 c com_err crypto des gssapi kafs krb5 ssl WANTLIB= asn1 c com_err crypto gssapi kafs krb5 ssl
WANTLIB-c-client= WANTLIB-c-client=
ALL_TARGET= bso ALL_TARGET= bso

15
mail/imap-uw/patches/patch-src_osdep_unix_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.9 2008/01/03 10:52:25 ajacoutot Exp $ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.10 2010/10/23 19:39:46 jsg Exp $
--- src/osdep/unix/Makefile.orig Mon Dec 17 23:10:24 2007 --- src/osdep/unix/Makefile.orig Wed Jun 4 20:18:34 2008
+++ src/osdep/unix/Makefile Thu Jan 3 10:58:07 2008 +++ src/osdep/unix/Makefile Sat Oct 16 14:17:08 2010
@@ -42,7 +42,7 @@ IP=4 @@ -42,7 +42,7 @@ IP=4
# -O3 seems to be safe, but empirical observation from our local expert # -O3 seems to be safe, but empirical observation from our local expert
# indicates that in some (many?) cases -O3 code runs slower than -O2. # indicates that in some (many?) cases -O3 code runs slower than -O2.
@ -24,6 +24,15 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.9 2008/01/03 10:52:25 ajacoutot Exp
SSLINCLUDE=$(SSLDIR)/include SSLINCLUDE=$(SSLDIR)/include
SSLLIB=$(SSLDIR)/lib SSLLIB=$(SSLDIR)/lib
@@ -82,7 +82,7 @@ AFSDIR=/usr/afsws
AFSCFLAGS=-I$(AFSDIR)/include
AFSLIB=$(AFSDIR)/lib
AFSLDFLAGS=-L$(AFSLIB)/afs -L$(AFSLIB) -L$(AFSDIR)/domestic/lib\
- -lkauth -lprot -lubik -lauth -lrxkad -lrx -llwp -ldes -lcom_err\
+ -lkauth -lprot -lubik -lauth -lrxkad -lrx -llwp -lcom_err\
$(AFSLIB)/afs/util.a -laudit -lsys
# AFSLDFLAGS may also need -L/usr/ucblib -lucb
DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
@@ -147,6 +147,8 @@ DEFAULTAUTHENTICATORS=ext md5 pla log @@ -147,6 +147,8 @@ DEFAULTAUTHENTICATORS=ext md5 pla log
DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile
CHUNKSIZE=65536 CHUNKSIZE=65536

8
mail/imap-uw/patches/patch-src_osdep_unix_Makefile.gss
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.7 2007/10/30 10:12:41 ajacoutot Exp $ $OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.8 2010/10/23 19:39:46 jsg Exp $
--- src/osdep/unix/Makefile.gss.orig Thu Oct 25 00:11:46 2007 --- src/osdep/unix/Makefile.gss.orig Wed Jun 4 20:18:34 2008
+++ src/osdep/unix/Makefile.gss Thu Oct 25 00:12:46 2007 +++ src/osdep/unix/Makefile.gss Sat Oct 16 14:17:18 2010
@@ -29,11 +29,12 @@ @@ -29,11 +29,12 @@
GSSDIR=/usr/local GSSDIR=/usr/local
GSSINCLUDE=$(GSSDIR)/include GSSINCLUDE=$(GSSDIR)/include
GSSLIB=$(GSSDIR)/lib GSSLIB=$(GSSDIR)/lib
-GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1 -GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1
+GSSCFLAGS= -I$(GSSINCLUDE) -DHEIMDAL +GSSCFLAGS= -I$(GSSINCLUDE) -DHEIMDAL
+GSSLDFLAGS= -L$(GSSLIB) -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -ldes -lcrypto +GSSLDFLAGS= -L$(GSSLIB) -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -lcrypto
GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err