tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Built-in OpenSSL and pkgsrc bootstrap?



At 21:59 Uhr +0100 16.2.2009, Joerg Sonnenberger wrote:
>On Mon, Feb 16, 2009 at 09:27:09PM +0100, Hauke Fath wrote:
>> pkcs7.o: Undefined symbol `_OPENSSL_cleanse' referenced from text segment
>> collect2: ld returned 1 exit status
>
>Try the committed version.

A late "thanks, works nicely".

I made a few more changes on the way [attached] -- net/libfetch needs to
have a few #includes re-ordered, since earlier NetBSD headers don't include
required header files.

        hauke

Attachment: %libfetch.diff
Description: application/applefile

Index: common.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/libfetch/files/common.c,v
retrieving revision 1.17
diff -u -p -u -r1.17 common.c
--- common.c    5 Feb 2009 16:59:45 -0000       1.17
+++ common.c    17 Feb 2009 12:19:06 -0000
@@ -42,8 +42,8 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <ctype.h>
 #include <errno.h>
Index: ftp.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/libfetch/files/ftp.c,v
retrieving revision 1.26
diff -u -p -u -r1.26 ftp.c
--- ftp.c       5 Feb 2009 16:59:45 -0000       1.26
+++ ftp.c       17 Feb 2009 12:19:08 -0000
@@ -72,8 +72,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <ctype.h>
 #include <errno.h>
Index: http.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/libfetch/files/http.c,v
retrieving revision 1.21
diff -u -p -u -r1.21 http.c
--- http.c      5 Feb 2009 16:59:45 -0000       1.21
+++ http.c      17 Feb 2009 12:19:10 -0000
@@ -83,10 +83,10 @@
 #include <locale.h>
 #include <stdarg.h>
 #ifndef NETBSD
-#include <nbcompat/netdb.h>
+/* #include <nbcompat/netdb.h> */
 #include <nbcompat/stdio.h>
 #else
-#include <netdb.h>
+/* #include <netdb.h> */
 #include <stdio.h>
 #endif
 #include <stdlib.h>
@@ -94,11 +94,17 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
-
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
+#ifndef NETBSD
+#include <nbcompat/netdb.h>
+#else
+#include <netdb.h>
+#endif
+
+#include <arpa/inet.h>
+
 #include "fetch.h"
 #include "common.h"
 #include "httperr.h"
--
"It's never straight up and down"     (DEVO)


Home | Main Index | Thread Index | Old Index