diff options
| -rw-r--r-- | security/botan/Makefile | 15 | ||||
| -rw-r--r-- | security/botan/distinfo | 6 | ||||
| -rw-r--r-- | security/botan/files/patch-configure.pl | 23 | ||||
| -rw-r--r-- | security/botan/files/patch-modules::tm_posix.cpp | 11 | ||||
| -rw-r--r-- | security/botan/pkg-plist | 45 |
5 files changed, 28 insertions, 72 deletions
diff --git a/security/botan/Makefile b/security/botan/Makefile index 0450dccece1f..54ff81e37b08 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -7,7 +7,7 @@ # PORTNAME= botan -PORTVERSION= 1.4.12 +PORTVERSION= 1.6.5 CATEGORIES= security MASTER_SITES= http://files.randombit.net/botan/ DISTNAME= Botan-${PORTVERSION} @@ -33,15 +33,4 @@ DOCSDIR= ${PREFIX}/share/doc/Botan-${PORTVERSION} PORTDOCS= * .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500035 -CONFIGURE_ARGS+= --noauto -PLIST_SUB+= OS_4="@comment " -.else -PLIST_SUB+= OS_4="" -post-patch: - @${FIND} ${WRKSRC} -name '*.orig' -delete -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/botan/distinfo b/security/botan/distinfo index d42c629028bc..ff2406e42500 100644 --- a/security/botan/distinfo +++ b/security/botan/distinfo @@ -1,3 +1,3 @@ -MD5 (Botan-1.4.12.tbz) = bae76134b231b92cf4c5d596ee54a8c5 -SHA256 (Botan-1.4.12.tbz) = c07adb0af7aa2ba66ba790f6acec1313b70311632ddad8d0cbb82eb92f582b3c -SIZE (Botan-1.4.12.tbz) = 1660513 +MD5 (Botan-1.6.5.tbz) = a1976699cdc29e1ff387120f9981c1fb +SHA256 (Botan-1.6.5.tbz) = f36b8fc0daa0f402e1f1f946fdbd934407ad8a7b42f27302c01429c02c8f184e +SIZE (Botan-1.6.5.tbz) = 1705959 diff --git a/security/botan/files/patch-configure.pl b/security/botan/files/patch-configure.pl deleted file mode 100644 index c870d521ffaf..000000000000 --- a/security/botan/files/patch-configure.pl +++ /dev/null @@ -1,23 +0,0 @@ ---- configure.pl.orig Mon Jan 16 12:13:55 2006 -+++ configure.pl Sat Apr 15 15:48:03 2006 -@@ -74,7 +74,6 @@ - 'deprecated.txt' => $DOC_DIR, - 'license.txt' => $DOC_DIR, - 'log.txt' => $DOC_DIR, -- 'rngs.txt' => $DOC_DIR, - 'thanks.txt' => $DOC_DIR, - 'todo.txt' => $DOC_DIR - ); -@@ -2040,7 +2039,11 @@ - my $link_to = "-lm"; - foreach my $lib (@{ $lib_list }) - { -- $link_to .= " -l" . $lib; -+ if ($lib =~ m/pthread/) { -+ $link_to .= " -" . $lib; -+ } else { -+ $link_to .= " -l" . $lib; -+ } - } - - ################################################## diff --git a/security/botan/files/patch-modules::tm_posix.cpp b/security/botan/files/patch-modules::tm_posix.cpp deleted file mode 100644 index 4d39bdedc9e9..000000000000 --- a/security/botan/files/patch-modules::tm_posix.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/tm_posix/tm_posix.cpp.orig Sat Jun 26 14:32:53 2004 -+++ modules/tm_posix/tm_posix.cpp Fri Jul 16 16:32:28 2004 -@@ -6,7 +6,7 @@ - #define _POSIX_C_SOURCE 199309 - #include <botan/tm_posix.h> - #include <botan/util.h> --#include <time.h> -+#include <sys/time.h> - - #ifndef CLOCK_REALTIME - #define CLOCK_REALTIME 0 diff --git a/security/botan/pkg-plist b/security/botan/pkg-plist index 0c97fa1fb66a..070cbd462f31 100644 --- a/security/botan/pkg-plist +++ b/security/botan/pkg-plist @@ -2,13 +2,12 @@ bin/botan-config include/botan/adler32.h include/botan/aes.h -include/botan/algolist.h +include/botan/alg_id.h include/botan/allocate.h include/botan/arc4.h -include/botan/asn1.h +include/botan/asn1_int.h include/botan/asn1_obj.h include/botan/asn1_oid.h -include/botan/barrett.h include/botan/base.h include/botan/base64.h include/botan/basefilt.h @@ -18,9 +17,9 @@ include/botan/bit_ops.h include/botan/blinding.h include/botan/blowfish.h include/botan/botan.h -include/botan/botan.py include/botan/buf_es.h include/botan/buf_filt.h +include/botan/build.h include/botan/cast128.h include/botan/cast256.h include/botan/cbc.h @@ -28,7 +27,6 @@ include/botan/certstor.h include/botan/cfb.h include/botan/charset.h include/botan/cmac.h -include/botan/conf.h include/botan/config.h include/botan/crc24.h include/botan/crc32.h @@ -37,13 +35,15 @@ include/botan/ctr.h include/botan/cts.h include/botan/data_snk.h include/botan/data_src.h -include/botan/def_eng.h +include/botan/datastor.h +include/botan/def_char.h +include/botan/def_powm.h include/botan/defalloc.h include/botan/der_enc.h include/botan/des.h include/botan/dh.h include/botan/dl_algo.h -include/botan/dl_param.h +include/botan/dl_group.h include/botan/dlies.h include/botan/dsa.h include/botan/eax.h @@ -51,14 +51,14 @@ include/botan/ecb.h include/botan/elgamal.h include/botan/eme.h include/botan/emsa.h +include/botan/eng_def.h include/botan/engine.h include/botan/enums.h -%%OS_4%%include/botan/es_egd.h +include/botan/es_egd.h include/botan/es_file.h -%%OS_4%%include/botan/es_ftw.h -%%OS_4%%include/botan/es_unix.h +include/botan/es_ftw.h include/botan/exceptn.h -%%OS_4%%include/botan/fd_unix.h +include/botan/fd_unix.h include/botan/filter.h include/botan/filters.h include/botan/fips140.h @@ -66,16 +66,15 @@ include/botan/fork256.h include/botan/gost.h include/botan/has160.h include/botan/hash_id.h -include/botan/haval.h include/botan/hex.h include/botan/hmac.h include/botan/idea.h include/botan/if_algo.h include/botan/init.h -include/botan/isaac.h include/botan/kasumi.h include/botan/kdf.h include/botan/keypair.h +include/botan/libstate.h include/botan/lion.h include/botan/look_add.h include/botan/look_pk.h @@ -90,15 +89,16 @@ include/botan/mem_ops.h include/botan/mem_pool.h include/botan/mgf1.h include/botan/misty1.h -%%OS_4%%include/botan/mmap_mem.h -include/botan/mod_exp.h +include/botan/mmap_mem.h include/botan/mode_pad.h include/botan/modebase.h +include/botan/modules.h +include/botan/mp_asm.h +include/botan/mp_asmi.h include/botan/mp_core.h -include/botan/mp_madd.h include/botan/mp_types.h include/botan/mutex.h -%%OS_4%%include/botan/mux_pthr.h +include/botan/mux_pthr.h include/botan/nr.h include/botan/numthry.h include/botan/ofb.h @@ -121,6 +121,7 @@ include/botan/pk_util.h include/botan/pkcs10.h include/botan/pkcs5.h include/botan/pkcs8.h +include/botan/pow_mod.h include/botan/pubkey.h include/botan/randpool.h include/botan/rc2.h @@ -134,7 +135,6 @@ include/botan/rsa.h include/botan/rw.h include/botan/s2k.h include/botan/safer_sk.h -include/botan/seal.h include/botan/secmem.h include/botan/secqueue.h include/botan/seed.h @@ -144,33 +144,34 @@ include/botan/sha256.h include/botan/sha_64.h include/botan/skipjack.h include/botan/square.h +include/botan/stl_util.h include/botan/symkey.h include/botan/tea.h include/botan/tiger.h include/botan/timers.h +include/botan/tm_unix.h include/botan/turing.h -%%OS_4%%include/botan/tm_unix.h include/botan/twofish.h include/botan/types.h include/botan/ui.h -%%OS_4%%include/botan/unix_cmd.h include/botan/util.h include/botan/version.h include/botan/whrlpool.h include/botan/wid_wake.h include/botan/x509_ca.h include/botan/x509_crl.h +include/botan/x509_ext.h include/botan/x509_key.h include/botan/x509_obj.h include/botan/x509cert.h +include/botan/x509find.h include/botan/x509self.h +include/botan/x509stat.h include/botan/x509stor.h include/botan/x919_mac.h include/botan/x931_rng.h include/botan/xtea.h lib/libbotan-%%PORTVERSION%%.so -lib/libbotan-1.4.so -lib/libbotan-1.so lib/libbotan.a lib/libbotan.so @dirrm include/botan |