update to opencdk 0.5.4
from me and maintainer Jim Geovedi
This commit is contained in:
sturm
parent
b19bdaa76d
commit
a1f6539518
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2003/10/12 02:13:41 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2004/05/08 06:42:59 sturm Exp $
|
||||
|
||||
COMMENT= "Open Crypto Development Kit"
|
||||
|
||||
VERSION= 0.4.5
|
||||
VERSION= 0.5.4
|
||||
DISTNAME= opencdk-${VERSION}
|
||||
CATEGORIES= security
|
||||
|
||||
@ -17,18 +17,17 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/ \
|
||||
ftp://gd.tuwien.ac.at/privacy/gnupg/alpha/gnutls/opencdk/ \
|
||||
http://ftp.planetmirror.com/pub/gnupg/alpha/gnutls/opencdk/ \
|
||||
http://sunsite.dk/pub/security/gcrypt/alpha/gnutls/opencdk/ \
|
||||
http://ftp.linux.it/pub/mirrors/gnupg/alpha/gnutls/opencdk/
|
||||
|
||||
LIB_DEPENDS= gcrypt.6::security/libgcrypt
|
||||
LIB_DEPENDS= gcrypt.12::security/libgcrypt
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--enable-static \
|
||||
--with-libgcrypt-prefix=${LOCALBASE}
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--enable-static \
|
||||
--with-libgcrypt-prefix=${LOCALBASE}
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/opencdk
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (opencdk-0.4.5.tar.gz) = 53e7822ae35d6b391951933e73d3cce0
|
||||
RMD160 (opencdk-0.4.5.tar.gz) = 4ee75fb9a3c5dfdb030453c4df65f7c32ee20dd0
|
||||
SHA1 (opencdk-0.4.5.tar.gz) = 2736a64c871e69cf3799959229e59a92528608bf
|
||||
MD5 (opencdk-0.5.4.tar.gz) = 3b31b92c15e4f3d78a67a5cd925eda80
|
||||
RMD160 (opencdk-0.5.4.tar.gz) = c094a2d7aa5c71f11a12f903387547d12913b285
|
||||
SHA1 (opencdk-0.5.4.tar.gz) = ded4449e147bf586c18d32b891b3ff814c788fa0
|
||||
|
||||
@ -1,28 +1,27 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
|
||||
--- configure.orig Wed Apr 30 20:40:54 2003
|
||||
+++ configure Wed Apr 30 20:42:33 2003
|
||||
@@ -5790,12 +5790,12 @@ else
|
||||
else
|
||||
case "$host_os" in
|
||||
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -6314,6 +6314,8 @@ openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
$OpenBSD: patch-configure,v 1.2 2004/05/08 06:42:59 sturm Exp $
|
||||
--- configure.orig 2004-04-25 08:52:01.000000000 +0200
|
||||
+++ configure 2004-04-25 08:54:16.000000000 +0200
|
||||
@@ -7329,12 +7329,12 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
else
|
||||
case $host_os in
|
||||
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -8003,6 +8003,8 @@ openbsd*)
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
+ sys_lib_search_path_spec="/usr/lib"
|
||||
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
||||
+ sys_lib_dlsearch_path_spec="/usr/lib $PREFIX/lib"
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
case "$host_os" in
|
||||
openbsd2.[89] | openbsd2.[89].*)
|
||||
case $host_os in
|
||||
openbsd2.[89] | openbsd2.[89].*)
|
||||
|
||||
@ -1,85 +1,55 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
|
||||
--- ltmain.sh.orig Tue Feb 11 04:15:04 2003
|
||||
+++ ltmain.sh Wed Apr 30 18:07:10 2003
|
||||
@@ -1062,6 +1062,17 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1502,6 +1513,10 @@ compiler."
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
+ -pthread)
|
||||
+ continue
|
||||
+ ;;
|
||||
+
|
||||
%DEPLIBS%)
|
||||
alldeplibs=yes
|
||||
continue
|
||||
@@ -1747,11 +1762,6 @@ compiler."
|
||||
continue
|
||||
fi
|
||||
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2004/05/08 06:42:59 sturm Exp $
|
||||
--- ltmain.sh.orig 2004-04-25 08:54:43.000000000 +0200
|
||||
+++ ltmain.sh 2004-04-25 08:57:13.000000000 +0200
|
||||
@@ -2249,10 +2249,6 @@ EOF
|
||||
link_static=no # Whether the deplib will be linked statically
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
- if test "$installed" = no; then
|
||||
- notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
- fi
|
||||
-
|
||||
if test -n "$old_archive_from_expsyms_cmds"; then
|
||||
# figure out the soname
|
||||
set dummy $library_names
|
||||
@@ -4491,40 +4501,6 @@ relink_command=\"$relink_command\""
|
||||
# This is a shared library
|
||||
|
||||
# Warn about portability, can't link against -module's on some systems (darwin)
|
||||
@@ -5764,40 +5760,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = ":" && exit 0
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
- $echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- $echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- $echo
|
||||
- $echo "If you ever happen to want to link against installed libraries"
|
||||
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
- $echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- $echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- $echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- $echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- $echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- $echo
|
||||
- $echo "See any operating system documentation about shared libraries for"
|
||||
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_misc_c,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
|
||||
--- src/misc.c.orig Wed Apr 30 20:40:32 2003
|
||||
+++ src/misc.c Wed Apr 30 20:40:40 2003
|
||||
@@ -26,7 +26,7 @@
|
||||
$OpenBSD: patch-src_misc_c,v 1.2 2004/05/08 06:42:59 sturm Exp $
|
||||
--- src/misc.c.orig 2003-11-13 13:53:02.000000000 +0100
|
||||
+++ src/misc.c 2004-04-25 08:57:39.000000000 +0200
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <time.h>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-tests_t-stream_c,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
|
||||
--- tests/t-stream.c.orig Wed Apr 30 18:27:42 2003
|
||||
+++ tests/t-stream.c Wed Apr 30 18:34:09 2003
|
||||
$OpenBSD: patch-tests_t-stream_c,v 1.2 2004/05/08 06:42:59 sturm Exp $
|
||||
--- tests/t-stream.c.orig 2003-10-31 08:11:49.000000000 +0100
|
||||
+++ tests/t-stream.c 2004-04-25 08:57:39.000000000 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-tests_t-stream_c,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
@@ -288,7 +289,7 @@ get_sig_time (unsigned long timestamp)
|
||||
@@ -289,7 +290,7 @@ get_sig_time (unsigned long timestamp)
|
||||
static char buf[128];
|
||||
struct tm * tmbuf;
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
|
||||
lib/libopencdk.so.6.1
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/05/08 06:42:59 sturm Exp $
|
||||
lib/libopencdk.so.8.0
|
||||
DYNLIBDIR(%D/lib)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user