pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update pkgtools/libnbcompat to 20030830. Changes from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b24e91e5437e
branches: trunk
changeset: 460870:b24e91e5437e
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Sep 06 01:35:07 2003 +0000
description:
Update pkgtools/libnbcompat to 20030830. Changes from the previous
version are removing sha2* object files from libnbcompat.a. It turns
out that the functions defined there aren't provided by NetBSD, so it
makes no sense for libnbcompat to define them, and none of the
utilities in pkgsrc that link against libnbcompat actually use these
functions anyway.
diffstat:
doc/CHANGES | 3 +-
pkgtools/libnbcompat/Makefile | 4 +-
pkgtools/libnbcompat/PLIST | 3 +-
pkgtools/libnbcompat/buildlink2.mk | 4 +-
pkgtools/libnbcompat/files/configure | 84 +-
pkgtools/libnbcompat/files/configure.ac | 6 +-
pkgtools/libnbcompat/files/nbcompat.h | 8 +-
pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in | 3 -
pkgtools/libnbcompat/files/nbcompat/sha2.h | 151 ---
pkgtools/libnbcompat/files/sha2.c | 975 ----------------------
pkgtools/libnbcompat/files/sha2hl.c | 262 -----
11 files changed, 10 insertions(+), 1493 deletions(-)
diffs (truncated from 1618 to 300 lines):
diff -r 551379180e85 -r b24e91e5437e doc/CHANGES
--- a/doc/CHANGES Fri Sep 05 22:19:30 2003 +0000
+++ b/doc/CHANGES Sat Sep 06 01:35:07 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3258 2003/09/05 19:52:24 jmmv Exp $
+$NetBSD: CHANGES,v 1.3259 2003/09/06 01:35:13 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3552,3 +3552,4 @@
Updated buildtool-doc to 0.14 [jmmv 2003-09-05]
Updated samba to 2.2.8anb3 [kim 2003-09-05]
Added menu2wm-0.1 [jmmv 2003-09-05]
+ Updated libnbcompat to 20030830 [jlam 2003-09-05]
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/Makefile Sat Sep 06 01:35:07 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/09/05 22:19:30 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/06 01:35:07 jlam Exp $
#
-DISTNAME= libnbcompat-20030829
+DISTNAME= libnbcompat-20030830
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/PLIST
--- a/pkgtools/libnbcompat/PLIST Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/PLIST Sat Sep 06 01:35:07 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/09/05 18:35:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/09/06 01:35:07 jlam Exp $
include/nbcompat.h
include/nbcompat/err.h
include/nbcompat/fts.h
@@ -10,7 +10,6 @@
include/nbcompat/poll.h
include/nbcompat/rmd160.h
include/nbcompat/sha1.h
-include/nbcompat/sha2.h
include/nbcompat/statfs.h
include/nbcompat/vis.h
lib/libnbcompat.a
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/buildlink2.mk
--- a/pkgtools/libnbcompat/buildlink2.mk Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/buildlink2.mk Sat Sep 06 01:35:07 2003 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.12 2003/09/05 18:35:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2003/09/06 01:35:07 jlam Exp $
.if !defined(LIBNBCOMPAT_BUILDLINK2_MK)
LIBNBCOMPAT_BUILDLINK2_MK= # defined
-BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030829
+BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030830
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/files/configure Sat Sep 06 01:35:07 2003 +0000
@@ -3321,8 +3321,7 @@
-
-for ac_header in md5.h rmd160.h sha1.h sha2.h
+for ac_header in md5.h rmd160.h sha1.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -6684,87 +6683,6 @@
fi
-echo "$as_me:$LINENO: checking for SHA256_File" >&5
-echo $ECHO_N "checking for SHA256_File... $ECHO_C" >&6
-if test "${ac_cv_func_SHA256_File+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char SHA256_File (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char SHA256_File ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_SHA256_File) || defined (__stub___SHA256_File)
-choke me
-#else
-char (*f) () = SHA256_File;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != SHA256_File;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_SHA256_File=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_SHA256_File=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_SHA256_File" >&5
-echo "${ECHO_T}$ac_cv_func_SHA256_File" >&6
-if test $ac_cv_func_SHA256_File = yes; then
- :
-else
-
- LIBOBJS="$LIBOBJS sha2.$ac_objext"
- LIBOBJS="$LIBOBJS sha2hl.$ac_objext"
-
-fi
-
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac Sat Sep 06 01:35:07 2003 +0000
@@ -40,7 +40,7 @@
sys/stat.h sys/statvfs.h sys/vfs.h sys/types.h sys/vfs.h termcap.h \
termios.h time.h tzfile.h unistd.h util.h utmp.h])
-AC_CHECK_HEADERS([md5.h rmd160.h sha1.h sha2.h])
+AC_CHECK_HEADERS([md5.h rmd160.h sha1.h])
dnl Check that this vis.h has *vis()-related functions because Solaris'
dnl vis.h doesn't. Also, only consider the header found if it defines
@@ -120,10 +120,6 @@
AC_LIBOBJ(sha1)
AC_LIBOBJ(sha1hl)
])
-AC_CHECK_FUNC(SHA256_File, [:], [
- AC_LIBOBJ(sha2)
- AC_LIBOBJ(sha2hl)
-])
AC_CHECK_FUNCS([strunvis strvis strsvis],
[pkg_use_nbcompat_vis=no],
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/files/nbcompat.h
--- a/pkgtools/libnbcompat/files/nbcompat.h Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat.h Sat Sep 06 01:35:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nbcompat.h,v 1.15 2003/09/05 18:36:02 jlam Exp $ */
+/* $NetBSD: nbcompat.h,v 1.16 2003/09/06 01:35:08 jlam Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -338,12 +338,6 @@
# include <nbcompat/sha1.h>
#endif
-#if HAVE_SHA2_H
-# include <sha2.h>
-#else
-# include <nbcompat/sha2.h>
-#endif
-
#if HAVE_NBCOMPAT_VIS
# ifdef HAVE_VIS_H
# undef HAVE_VIS_H
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in
--- a/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in Fri Sep 05 22:19:30 2003 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/nbconfig.h.in Sat Sep 06 01:35:07 2003 +0000
@@ -237,9 +237,6 @@
/* Define to 1 if you have the <sha1.h> header file. */
#undef HAVE_SHA1_H
-/* Define to 1 if you have the <sha2.h> header file. */
-#undef HAVE_SHA2_H
-
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
diff -r 551379180e85 -r b24e91e5437e pkgtools/libnbcompat/files/nbcompat/sha2.h
--- a/pkgtools/libnbcompat/files/nbcompat/sha2.h Fri Sep 05 22:19:30 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
- * sha2.h
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me%aarongifford.com@localhost>
- *
- * Copyright 2000 Aaron D. Gifford. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __SHA2_H__
-#define __SHA2_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-#define SHA256_BLOCK_LENGTH 64
-#define SHA256_DIGEST_LENGTH 32
-#define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1)
-#define SHA384_BLOCK_LENGTH 128
-#define SHA384_DIGEST_LENGTH 48
-#define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1)
-#define SHA512_BLOCK_LENGTH 128
-#define SHA512_DIGEST_LENGTH 64
-#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1)
-
-
-/*** SHA-256/384/512 Context Structures *******************************/
-typedef struct _SHA256_CTX {
- uint32_t state[8];
- uint64_t bitcount;
- uint8_t buffer[SHA256_BLOCK_LENGTH];
-} SHA256_CTX;
-typedef struct _SHA512_CTX {
- uint64_t state[8];
- uint64_t bitcount[2];
- uint8_t buffer[SHA512_BLOCK_LENGTH];
-} SHA512_CTX;
-
-typedef SHA512_CTX SHA384_CTX;
-
-
-/*** SHA-256/384/512 Function Prototypes ******************************/
-#ifndef NOPROTO
-#ifdef SHA2_USE_INTTYPES_H
-
-void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t);
-void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
-char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
Home |
Main Index |
Thread Index |
Old Index