upgrade to Curl 7.5

This commit is contained in:
brad 2000-12-05 20:11:28 +00:00
parent 2dba10be76
commit 79616c4d9e
8 changed files with 62 additions and 55 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2000/09/28 17:47:04 brad Exp $
# $OpenBSD: Makefile,v 1.18 2000/12/05 20:11:28 brad Exp $
DISTNAME= curl-7.3
DISTNAME= curl-7.5
CATEGORIES= net
NEED_VERSION= 1.330
NEED_VERSION= 1.336
MASTER_SITES= http://curl.haxx.se/download/ \
ftp://ftp.rhrz.uni-bonn.de/pub-koeln/net/inet/ \
ftp://ftp.win.or.jp/pub/network/www/misc/ \

View File

@ -1,3 +1,3 @@
MD5 (curl-7.3.tar.gz) = 9e8aaaae60012f2617aba3bcf3fe0e80
RMD160 (curl-7.3.tar.gz) = 8bdca3b0ef3a90c5fb6ca9ed66294753f51f9825
SHA1 (curl-7.3.tar.gz) = 1d91d604591aa1d8bc0eb6f35cecf1cd2407a0fc
MD5 (curl-7.5.tar.gz) = 562a9537fa1877b6e8dbe4022be0dee4
RMD160 (curl-7.5.tar.gz) = c68c3082f43f91c95f858ba73dae598c2b94bac9
SHA1 (curl-7.5.tar.gz) = 6f24305a6a7b45efd8c5be9b30cf4a3d847193dd

View File

@ -1,10 +0,0 @@
--- lib/hostip.c.orig Thu Sep 28 12:41:36 2000
+++ lib/hostip.c Thu Sep 28 12:41:43 2000
@@ -41,7 +41,6 @@
#include "setup.h"
#include <string.h>
-#include <malloc.h>
#include <errno.h>
#define _REENTRANT

View File

@ -1,11 +0,0 @@
--- lib/krb4.c.orig Thu Sep 28 12:52:39 2000
+++ lib/krb4.c Thu Sep 28 12:52:52 2000
@@ -40,7 +40,7 @@
#ifdef KRB4
#include "security.h"
-#include "base64_krb.h"
+#include "base64.h"
#include <stdlib.h>
#include <netdb.h>
#include <syslog.h>

View File

@ -1,11 +0,0 @@
--- lib/security.c.orig Thu Sep 28 12:46:50 2000
+++ lib/security.c Thu Sep 28 12:47:18 2000
@@ -46,7 +46,7 @@
#include <stdlib.h>
#include <string.h>
#include <netdb.h>
-#include "base64_krb.h"
+#include "base64.h"
#define min(a, b) ((a) < (b) ? (a) : (b))

View File

@ -1,6 +1,44 @@
--- ltconfig.orig Wed Sep 6 16:21:08 2000
+++ ltconfig Wed Sep 6 16:21:32 2000
@@ -2028,6 +2028,7 @@
--- ltconfig.orig Sat May 27 07:15:00 2000
+++ ltconfig Sat Oct 21 13:46:37 2000
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,18 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
;;
os2*)
@@ -2021,13 +2032,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

View File

@ -1,15 +1,16 @@
--- ltmain.sh.orig Wed Sep 6 16:20:23 2000
+++ ltmain.sh Wed Sep 6 16:20:37 2000
@@ -2623,7 +2623,7 @@
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
@@ -3567,40 +3567,6 @@
--- ltmain.sh.orig Sat Oct 21 13:54:20 2000
+++ ltmain.sh Sat Oct 21 13:54:11 2000
@@ -1799,6 +1799,9 @@
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3570,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/06 20:50:15 brad Exp $
lib/libcurl.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/12/05 20:11:29 brad Exp $
lib/libcurl.so.1.0
DYNLIBDIR(%B)