diff options
| -rw-r--r-- | databases/db4/Makefile | 16 | ||||
| -rw-r--r-- | databases/db4/PLIST | 167 | ||||
| -rw-r--r-- | databases/db4/buildlink3.mk | 14 | ||||
| -rw-r--r-- | databases/db4/distinfo | 32 | ||||
| -rw-r--r-- | databases/db4/patches/patch-aa | 53 | ||||
| -rw-r--r-- | databases/db4/patches/patch-ab | 18 | ||||
| -rw-r--r-- | databases/db4/patches/patch-ac | 12 |
7 files changed, 216 insertions, 96 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index 835b8e6fb39..280698ed686 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.51 2007/05/23 11:47:40 obache Exp $ +# $NetBSD: Makefile,v 1.52 2007/06/08 12:23:50 wiz Exp $ -DISTNAME= db-4.4.20 -PKGNAME= ${DISTNAME:S/db/db4/} -PKGREVISION= 1 +DISTNAME= db-4.5.20 +PKGNAME= ${DISTNAME:S/db/db4/}.2 CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ +MASTER_SITES= http://download.oracle.com/berkeley-db/ \ + http://download-uk.oracle.com/berkeley-db/ -PATCHFILES= patch.4.4.20.1 patch.4.4.20.2 patch.4.4.20.3 patch.4.4.20.4 -PATCH_SITES= http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/ +PATCHFILES= patch.4.5.20.1 patch.4.5.20.2 +PATCH_SITES= http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.oracle.com/database/berkeley-db/db/index.html @@ -16,7 +16,7 @@ COMMENT= Berkeley DB version 4 from Oracle PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -DIST_SUBDIR= ${PKGNAME_NOREV} +DIST_SUBDIR= db4-4.5.20 USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/databases/db4/PLIST b/databases/db4/PLIST index 89c7b69656b..0810a1b43cf 100644 --- a/databases/db4/PLIST +++ b/databases/db4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2006/02/05 00:12:54 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/06/08 12:23:50 wiz Exp $ bin/berkeley_db4_svc bin/db4_archive bin/db4_checkpoint @@ -14,11 +14,11 @@ bin/db4_verify include/db4/db.h include/db4/db_185.h include/db4/db_cxx.h -lib/libdb4-4.4.la +lib/libdb4-4.5.la lib/libdb4-4.so lib/libdb4.a lib/libdb4.so -lib/libdb4_cxx-4.4.la +lib/libdb4_cxx-4.5.la lib/libdb4_cxx-4.so lib/libdb4_cxx.a lib/libdb4_cxx.so @@ -64,7 +64,6 @@ share/doc/db4/api_c/db_set_lorder.html share/doc/db4/api_c/db_set_msgcall.html share/doc/db4/api_c/db_set_msgfile.html share/doc/db4/api_c/db_set_pagesize.html -share/doc/db4/api_c/db_set_paniccall.html share/doc/db4/api_c/db_set_q_extentsize.html share/doc/db4/api_c/db_set_re_delim.html share/doc/db4/api_c/db_set_re_len.html @@ -87,11 +86,13 @@ share/doc/db4/api_c/dbm.html share/doc/db4/api_c/dbt_bulk.html share/doc/db4/api_c/dbt_class.html share/doc/db4/api_c/dbt_package.html +share/doc/db4/api_c/env_cdsgroup_begin.html share/doc/db4/api_c/env_class.html share/doc/db4/api_c/env_close.html share/doc/db4/api_c/env_dbremove.html share/doc/db4/api_c/env_dbrename.html share/doc/db4/api_c/env_err.html +share/doc/db4/api_c/env_event_notify.html share/doc/db4/api_c/env_failchk.html share/doc/db4/api_c/env_fileid_reset.html share/doc/db4/api_c/env_list.html @@ -122,9 +123,9 @@ share/doc/db4/api_c/env_set_lk_max_objects.html share/doc/db4/api_c/env_set_mp_mmapsize.html share/doc/db4/api_c/env_set_msgcall.html share/doc/db4/api_c/env_set_msgfile.html -share/doc/db4/api_c/env_set_paniccall.html share/doc/db4/api_c/env_set_rpc_server.html share/doc/db4/api_c/env_set_shm_key.html +share/doc/db4/api_c/env_set_thread_count.html share/doc/db4/api_c/env_set_thread_id.html share/doc/db4/api_c/env_set_thread_id_string.html share/doc/db4/api_c/env_set_timeout.html @@ -192,15 +193,23 @@ share/doc/db4/api_c/mutex_set_tas_spins.html share/doc/db4/api_c/mutex_stat.html share/doc/db4/api_c/mutex_unlock.html share/doc/db4/api_c/object.html +share/doc/db4/api_c/rep_config.html share/doc/db4/api_c/rep_elect.html share/doc/db4/api_c/rep_limit.html share/doc/db4/api_c/rep_list.html share/doc/db4/api_c/rep_message.html -share/doc/db4/api_c/rep_set_config.html +share/doc/db4/api_c/rep_nsites.html +share/doc/db4/api_c/rep_priority.html share/doc/db4/api_c/rep_start.html share/doc/db4/api_c/rep_stat.html share/doc/db4/api_c/rep_sync.html +share/doc/db4/api_c/rep_timeout.html share/doc/db4/api_c/rep_transport.html +share/doc/db4/api_c/repmgr_ack_policy.html +share/doc/db4/api_c/repmgr_local_site.html +share/doc/db4/api_c/repmgr_remote_site.html +share/doc/db4/api_c/repmgr_site_list.html +share/doc/db4/api_c/repmgr_start.html share/doc/db4/api_c/seq_class.html share/doc/db4/api_c/seq_close.html share/doc/db4/api_c/seq_get.html @@ -291,7 +300,6 @@ share/doc/db4/api_cxx/db_set_msg_stream.html share/doc/db4/api_cxx/db_set_msgcall.html share/doc/db4/api_cxx/db_set_msgfile.html share/doc/db4/api_cxx/db_set_pagesize.html -share/doc/db4/api_cxx/db_set_paniccall.html share/doc/db4/api_cxx/db_set_q_extentsize.html share/doc/db4/api_cxx/db_set_re_delim.html share/doc/db4/api_cxx/db_set_re_len.html @@ -314,11 +322,13 @@ share/doc/db4/api_cxx/dbt_bulk_class.html share/doc/db4/api_cxx/dbt_class.html share/doc/db4/api_cxx/dbt_package.html share/doc/db4/api_cxx/deadlock_class.html +share/doc/db4/api_cxx/env_cdsgroup_begin.html share/doc/db4/api_cxx/env_class.html share/doc/db4/api_cxx/env_close.html share/doc/db4/api_cxx/env_dbremove.html share/doc/db4/api_cxx/env_dbrename.html share/doc/db4/api_cxx/env_err.html +share/doc/db4/api_cxx/env_event_notify.html share/doc/db4/api_cxx/env_failchk.html share/doc/db4/api_cxx/env_fileid_reset.html share/doc/db4/api_cxx/env_list.html @@ -351,9 +361,9 @@ share/doc/db4/api_cxx/env_set_mp_mmapsize.html share/doc/db4/api_cxx/env_set_msg_stream.html share/doc/db4/api_cxx/env_set_msgcall.html share/doc/db4/api_cxx/env_set_msgfile.html -share/doc/db4/api_cxx/env_set_paniccall.html share/doc/db4/api_cxx/env_set_rpc_server.html share/doc/db4/api_cxx/env_set_shm_key.html +share/doc/db4/api_cxx/env_set_thread_count.html share/doc/db4/api_cxx/env_set_thread_id.html share/doc/db4/api_cxx/env_set_thread_id_string.html share/doc/db4/api_cxx/env_set_timeout.html @@ -425,15 +435,23 @@ share/doc/db4/api_cxx/mutex_stat.html share/doc/db4/api_cxx/mutex_unlock.html share/doc/db4/api_cxx/object.html share/doc/db4/api_cxx/pindex.src +share/doc/db4/api_cxx/rep_config.html share/doc/db4/api_cxx/rep_elect.html share/doc/db4/api_cxx/rep_limit.html share/doc/db4/api_cxx/rep_list.html share/doc/db4/api_cxx/rep_message.html -share/doc/db4/api_cxx/rep_set_config.html +share/doc/db4/api_cxx/rep_nsites.html +share/doc/db4/api_cxx/rep_priority.html share/doc/db4/api_cxx/rep_start.html share/doc/db4/api_cxx/rep_stat.html share/doc/db4/api_cxx/rep_sync.html +share/doc/db4/api_cxx/rep_timeout.html share/doc/db4/api_cxx/rep_transport.html +share/doc/db4/api_cxx/repmgr_ack_policy.html +share/doc/db4/api_cxx/repmgr_local_site.html +share/doc/db4/api_cxx/repmgr_remote_site.html +share/doc/db4/api_cxx/repmgr_site_list.html +share/doc/db4/api_cxx/repmgr_start.html share/doc/db4/api_cxx/runrec_class.html share/doc/db4/api_cxx/seq_class.html share/doc/db4/api_cxx/seq_close.html @@ -514,6 +532,7 @@ share/doc/db4/collections/tutorial/implementingmain.html share/doc/db4/collections/tutorial/index.html share/doc/db4/collections/tutorial/indexedcollections.html share/doc/db4/collections/tutorial/intro.html +share/doc/db4/collections/tutorial/moreinfo.html share/doc/db4/collections/tutorial/openclasscatalog.html share/doc/db4/collections/tutorial/opendatabases.html share/doc/db4/collections/tutorial/opendbenvironment.html @@ -645,6 +664,78 @@ share/doc/db4/gsg/JAVA/secondaryCursor.html share/doc/db4/gsg/JAVA/secondaryDelete.html share/doc/db4/gsg/JAVA/secondaryProps.html share/doc/db4/gsg/JAVA/usingDbt.html +share/doc/db4/gsg_db_rep/C/Replication-C-GSG.pdf +share/doc/db4/gsg_db_rep/C/addfeatures.html +share/doc/db4/gsg_db_rep/C/apioverview.html +share/doc/db4/gsg_db_rep/C/bulk.html +share/doc/db4/gsg_db_rep/C/c2ctransfer.html +share/doc/db4/gsg_db_rep/C/elections.html +share/doc/db4/gsg_db_rep/C/electiontimes.html +share/doc/db4/gsg_db_rep/C/exampledoloop.html +share/doc/db4/gsg_db_rep/C/fmwrkconnectretry.html +share/doc/db4/gsg_db_rep/C/fwrkmasterreplica.html +share/doc/db4/gsg_db_rep/C/fwrkpermmessage.html +share/doc/db4/gsg_db_rep/C/gettingStarted.css +share/doc/db4/gsg_db_rep/C/index.html +share/doc/db4/gsg_db_rep/C/introduction.html +share/doc/db4/gsg_db_rep/C/manageblock.html +share/doc/db4/gsg_db_rep/C/noautoinit.html +share/doc/db4/gsg_db_rep/C/permmessages.html +share/doc/db4/gsg_db_rep/C/preface.html +share/doc/db4/gsg_db_rep/C/processingloop.html +share/doc/db4/gsg_db_rep/C/repadvantage.html +share/doc/db4/gsg_db_rep/C/repapp.html +share/doc/db4/gsg_db_rep/C/repmgr_init_example_c.html +share/doc/db4/gsg_db_rep/C/simpleprogramlisting.html +share/doc/db4/gsg_db_rep/C/txnapp.html +share/doc/db4/gsg_db_rep/CXX/Replication-CXX-GSG.pdf +share/doc/db4/gsg_db_rep/CXX/addfeatures.html +share/doc/db4/gsg_db_rep/CXX/apioverview.html +share/doc/db4/gsg_db_rep/CXX/bulk.html +share/doc/db4/gsg_db_rep/CXX/c2ctransfer.html +share/doc/db4/gsg_db_rep/CXX/elections.html +share/doc/db4/gsg_db_rep/CXX/electiontimes.html +share/doc/db4/gsg_db_rep/CXX/exampledoloop.html +share/doc/db4/gsg_db_rep/CXX/fmwrkconnectretry.html +share/doc/db4/gsg_db_rep/CXX/fwrkmasterreplica.html +share/doc/db4/gsg_db_rep/CXX/fwrkpermmessage.html +share/doc/db4/gsg_db_rep/CXX/gettingStarted.css +share/doc/db4/gsg_db_rep/CXX/index.html +share/doc/db4/gsg_db_rep/CXX/introduction.html +share/doc/db4/gsg_db_rep/CXX/manageblock.html +share/doc/db4/gsg_db_rep/CXX/noautoinit.html +share/doc/db4/gsg_db_rep/CXX/permmessages.html +share/doc/db4/gsg_db_rep/CXX/preface.html +share/doc/db4/gsg_db_rep/CXX/processingloop.html +share/doc/db4/gsg_db_rep/CXX/repadvantage.html +share/doc/db4/gsg_db_rep/CXX/repapp.html +share/doc/db4/gsg_db_rep/CXX/repmgr_init_example_c.html +share/doc/db4/gsg_db_rep/CXX/simpleprogramlisting.html +share/doc/db4/gsg_db_rep/CXX/txnapp.html +share/doc/db4/gsg_db_rep/JAVA/Replication-JAVA-GSG.pdf +share/doc/db4/gsg_db_rep/JAVA/addfeatures.html +share/doc/db4/gsg_db_rep/JAVA/apioverview.html +share/doc/db4/gsg_db_rep/JAVA/bulk.html +share/doc/db4/gsg_db_rep/JAVA/c2ctransfer.html +share/doc/db4/gsg_db_rep/JAVA/elections.html +share/doc/db4/gsg_db_rep/JAVA/electiontimes.html +share/doc/db4/gsg_db_rep/JAVA/exampledoloop.html +share/doc/db4/gsg_db_rep/JAVA/fmwrkconnectretry.html +share/doc/db4/gsg_db_rep/JAVA/fwrkmasterreplica.html +share/doc/db4/gsg_db_rep/JAVA/fwrkpermmessage.html +share/doc/db4/gsg_db_rep/JAVA/gettingStarted.css +share/doc/db4/gsg_db_rep/JAVA/index.html +share/doc/db4/gsg_db_rep/JAVA/introduction.html +share/doc/db4/gsg_db_rep/JAVA/manageblock.html +share/doc/db4/gsg_db_rep/JAVA/noautoinit.html +share/doc/db4/gsg_db_rep/JAVA/permmessages.html +share/doc/db4/gsg_db_rep/JAVA/preface.html +share/doc/db4/gsg_db_rep/JAVA/processingloop.html +share/doc/db4/gsg_db_rep/JAVA/repadvantage.html +share/doc/db4/gsg_db_rep/JAVA/repapp.html +share/doc/db4/gsg_db_rep/JAVA/repmgr_init_example_c.html +share/doc/db4/gsg_db_rep/JAVA/simpleprogramlisting.html +share/doc/db4/gsg_db_rep/JAVA/txnapp.html share/doc/db4/gsg_txn/C/BerkeleyDB-Core-C-Txn.pdf share/doc/db4/gsg_txn/C/abortresults.html share/doc/db4/gsg_txn/C/architectrecovery.html @@ -762,12 +853,12 @@ share/doc/db4/gsg_txn/JAVA/txnnowait.html share/doc/db4/gsg_txn/JAVA/usingtxns.html share/doc/db4/gsg_txn/JAVA/wrapup.html share/doc/db4/gsg_txn/JAVA/writeblock.jpg +share/doc/db4/images/Oracle_BerkeleyDB_clr.bmp share/doc/db4/images/api.gif share/doc/db4/images/next.gif share/doc/db4/images/prev.gif share/doc/db4/images/ps.gif share/doc/db4/images/ref.gif -share/doc/db4/images/sleepycat.gif share/doc/db4/index.html share/doc/db4/java/allclasses-frame.html share/doc/db4/java/allclasses-noframe.html @@ -821,6 +912,8 @@ share/doc/db4/java/com/sleepycat/bind/tuple/LongBinding.html share/doc/db4/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.html share/doc/db4/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.html share/doc/db4/java/com/sleepycat/bind/tuple/ShortBinding.html +share/doc/db4/java/com/sleepycat/bind/tuple/SortedDoubleBinding.html +share/doc/db4/java/com/sleepycat/bind/tuple/SortedFloatBinding.html share/doc/db4/java/com/sleepycat/bind/tuple/StringBinding.html share/doc/db4/java/com/sleepycat/bind/tuple/TupleBase.html share/doc/db4/java/com/sleepycat/bind/tuple/TupleBinding.html @@ -842,6 +935,8 @@ share/doc/db4/java/com/sleepycat/bind/tuple/class-use/LongBinding.html share/doc/db4/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleEntry.html share/doc/db4/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleKeyEntity.html share/doc/db4/java/com/sleepycat/bind/tuple/class-use/ShortBinding.html +share/doc/db4/java/com/sleepycat/bind/tuple/class-use/SortedDoubleBinding.html +share/doc/db4/java/com/sleepycat/bind/tuple/class-use/SortedFloatBinding.html share/doc/db4/java/com/sleepycat/bind/tuple/class-use/StringBinding.html share/doc/db4/java/com/sleepycat/bind/tuple/class-use/TupleBase.html share/doc/db4/java/com/sleepycat/bind/tuple/class-use/TupleBinding.html @@ -920,6 +1015,8 @@ share/doc/db4/java/com/sleepycat/db/DeadlockException.html share/doc/db4/java/com/sleepycat/db/Environment.html share/doc/db4/java/com/sleepycat/db/EnvironmentConfig.html share/doc/db4/java/com/sleepycat/db/ErrorHandler.html +share/doc/db4/java/com/sleepycat/db/EventHandler.html +share/doc/db4/java/com/sleepycat/db/EventType.html share/doc/db4/java/com/sleepycat/db/FeedbackHandler.html share/doc/db4/java/com/sleepycat/db/HashStats.html share/doc/db4/java/com/sleepycat/db/Hasher.html @@ -943,7 +1040,10 @@ share/doc/db4/java/com/sleepycat/db/MessageHandler.html share/doc/db4/java/com/sleepycat/db/MultipleDataEntry.html share/doc/db4/java/com/sleepycat/db/MultipleEntry.html share/doc/db4/java/com/sleepycat/db/MultipleKeyDataEntry.html +share/doc/db4/java/com/sleepycat/db/MultipleKeyNIODataEntry.html +share/doc/db4/java/com/sleepycat/db/MultipleNIODataEntry.html share/doc/db4/java/com/sleepycat/db/MultipleRecnoDataEntry.html +share/doc/db4/java/com/sleepycat/db/MultipleRecnoNIODataEntry.html share/doc/db4/java/com/sleepycat/db/MutexStats.html share/doc/db4/java/com/sleepycat/db/OperationStatus.html share/doc/db4/java/com/sleepycat/db/PanicHandler.html @@ -955,11 +1055,15 @@ share/doc/db4/java/com/sleepycat/db/ReplicationConfig.html share/doc/db4/java/com/sleepycat/db/ReplicationDuplicateMasterException.html share/doc/db4/java/com/sleepycat/db/ReplicationHandleDeadException.html share/doc/db4/java/com/sleepycat/db/ReplicationHoldElectionException.html +share/doc/db4/java/com/sleepycat/db/ReplicationHostAddress.html share/doc/db4/java/com/sleepycat/db/ReplicationJoinFailureException.html share/doc/db4/java/com/sleepycat/db/ReplicationLockoutException.html +share/doc/db4/java/com/sleepycat/db/ReplicationManagerAckPolicy.html +share/doc/db4/java/com/sleepycat/db/ReplicationManagerStartPolicy.html share/doc/db4/java/com/sleepycat/db/ReplicationSiteUnavailableException.html share/doc/db4/java/com/sleepycat/db/ReplicationStats.html share/doc/db4/java/com/sleepycat/db/ReplicationStatus.html +share/doc/db4/java/com/sleepycat/db/ReplicationTimeoutType.html share/doc/db4/java/com/sleepycat/db/ReplicationTransport.html share/doc/db4/java/com/sleepycat/db/RunRecoveryException.html share/doc/db4/java/com/sleepycat/db/SecondaryConfig.html @@ -974,6 +1078,7 @@ share/doc/db4/java/com/sleepycat/db/Transaction.html share/doc/db4/java/com/sleepycat/db/TransactionConfig.html share/doc/db4/java/com/sleepycat/db/TransactionStats.Active.html share/doc/db4/java/com/sleepycat/db/TransactionStats.html +share/doc/db4/java/com/sleepycat/db/UpdateConflictException.html share/doc/db4/java/com/sleepycat/db/VerifyConfig.html share/doc/db4/java/com/sleepycat/db/VersionMismatchException.html share/doc/db4/java/com/sleepycat/db/class-use/BtreePrefixCalculator.html @@ -997,6 +1102,8 @@ share/doc/db4/java/com/sleepycat/db/class-use/DeadlockException.html share/doc/db4/java/com/sleepycat/db/class-use/Environment.html share/doc/db4/java/com/sleepycat/db/class-use/EnvironmentConfig.html share/doc/db4/java/com/sleepycat/db/class-use/ErrorHandler.html +share/doc/db4/java/com/sleepycat/db/class-use/EventHandler.html +share/doc/db4/java/com/sleepycat/db/class-use/EventType.html share/doc/db4/java/com/sleepycat/db/class-use/FeedbackHandler.html share/doc/db4/java/com/sleepycat/db/class-use/HashStats.html share/doc/db4/java/com/sleepycat/db/class-use/Hasher.html @@ -1020,7 +1127,10 @@ share/doc/db4/java/com/sleepycat/db/class-use/MessageHandler.html share/doc/db4/java/com/sleepycat/db/class-use/MultipleDataEntry.html share/doc/db4/java/com/sleepycat/db/class-use/MultipleEntry.html share/doc/db4/java/com/sleepycat/db/class-use/MultipleKeyDataEntry.html +share/doc/db4/java/com/sleepycat/db/class-use/MultipleKeyNIODataEntry.html +share/doc/db4/java/com/sleepycat/db/class-use/MultipleNIODataEntry.html share/doc/db4/java/com/sleepycat/db/class-use/MultipleRecnoDataEntry.html +share/doc/db4/java/com/sleepycat/db/class-use/MultipleRecnoNIODataEntry.html share/doc/db4/java/com/sleepycat/db/class-use/MutexStats.html share/doc/db4/java/com/sleepycat/db/class-use/OperationStatus.html share/doc/db4/java/com/sleepycat/db/class-use/PanicHandler.html @@ -1032,11 +1142,15 @@ share/doc/db4/java/com/sleepycat/db/class-use/ReplicationConfig.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationDuplicateMasterException.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationHandleDeadException.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationHoldElectionException.html +share/doc/db4/java/com/sleepycat/db/class-use/ReplicationHostAddress.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationJoinFailureException.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationLockoutException.html +share/doc/db4/java/com/sleepycat/db/class-use/ReplicationManagerAckPolicy.html +share/doc/db4/java/com/sleepycat/db/class-use/ReplicationManagerStartPolicy.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationSiteUnavailableException.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationStats.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationStatus.html +share/doc/db4/java/com/sleepycat/db/class-use/ReplicationTimeoutType.html share/doc/db4/java/com/sleepycat/db/class-use/ReplicationTransport.html share/doc/db4/java/com/sleepycat/db/class-use/RunRecoveryException.html share/doc/db4/java/com/sleepycat/db/class-use/SecondaryConfig.html @@ -1051,6 +1165,7 @@ share/doc/db4/java/com/sleepycat/db/class-use/Transaction.html share/doc/db4/java/com/sleepycat/db/class-use/TransactionConfig.html share/doc/db4/java/com/sleepycat/db/class-use/TransactionStats.Active.html share/doc/db4/java/com/sleepycat/db/class-use/TransactionStats.html +share/doc/db4/java/com/sleepycat/db/class-use/UpdateConflictException.html share/doc/db4/java/com/sleepycat/db/class-use/VerifyConfig.html share/doc/db4/java/com/sleepycat/db/class-use/VersionMismatchException.html share/doc/db4/java/com/sleepycat/db/package-frame.html @@ -1062,6 +1177,7 @@ share/doc/db4/java/com/sleepycat/util/ExceptionWrapper.html share/doc/db4/java/com/sleepycat/util/FastInputStream.html share/doc/db4/java/com/sleepycat/util/FastOutputStream.html share/doc/db4/java/com/sleepycat/util/IOExceptionWrapper.html +share/doc/db4/java/com/sleepycat/util/PackedInteger.html share/doc/db4/java/com/sleepycat/util/RuntimeExceptionWrapper.html share/doc/db4/java/com/sleepycat/util/UtfOps.html share/doc/db4/java/com/sleepycat/util/class-use/ExceptionUnwrapper.html @@ -1069,6 +1185,7 @@ share/doc/db4/java/com/sleepycat/util/class-use/ExceptionWrapper.html share/doc/db4/java/com/sleepycat/util/class-use/FastInputStream.html share/doc/db4/java/com/sleepycat/util/class-use/FastOutputStream.html share/doc/db4/java/com/sleepycat/util/class-use/IOExceptionWrapper.html +share/doc/db4/java/com/sleepycat/util/class-use/PackedInteger.html share/doc/db4/java/com/sleepycat/util/class-use/RuntimeExceptionWrapper.html share/doc/db4/java/com/sleepycat/util/class-use/UtfOps.html share/doc/db4/java/com/sleepycat/util/package-frame.html @@ -1084,10 +1201,11 @@ share/doc/db4/java/overview-frame.html share/doc/db4/java/overview-summary.html share/doc/db4/java/overview-tree.html share/doc/db4/java/package-list -share/doc/db4/java/packages.html share/doc/db4/java/resources/inherit.gif share/doc/db4/java/serialized-form.html share/doc/db4/java/style.css +share/doc/db4/license/license_db.html +share/doc/db4/license/license_xml.html share/doc/db4/ref/am/close.html share/doc/db4/ref/am/count.html share/doc/db4/ref/am/curclose.html @@ -1265,6 +1383,7 @@ share/doc/db4/ref/refs/libtp_usenix.ps share/doc/db4/ref/refs/refs.html share/doc/db4/ref/refs/witold.html share/doc/db4/ref/rep/app.html +share/doc/db4/ref/rep/base_meth.html share/doc/db4/ref/rep/bulk.html share/doc/db4/ref/rep/comm.html share/doc/db4/ref/rep/elect.html @@ -1276,6 +1395,7 @@ share/doc/db4/ref/rep/id.html share/doc/db4/ref/rep/init.html share/doc/db4/ref/rep/intro.html share/doc/db4/ref/rep/mastersync.html +share/doc/db4/ref/rep/mgr_meth.html share/doc/db4/ref/rep/newsite.html share/doc/db4/ref/rep/partition.html share/doc/db4/ref/rep/pri.html @@ -1467,6 +1587,21 @@ share/doc/db4/ref/upgrade.4.4/joinenv.html share/doc/db4/ref/upgrade.4.4/lockstat.html share/doc/db4/ref/upgrade.4.4/mutex.html share/doc/db4/ref/upgrade.4.4/toc.html +share/doc/db4/ref/upgrade.4.5/alive.html +share/doc/db4/ref/upgrade.4.5/applog.html +share/doc/db4/ref/upgrade.4.5/collect.html +share/doc/db4/ref/upgrade.4.5/config.html +share/doc/db4/ref/upgrade.4.5/deprecate.html +share/doc/db4/ref/upgrade.4.5/disk.html +share/doc/db4/ref/upgrade.4.5/elect.html +share/doc/db4/ref/upgrade.4.5/intro.html +share/doc/db4/ref/upgrade.4.5/memp.html +share/doc/db4/ref/upgrade.4.5/pagesize.html +share/doc/db4/ref/upgrade.4.5/paniccall.html +share/doc/db4/ref/upgrade.4.5/rep_event.html +share/doc/db4/ref/upgrade.4.5/rep_set.html +share/doc/db4/ref/upgrade.4.5/source.html +share/doc/db4/ref/upgrade.4.5/toc.html share/doc/db4/ref/upgrade/process.html share/doc/db4/ref/upgrade/version.html share/doc/db4/ref/xa/build.html @@ -1474,9 +1609,6 @@ share/doc/db4/ref/xa/faq.html share/doc/db4/ref/xa/intro.html share/doc/db4/ref/xa/xa_config.html share/doc/db4/ref/xa/xa_intro.html -share/doc/db4/sleepycat/legal.html -share/doc/db4/sleepycat/license_db.html -share/doc/db4/sleepycat/license_xml.html share/doc/db4/utility/berkeley_db_svc.html share/doc/db4/utility/db_archive.html share/doc/db4/utility/db_checkpoint.html @@ -1491,8 +1623,8 @@ share/doc/db4/utility/db_upgrade.html share/doc/db4/utility/db_verify.html share/doc/db4/utility/index.html @dirrm share/doc/db4/utility -@dirrm share/doc/db4/sleepycat @dirrm share/doc/db4/ref/xa +@dirrm share/doc/db4/ref/upgrade.4.5 @dirrm share/doc/db4/ref/upgrade.4.4 @dirrm share/doc/db4/ref/upgrade.4.3 @dirrm share/doc/db4/ref/upgrade.4.2 @@ -1534,6 +1666,7 @@ share/doc/db4/utility/index.html @dirrm share/doc/db4/ref/am_conf @dirrm share/doc/db4/ref/am @dirrm share/doc/db4/ref +@dirrm share/doc/db4/license @dirrm share/doc/db4/java/resources @dirrm share/doc/db4/java/com/sleepycat/util/class-use @dirrm share/doc/db4/java/com/sleepycat/util @@ -1555,6 +1688,10 @@ share/doc/db4/utility/index.html @dirrm share/doc/db4/gsg_txn/CXX @dirrm share/doc/db4/gsg_txn/C @dirrm share/doc/db4/gsg_txn +@dirrm share/doc/db4/gsg_db_rep/JAVA +@dirrm share/doc/db4/gsg_db_rep/CXX +@dirrm share/doc/db4/gsg_db_rep/C +@dirrm share/doc/db4/gsg_db_rep @dirrm share/doc/db4/gsg/JAVA @dirrm share/doc/db4/gsg/CXX @dirrm share/doc/db4/gsg/C diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index dd418d28053..d2bb54d13ef 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2006/12/12 21:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2007/06/08 12:23:51 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ @@ -12,22 +12,12 @@ BUILDLINK_PACKAGES+= db4 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db4 .if !empty(DB4_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.db4+= db4>=4.4.16 +BUILDLINK_API_DEPENDS.db4+= db4>=4.5.20 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 BUILDLINK_INCDIRS.db4?= include/db4 BUILDLINK_LDADD.db4= -ldb4 BUILDLINK_TRANSFORM+= l:db-4:db4 -. include "../../mk/bsd.fast.prefs.mk" -. if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) -# -# Older db4 packages didn't enable the db-1.85 compatibility API. -# -BUILDLINK_API_DEPENDS.db4+= db4>=4.2.52nb1 -BUILDLINK_LIBS.db4= ${BUILDLINK_LDADD.db4} -BUILDLINK_TRANSFORM+= l:db:db4 -. endif - . include "../../mk/compiler.mk" . if empty(PKGSRC_COMPILER:Mgcc) PTHREAD_OPTS+= native diff --git a/databases/db4/distinfo b/databases/db4/distinfo index 29a7b8b9efb..77dea515afe 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -1,20 +1,14 @@ -$NetBSD: distinfo,v 1.26 2006/11/05 17:43:59 joerg Exp $ +$NetBSD: distinfo,v 1.27 2007/06/08 12:23:51 wiz Exp $ -SHA1 (db4-4.4.20/db-4.4.20.tar.gz) = bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b -RMD160 (db4-4.4.20/db-4.4.20.tar.gz) = 5940d9244b4df4897f66f1b67d3c967081c18b85 -Size (db4-4.4.20/db-4.4.20.tar.gz) = 7952742 bytes -SHA1 (db4-4.4.20/patch.4.4.20.1) = 5843380b67561134432f46dce53b67a133ef7962 -RMD160 (db4-4.4.20/patch.4.4.20.1) = 57ecff5ecb934e1eb771c49e4e67246d579702b2 -Size (db4-4.4.20/patch.4.4.20.1) = 867 bytes -SHA1 (db4-4.4.20/patch.4.4.20.2) = 75f0ae6ef06a23a690e5ebe6460552a11448ef32 -RMD160 (db4-4.4.20/patch.4.4.20.2) = e560b07cc20dbd6865d8aad91941515f8fb031c1 -Size (db4-4.4.20/patch.4.4.20.2) = 721 bytes -SHA1 (db4-4.4.20/patch.4.4.20.3) = 580265cdccc394ed988a6334f6c9a7d2bb15d141 -RMD160 (db4-4.4.20/patch.4.4.20.3) = 668c8e88f6fde2c028a9a3ad1d6917a28e7b3e85 -Size (db4-4.4.20/patch.4.4.20.3) = 1366 bytes -SHA1 (db4-4.4.20/patch.4.4.20.4) = 8875add3312fdc0548fbd4dedb71b4f8637dc6c9 -RMD160 (db4-4.4.20/patch.4.4.20.4) = 46cf2177aee1ce00c0044817610231541722c4d3 -Size (db4-4.4.20/patch.4.4.20.4) = 837 bytes -SHA1 (patch-aa) = 7e1b32555143fae455b033452d7639b5cfa70666 -SHA1 (patch-ab) = 2c0db053fb5e27ce45becdb5ec3c498ecda96348 -SHA1 (patch-ac) = 9ca09880abf95f415d5dc8b2595d3da755af18d9 +SHA1 (db4-4.5.20/db-4.5.20.tar.gz) = 0e5a6c152c5d7089899481d9de689d1f7e77bde1 +RMD160 (db4-4.5.20/db-4.5.20.tar.gz) = 5fc492efcddce6f446c5977128f5526f73763e01 +Size (db4-4.5.20/db-4.5.20.tar.gz) = 9281894 bytes +SHA1 (db4-4.5.20/patch.4.5.20.1) = 0d55d4d7357b896bde91e096b40bfc100bb27d9d +RMD160 (db4-4.5.20/patch.4.5.20.1) = 52093e6c3d952cb8193db35e45aa4462ba0772be +Size (db4-4.5.20/patch.4.5.20.1) = 984 bytes +SHA1 (db4-4.5.20/patch.4.5.20.2) = a3fcbc023489c059659f789d9473ac25d6d3a477 +RMD160 (db4-4.5.20/patch.4.5.20.2) = d35069e8267f02e64e6f1be046d6cb9e75e9e720 +Size (db4-4.5.20/patch.4.5.20.2) = 1752 bytes +SHA1 (patch-aa) = fd05d88e6580e7d9f47baca9586b8f992b08137c +SHA1 (patch-ab) = 0d5ab416a60ba2e50d77880601d00792cc0ec61d +SHA1 (patch-ac) = 1b318e4024976e1c6567229622e0b50e2db3f9d3 diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa index 1a543b29bf0..a27eaf5bb3f 100644 --- a/databases/db4/patches/patch-aa +++ b/databases/db4/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $ +$NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $ ---- dist/Makefile.in.orig 2005-11-08 12:47:22.000000000 +0000 +--- dist/Makefile.in.orig 2006-09-13 16:22:38.000000000 +0000 +++ dist/Makefile.in @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ bindir= @bindir@ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $ SOFLAGS= @SOFLAGS@ LIBMAJOR= @DB_VERSION_MAJOR@ LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ -@@ -60,7 +60,7 @@ LIBS= @LIBS@ +@@ -60,7 +60,7 @@ LIBS= @LIBSO_LIBS@ TEST_LIBS= @TEST_LIBS@ LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@ @@ -38,20 +38,19 @@ $NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $ libcxx= $(libcxx_base).a libcxx_version= $(libcxx_base)-$(LIBVERSION).a libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@ -@@ -107,10 +107,10 @@ JAVA_EXDIR= $(srcdir)/examples_java/src - JAVA_RPCDIR= $(srcdir)/rpc_server/java +@@ -105,9 +105,9 @@ JAVA_SRCDIR= $(srcdir)/java/src + JAVA_EXDIR= $(srcdir)/examples_java/src JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat -libj_jarfile= db.jar +libj_jarfile= db4.jar libj_exjarfile= dbexamples.jar - rpc_jarfile= dbsvc.jar -libjso_base= libdb_java +libjso_base= libdb4_java libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ libjso_static= $(libjso_base)-$(LIBVERSION).a libjso_target= $(libjso_base)-$(LIBVERSION).la -@@ -125,7 +125,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g +@@ -122,7 +122,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g ################################################## TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@ LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@ @@ -60,34 +59,34 @@ $NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $ libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ libtso_static= $(libtso_base)-$(LIBVERSION).a libtso_target= $(libtso_base)-$(LIBVERSION).la -@@ -867,8 +867,7 @@ install_include: - ($(mkdir) -p $(DESTDIR)$(includedir) && \ - $(chmod) $(dmode) $(DESTDIR)$(includedir)) - @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT) -- @$(cp) -p $(INCDOT) $(DESTDIR)$(includedir) -- @cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) $(INCDOT) +@@ -723,8 +723,7 @@ install_include: + ($(MKDIR) -p $(DESTDIR)$(includedir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(includedir)) + @cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT) +- @$(CP) -p $(INCDOT) $(DESTDIR)$(includedir) +- @cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT) + ${BSD_INSTALL_DATA} $(INCDOT) $(DESTDIR)$(includedir) uninstall_include: - @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT) -@@ -879,7 +878,7 @@ install_lib: - ($(mkdir) -p $(DESTDIR)$(libdir) && \ - $(chmod) $(dmode) $(DESTDIR)$(libdir)) - @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST) + @cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT) +@@ -735,7 +734,7 @@ install_lib: + ($(MKDIR) -p $(DESTDIR)$(libdir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(libdir)) + @cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST) - @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir) + @libtool --mode=install ${BSD_INSTALL_LIB} @INSTALL_LIBS@ $(DESTDIR)$(libdir) @(cd $(DESTDIR)$(libdir) && \ - test -f $(libso) && $(ln) -s $(libso) $(libso_default); \ - test -f $(libso) && $(ln) -s $(libso) $(libso_major); \ -@@ -903,11 +902,8 @@ install_utilities: - ($(mkdir) -p $(DESTDIR)$(bindir) && \ - $(chmod) $(dmode) $(DESTDIR)$(bindir)) + test -f $(libso) && $(LN) -s $(libso) $(libso_default); \ + test -f $(libso) && $(LN) -s $(libso) $(libso_major); \ +@@ -759,11 +758,8 @@ install_utilities: + ($(MKDIR) -p $(DESTDIR)$(bindir) && \ + $(CHMOD) $(dmode) $(DESTDIR)$(bindir)) @for i in $(UTIL_PROGS); do \ -- $(rm) -f $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.exe; \ -- test -f $$i.exe && i=$$i.exe || true; \ +- test -f $$i.exe && i=$$i.exe || i=$$i; \ +- $(RM) -f $(DESTDIR)$(bindir)/$$i; \ - $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \ -- test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \ -- $(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \ +- test "$(STRIP)" = "none" || $(STRIP) $(DESTDIR)$(bindir)/$$i; \ +- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \ + target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \ + libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \ done diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab index 609a42f1cf0..75399c98cd9 100644 --- a/databases/db4/patches/patch-ab +++ b/databases/db4/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $ +$NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $ ---- dist/configure.orig 2006-01-10 17:19:32.000000000 +0100 -+++ dist/configure 2006-10-05 03:21:44.000000000 +0200 -@@ -5498,6 +5498,7 @@ db_cv_gxx_except=no; +--- dist/configure.orig 2006-09-20 20:07:20.000000000 +0000 ++++ dist/configure +@@ -6288,6 +6288,7 @@ db_cv_gxx_except=no; if test "$GXX" = "yes"; then GXX_VERSION=`${MAKEFILE_CXX} --version` case ${GXX_VERSION} in @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $ 1.*|2.[01234567].*|*-1.*|*-2.[01234567].*) db_cv_gxx_except=yes;; esac -@@ -5514,7 +5515,7 @@ fi +@@ -6304,7 +6305,7 @@ fi # we're using. case "$host_os" in sysv5UnixWare*|sysv5OpenUNIX8*) @@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $ CPPFLAGS="$CPPFLAGS -pthread" LDFLAGS="$LDFLAGS -pthread" else -@@ -21564,7 +21565,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo +@@ -21832,7 +21833,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo SOFLAGS="-rpath \$(libdir)" @@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $ # Set SOSUFFIX and friends -@@ -21656,7 +21656,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6 +@@ -21924,7 +21924,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; } INSTALLER="\$(LIBTOOL) --mode=install cp -p" MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" @@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $ MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -@@ -22412,7 +22412,7 @@ if test "$_JTOPDIR" != "/usr"; then +@@ -22691,7 +22691,7 @@ if test "$_JTOPDIR" != "/usr"; then case "$host_os" in aix*) _JNI_INC_SUBDIRS="aix";; bsdi*) _JNI_INC_SUBDIRS="bsdos";; @@ -45,7 +45,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $ hp*) _JNI_INC_SUBDIRS="hp-ux";; linux*) _JNI_INC_SUBDIRS="linux genunix";; osf*) _JNI_INC_SUBDIRS="alpha";; -@@ -30835,7 +30835,7 @@ fi +@@ -31972,7 +31972,7 @@ fi # # If the user specified we use POSIX pthreads mutexes, and we fail to find the # full interface, try and configure for just intra-process support. diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac index 86b7ba9f166..65e84657034 100644 --- a/databases/db4/patches/patch-ac +++ b/databases/db4/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz Exp $ +$NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $ ---- hmac/sha1.c.orig 2004-11-17 04:43:56.000000000 +0100 +--- hmac/sha1.c.orig 2006-09-09 00:45:39.000000000 +0000 +++ hmac/sha1.c -@@ -103,6 +103,63 @@ A million repetitions of "a" +@@ -99,6 +99,63 @@ A million repetitions of "a" #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); @@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz Exp $ #ifdef VERBOSE /* SAK */ static void __db_SHAPrintContext __P((SHA1_CTX *, char *)); -@@ -135,10 +192,6 @@ __db_SHA1Transform(state, buffer) +@@ -131,10 +188,6 @@ __db_SHA1Transform(state, buffer) unsigned char *buffer; { u_int32_t a, b, c, d, e; @@ -77,7 +77,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz Exp $ CHAR64LONG16* block; static int is_bigendian = -1; #ifdef SHA1HANDSOFF -@@ -157,6 +210,13 @@ static int is_bigendian = -1; +@@ -153,6 +206,13 @@ static int is_bigendian = -1; c = state[2]; d = state[3]; e = state[4]; @@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz Exp $ /* 4 rounds of 20 operations each. Loop unrolled. */ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); -@@ -178,6 +238,8 @@ static int is_bigendian = -1; +@@ -174,6 +234,8 @@ static int is_bigendian = -1; R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); |