Attached is a diff to add all the changes from SFW b149 to 148, minus
the new version of cURL.
Sevan
diff -r 6135d8b0a676 usr/src/cmd/ImageMagick/Makefile.sfw
--- a/usr/src/cmd/ImageMagick/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/ImageMagick/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -21,7 +21,7 @@
#
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.17 10/07/21 SMI"
+#ident "@(#)Makefile.sfw 1.18 10/09/03 SMI"
VER=ImageMagick-6.3.4
VER64=$(VER)-64
@@ -145,19 +145,22 @@
#
# Patches:
# 1. la.patch - So it uses .so files instead of .la files
+# 2. png.patch - to cope with the latest libpng
#
$(VER)/configure: $(VER)$(VERS).tar.bz2
/usr/bin/bzip2 -dc $(VER)$(VERS).tar.bz2 | /usr/bin/tar oxpf -
/usr/bin/gpatch -p0 < la.patch
+ /usr/bin/gpatch -p0 < png.patch
touch $(VER)/configure
$(VER64)/configure: $(VER)$(VERS).tar.bz2
-$(RM) -r tmp ; mkdir tmp
(cd tmp ; \
/usr/bin/bzip2 -dc ../$(VER)$(VERS).tar.bz2 | /usr/bin/tar oxpf - ; \
- /usr/bin/gpatch -p0 < ../la.patch)
- -$(RM) -r $(VER64) ; mv tmp/$(VER) $(VER64)
+ /usr/bin/gpatch -p0 < ../la.patch ; \
+ /usr/bin/gpatch -p0 < ../png.patch)
+ -$(RM) -r $(VER64) ; mv tmp/$(VER) $(VER64) ; rmdir tmp
touch $(VER64)/configure
clean:
diff -r 6135d8b0a676 usr/src/cmd/Makefile
--- a/usr/src/cmd/Makefile Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/Makefile Wed Sep 29 22:45:52 2010 +0100
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile 1.191 10/07/09 SMI"
+# ident "@(#)Makefile 1.192 10/08/31 SMI"
#
#
@@ -259,7 +259,7 @@
php5: apache2 mysql-5-1
simplewbem: cimserver
konkretcmpi: cimserver
-lighttpd14: mysql-5-1
+lighttpd14: lua mysql-5-1
guile: libtool
autogen: guile
net-snmp: doxygen
diff -r 6135d8b0a676 usr/src/cmd/apache/Makefile.sfw
--- a/usr/src/cmd/apache/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/apache/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.36 10/01/14 SMI"
+#ident "@(#)Makefile.sfw 1.37 10/09/03 SMI"
# Note to maintainers. I'm sorry...please forgive me for all
# that follows.
@@ -176,6 +175,7 @@
gzip -dc $(SERVER).tar.gz | tar xopf -
(cd $(SERVER); gpatch -p1 < ../Solaris/manpage.patches)
(cd $(SERVER); gpatch -p1 < ../Solaris/apachectl.patch) #
PSARC/2001/244
+ (cd $(SERVER); gpatch -p1 < ../Solaris/getline.patches)
# remove nasty chown
rm -f $(SERVER)/Makefile.tmpl.orig
mv $(SERVER)/Makefile.tmpl \
diff -r 6135d8b0a676 usr/src/cmd/gdb/Makefile.sfw
--- a/usr/src/cmd/gdb/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/gdb/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -20,12 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
#
-#ident "@(#)Makefile.sfw 1.12 09/10/07 SMI"
+#ident "@(#)Makefile.sfw 1.13 10/09/09 SMI"
#
include ../Makefile.cmd
@@ -97,7 +96,8 @@
touch $(VER)/configure
(cd $(VER); \
gpatch -p1 < ../gdb.solib-svr4.patch; \
- gpatch -p1 < ../gdb.auxv.patch)
+ gpatch -p1 < ../gdb.auxv.c.patch; \
+ gpatch -p1 < ../gdb.fork-child.c.patch)
$(VER64)/configure: $(TARBALL)
rm -rf tmp; mkdir tmp
@@ -106,7 +106,8 @@
touch $(VER64)/configure
(cd $(VER64); \
gpatch -p1 < ../gdb.solib-svr4.patch; \
- gpatch -p1 < ../gdb.auxv.patch)
+ gpatch -p1 < ../gdb.auxv.c.patch; \
+ gpatch -p1 < ../gdb.fork-child.c.patch)
clean:
-rm -rf $(VER) $(VER64)
diff -r 6135d8b0a676 usr/src/cmd/httping/Makefile.sfw
--- a/usr/src/cmd/httping/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/httping/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -23,7 +23,7 @@
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.sfw 1.1 09/04/14 SMI"
+# ident "@(#)Makefile.sfw 1.2 10/09/03 SMI"
#
VER=$(COMPONENT_VERSION:sh)
@@ -37,7 +37,7 @@
CC=$(CC) \
PATH=$(SFW_PATH) \
"LDFLAGS=$(LDFLAGS) -lsocket -lnsl -lssl -lcrypto" \
- "CFLAGS=$(CFLAGS) -DVERSION=\\\"$(VER)\\\"" \
+ "CFLAGS=$(CFLAGS) -Dstrndup=strndup -DVERSION=\\\"$(VER)\\\"" \
MAKE=$(CCSMAKE) \
$(CCSMAKE) -e all)
diff -r 6135d8b0a676 usr/src/cmd/lighttpd14/Makefile.sfw
--- a/usr/src/cmd/lighttpd14/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/lighttpd14/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.5 09/11/19 SMI"
+# ident "@(#)Makefile.sfw 1.6 10/08/31 SMI"
#
VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -69,8 +68,8 @@
MAKE=$(CCSMAKE) \
PCRECONFIG=/usr/bin/pcre-config \
INSTALL=$(GINSTALL) \
- LUA_LIBS=/usr/lib \
- LUA_CFLAGS=-I/usr/include \
+ LUA_LIBS=$(ROOT)/usr/lib \
+ LUA_CFLAGS=-I$(ROOT)/usr/include \
./configure --prefix=$(LIGHTTPD_INSTALLDIR) \
--mandir=$(LIGHTTPD_INSTALLDIR)/man \
--with-pic \
diff -r 6135d8b0a676 usr/src/cmd/mysql-5-1/Makefile.sfw
--- a/usr/src/cmd/mysql-5-1/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/mysql-5-1/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -19,9 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#ident "@(#)Makefile.sfw 1.6 10/01/26 SMI"
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+#ident "@(#)Makefile.sfw 1.7 10/09/03 SMI"
MYSQL_VERSION=5.1.37
@@ -83,6 +83,7 @@
#These COMMON_CONFIG_OPTIONS are common for both 32 and 64-bit
COMMON_CONFIG_OPTIONS= \
+ ac_cv_func_stpcpy=no \
--prefix=$(PREFIX) \
--localstatedir=$(DATA_PREFIX)/data \
--datadir=$(PREFIX)/share \
diff -r 6135d8b0a676 usr/src/cmd/procmail/Makefile.sfw
--- a/usr/src/cmd/procmail/Makefile.sfw Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/procmail/Makefile.sfw Wed Sep 29 22:45:52 2010 +0100
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.3 10/03/16 SMI"
+#ident "@(#)Makefile.sfw 1.4 10/09/03 SMI"
include ../Makefile.cmd
@@ -84,6 +83,7 @@
mv $(PROD)/src/Makefile.0 $(PROD)/src/Makefile.0.orig
echo "SHELL=$(BASH)" > $(PROD)/src/Makefile.0
cat $(PROD)/src/Makefile.0.orig >> $(PROD)/src/Makefile.0
+ gpatch -p0 < getline.patches
$(TOUCH) $@
clean:
diff -r 6135d8b0a676 usr/src/cmd/samba/Solaris/sam-lib.h
--- a/usr/src/cmd/samba/Solaris/sam-lib.h Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/samba/Solaris/sam-lib.h Wed Sep 29 22:45:52 2010 +0100
@@ -123,7 +123,6 @@
#ifndef SAM_LIB_GNU /* Do not define these for GNU code
*/
extern void error (int, int, char *, ...);
-extern char *stpcpy (char *, char *);
#endif
extern int SAM_fd; /* File descriptor for .ioctl file */
diff -r 6135d8b0a676 usr/src/cmd/vim/runtime.patch
--- a/usr/src/cmd/vim/runtime.patch Fri Sep 03 00:29:14 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch Wed Sep 29 22:45:52 2010 +0100
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/08/31*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/09/14*\\a[%*\\d]:\ Entering\ directory\ `%f',
diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
--- runtime.patched/compiler/jikes.vim 2004-06-07 07:32:36.000000000 -0700
+++ runtime/compiler/jikes.vim 2009-01-28 08:23:44.000000000 -0800
diff -r 6135d8b0a676 usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c Fri Sep 03
00:29:14 2010 -0700
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c Wed Sep 29
22:45:52 2010 +0100
@@ -2,7 +2,7 @@
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-#pragma ident "@(#)hw_pk11.c 1.4 10/04/14 SMI"
+#pragma ident "@(#)hw_pk11.c 1.5 10/09/01 SMI"
/* crypto/engine/hw_pk11.c */
/*
@@ -1372,6 +1372,26 @@
#if 0
pFuncList->C_Finalize(NULL);
#endif
+#ifdef SOLARIS_AES_CTR
+ {
+ ASN1_OBJECT *ob = NULL;
+ if (NID_aes_128_ctr != NID_undef) {
+ ob = OBJ_nid2obj(NID_aes_128_ctr);
+ if (ob != NULL)
+ ASN1_OBJECT_free(ob);
+ }
+ if (NID_aes_192_ctr != NID_undef) {
+ ob = OBJ_nid2obj(NID_aes_192_ctr);
+ if (ob != NULL)
+ ASN1_OBJECT_free(ob);
+ }
+ if (NID_aes_256_ctr != NID_undef) {
+ ob = OBJ_nid2obj(NID_aes_256_ctr);
+ if (ob != NULL)
+ ASN1_OBJECT_free(ob);
+ }
+ }
+#endif
if (!DSO_free(pk11_dso))
{
@@ -3619,7 +3639,7 @@
int n_cipher = 0, n_digest = 0;
CK_FUNCTION_LIST_PTR pflist = NULL;
CK_SLOT_ID_PTR pSlotList = NULL_PTR;
- int *tmp_hw_cnids, *tmp_hw_dnids;
+ int *tmp_hw_cnids = NULL, *tmp_hw_dnids = NULL;
int hw_ctable_size, hw_dtable_size;
#ifdef DEBUG_SLOT_SELECTION
diff -r 6135d8b0a676 usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_err.c
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_err.c Fri Sep 03
00:29:14 2010 -0700
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_err.c Wed Sep 29
22:45:52 2010 +0100
@@ -1,9 +1,8 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-#pragma ident "@(#)hw_pk11_err.c 1.2 09/11/10 SMI"
+#pragma ident "@(#)hw_pk11_err.c 1.3 10/09/01 SMI"
/* crypto/engine/hw_pk11_err.c */
/*
@@ -213,14 +212,14 @@
{ PK11_R_KEY_OR_IV_LEN_PROBLEM, "IV or key length incorrect"},
{ PK11_R_INVALID_OPERATION_TYPE, "invalid operation type"},
{ PK11_R_ADD_NID_FAILED, "failed to add NID" },
-{ PK11_R_ATFORK_FAILED, "atfork() failed" },
-{ PK11_R_TOKEN_LOGIN_FAILED, "C_Login() failed on token" },
+{ PK11_R_ATFORK_FAILED, "atfork failed" },
+{ PK11_R_TOKEN_LOGIN_FAILED, "C_Login failed on token" },
{ PK11_R_MORE_THAN_ONE_OBJECT_FOUND, "more than one object found" },
{ PK11_R_INVALID_PKCS11_URI, "pkcs11 URI provided is invalid" },
{ PK11_R_COULD_NOT_READ_PIN, "could not read PIN from terminal" },
{ PK11_R_PIN_NOT_READ_FROM_COMMAND, "PIN not read from external command" },
-{ PK11_R_COULD_NOT_OPEN_COMMAND, "could not popen() dialog command" },
-{ PK11_R_PIPE_FAILED, "pipe() failed" },
+{ PK11_R_COULD_NOT_OPEN_COMMAND, "could not popen dialog command" },
+{ PK11_R_PIPE_FAILED, "pipe failed" },
{ PK11_R_BAD_PASSPHRASE_SPEC, "bad passphrasedialog specification" },
{ PK11_R_TOKEN_NOT_INITIALIZED, "token not initialized" },
{ PK11_R_TOKEN_PIN_NOT_SET, "token PIN required but not set" },
@@ -230,11 +229,11 @@
{ PK11_R_PRIV_KEY_NOT_FOUND, "private key not found in keystore" },
{ PK11_R_NO_OBJECT_FOUND, "specified object not found" },
{ PK11_R_PIN_CACHING_POLICY_INVALID, "PIN set but caching policy invalid" },
-{ PK11_R_SYSCONF_FAILED, "sysconf() failed" },
-{ PK11_R_MMAP_FAILED, "mmap() failed" },
+{ PK11_R_SYSCONF_FAILED, "sysconf failed" },
+{ PK11_R_MMAP_FAILED, "mmap failed" },
{ PK11_R_PRIV_PROC_LOCK_MEMORY_MISSING, "PROC_LOCK_MEMORY privilege
missing" },
-{ PK11_R_MLOCK_FAILED, "mlock() failed" },
-{ PK11_R_FORK_FAILED, "fork() failed" },
+{ PK11_R_MLOCK_FAILED, "mlock failed" },
+{ PK11_R_FORK_FAILED, "fork failed" },
{ 0, NULL}
};
#endif /* OPENSSL_NO_ERR */
diff -r 6135d8b0a676 usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_pub.c
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_pub.c Fri Sep 03
00:29:14 2010 -0700
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_pub.c Wed Sep 29
22:45:52 2010 +0100
@@ -1,9 +1,8 @@
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-#pragma ident "@(#)hw_pk11_pub.c 1.3 10/02/01 SMI"
+#pragma ident "@(#)hw_pk11_pub.c 1.4 10/09/01 SMI"
/* crypto/engine/hw_pk11_pub.c */
/*
@@ -481,7 +480,7 @@
num = BN_num_bytes(rsa->n);
if ((buf = (unsigned char *)OPENSSL_malloc(num)) == NULL)
{
- RSAerr(PK11_F_RSA_PUB_ENC, PK11_R_MALLOC_FAILURE);
+ PK11err(PK11_F_RSA_PUB_ENC, PK11_R_MALLOC_FAILURE);
goto err;
}
@@ -502,7 +501,7 @@
i = RSA_padding_add_none(buf, num, from, flen);
break;
default:
- RSAerr(PK11_F_RSA_PUB_ENC, PK11_R_UNKNOWN_PADDING_TYPE);
+ PK11err(PK11_F_RSA_PUB_ENC, PK11_R_UNKNOWN_PADDING_TYPE);
goto err;
}
if (i <= 0) goto err;
@@ -532,7 +531,7 @@
num = BN_num_bytes(rsa->n);
if ((buf = (unsigned char *)OPENSSL_malloc(num)) == NULL)
{
- RSAerr(PK11_F_RSA_PRIV_ENC, PK11_R_MALLOC_FAILURE);
+ PK11err(PK11_F_RSA_PRIV_ENC, PK11_R_MALLOC_FAILURE);
goto err;
}
@@ -546,7 +545,7 @@
break;
case RSA_SSLV23_PADDING:
default:
- RSAerr(PK11_F_RSA_PRIV_ENC, PK11_R_UNKNOWN_PADDING_TYPE);
+ PK11err(PK11_F_RSA_PRIV_ENC, PK11_R_UNKNOWN_PADDING_TYPE);
goto err;
}
if (i <= 0) goto err;
@@ -577,7 +576,7 @@
if ((buf = (unsigned char *)OPENSSL_malloc(num)) == NULL)
{
- RSAerr(PK11_F_RSA_PRIV_DEC, PK11_R_MALLOC_FAILURE);
+ PK11err(PK11_F_RSA_PRIV_DEC, PK11_R_MALLOC_FAILURE);
goto err;
}
@@ -587,7 +586,7 @@
*/
if (flen > num)
{
- RSAerr(PK11_F_RSA_PRIV_DEC,
+ PK11err(PK11_F_RSA_PRIV_DEC,
PK11_R_DATA_GREATER_THAN_MOD_LEN);
goto err;
}
@@ -598,7 +597,7 @@
if (BN_ucmp(&f, rsa->n) >= 0)
{
- RSAerr(PK11_F_RSA_PRIV_DEC,
+ PK11err(PK11_F_RSA_PRIV_DEC,
PK11_R_DATA_TOO_LARGE_FOR_MODULUS);
goto err;
}
@@ -634,11 +633,11 @@
r = RSA_padding_check_none(to, num, p, j, num);
break;
default:
- RSAerr(PK11_F_RSA_PRIV_DEC, PK11_R_UNKNOWN_PADDING_TYPE);
+ PK11err(PK11_F_RSA_PRIV_DEC, PK11_R_UNKNOWN_PADDING_TYPE);
goto err;
}
if (r < 0)
- RSAerr(PK11_F_RSA_PRIV_DEC, PK11_R_PADDING_CHECK_FAILED);
+ PK11err(PK11_F_RSA_PRIV_DEC, PK11_R_PADDING_CHECK_FAILED);
err:
BN_clear_free(&f);
@@ -664,7 +663,7 @@
buf = (unsigned char *)OPENSSL_malloc(num);
if (buf == NULL)
{
- RSAerr(PK11_F_RSA_PUB_DEC, PK11_R_MALLOC_FAILURE);
+ PK11err(PK11_F_RSA_PUB_DEC, PK11_R_MALLOC_FAILURE);
goto err;
}
@@ -674,7 +673,7 @@
*/
if (flen > num)
{
- RSAerr(PK11_F_RSA_PUB_DEC, PK11_R_DATA_GREATER_THAN_MOD_LEN);
+ PK11err(PK11_F_RSA_PUB_DEC, PK11_R_DATA_GREATER_THAN_MOD_LEN);
goto err;
}
@@ -683,7 +682,7 @@
if (BN_ucmp(&f, rsa->n) >= 0)
{
- RSAerr(PK11_F_RSA_PUB_DEC,
+ PK11err(PK11_F_RSA_PUB_DEC,
PK11_R_DATA_TOO_LARGE_FOR_MODULUS);
goto err;
}
@@ -711,11 +710,11 @@
r = RSA_padding_check_none(to, num, p, i, num);
break;
default:
- RSAerr(PK11_F_RSA_PUB_DEC, PK11_R_UNKNOWN_PADDING_TYPE);
+ PK11err(PK11_F_RSA_PUB_DEC, PK11_R_UNKNOWN_PADDING_TYPE);
goto err;
}
if (r < 0)
- RSAerr(PK11_F_RSA_PUB_DEC, PK11_R_PADDING_CHECK_FAILED);
+ PK11err(PK11_F_RSA_PUB_DEC, PK11_R_PADDING_CHECK_FAILED);
err:
BN_clear_free(&f);
_______________________________________________
oi-dev mailing list
[email protected]
http://openindiana.org/mailman/listinfo/oi-dev
