Re: Correct DPADD for iked' Makefile

2012-09-05 Thread Brad Smith 
On Sun, Sep 02, 2012 at 12:02:23PM +0200, Marc Espie wrote:
 On Sun, Sep 02, 2012 at 01:08:58AM -0400, Brad Smith wrote:
  Whateve code that used to be within iked that used SSL was removed
  but DPADD was not updated so its still looking for an unused libssl.
  
  
  Index: Makefile
  ===
  RCS file: /home/cvs/src/sbin/iked/Makefile,v
  retrieving revision 1.6
  diff -u -p -r1.6 Makefile
  --- Makefile22 Dec 2010 17:43:10 -  1.6
  +++ Makefile28 Jul 2012 06:34:43 -
  @@ -11,7 +11,7 @@ MAN=  iked.conf.5 iked.8
   #NOMAN=yes
   
   LDADD= -lutil -levent -lcrypto
  -DPADD= ${LIBUTIL} ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
  +DPADD= ${LIBUTIL} ${LIBEVENT} ${LIBCRYPTO}
   CFLAGS+=   -Wall -I${.CURDIR}
   CFLAGS+=   -Wstrict-prototypes -Wmissing-prototypes
   CFLAGS+=   -Wmissing-declarations
 
 Well, I have a LIBRARIES patch that would make this easier to keep in
 synch eventually...
 
 whenever people are not so busy with -pie and basically thinking I'm
 wasting time with useless stuff...
 
 
 Basically, add this to bsd.prog.mk
 
 .if defined(LIBRARIES)  !empty(LIBRARIES)
 .  for l in ${LIBRARIES}
 LDADD += -l$l
 DPADD += ${LIB${l:U}}
 .  endfor
 .endif
 
 then replace the above with:
 LIBRARIES = util event crypto
 
 and have LDADD and DPADD magically stay in synch !
 
 naming subject to discussion...

The idea makes sense and it has been shown that it is too easy for the contents
of the two variables to get out of sync.

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: Correct DPADD for iked' Makefile

2012-09-02 Thread Marc Espie 
On Sun, Sep 02, 2012 at 01:08:58AM -0400, Brad Smith wrote:
 Whateve code that used to be within iked that used SSL was removed
 but DPADD was not updated so its still looking for an unused libssl.
 
 
 Index: Makefile
 ===
 RCS file: /home/cvs/src/sbin/iked/Makefile,v
 retrieving revision 1.6
 diff -u -p -r1.6 Makefile
 --- Makefile  22 Dec 2010 17:43:10 -  1.6
 +++ Makefile  28 Jul 2012 06:34:43 -
 @@ -11,7 +11,7 @@ MAN=iked.conf.5 iked.8
  #NOMAN=  yes
  
  LDADD=   -lutil -levent -lcrypto
 -DPADD=   ${LIBUTIL} ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
 +DPADD=   ${LIBUTIL} ${LIBEVENT} ${LIBCRYPTO}
  CFLAGS+= -Wall -I${.CURDIR}
  CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
  CFLAGS+= -Wmissing-declarations

Well, I have a LIBRARIES patch that would make this easier to keep in
synch eventually...

whenever people are not so busy with -pie and basically thinking I'm
wasting time with useless stuff...


Basically, add this to bsd.prog.mk

.if defined(LIBRARIES)  !empty(LIBRARIES)
.  for l in ${LIBRARIES}
LDADD += -l$l
DPADD += ${LIB${l:U}}
.  endfor
.endif

then replace the above with:
LIBRARIES = util event crypto

and have LDADD and DPADD magically stay in synch !

naming subject to discussion...

Correct DPADD for iked' Makefile

2012-09-01 Thread Brad Smith 
Whateve code that used to be within iked that used SSL was removed
but DPADD was not updated so its still looking for an unused libssl.


Index: Makefile
===
RCS file: /home/cvs/src/sbin/iked/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile22 Dec 2010 17:43:10 -  1.6
+++ Makefile28 Jul 2012 06:34:43 -
@@ -11,7 +11,7 @@ MAN=  iked.conf.5 iked.8
 #NOMAN=yes
 
 LDADD= -lutil -levent -lcrypto
-DPADD= ${LIBUTIL} ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
+DPADD= ${LIBUTIL} ${LIBEVENT} ${LIBCRYPTO}
 CFLAGS+=   -Wall -I${.CURDIR}
 CFLAGS+=   -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+=   -Wmissing-declarations

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.