head 1.15; access; symbols; locks; strict; comment @# @; 1.15 date 2009.08.07.12.07.33; author rse; state Exp; branches; next 1.14; commitid vHpDkCLDadZh8LYt; 1.14 date 2009.07.11.20.37.11; author rse; state Exp; branches; next 1.13; commitid Atz254DOapjVOkVt; 1.13 date 2008.11.10.21.58.53; author rse; state Exp; branches; next 1.12; commitid W6tttfS4DZoe57qt; 1.12 date 2008.10.23.07.20.02; author rse; state Exp; branches; next 1.11; commitid XTtCARbC5nUANInt; 1.11 date 2008.10.10.17.08.41; author rse; state Exp; branches; next 1.10; commitid ZmeWLQt1FNWrt6mt; 1.10 date 2008.10.08.06.59.47; author rse; state Exp; branches; next 1.9; commitid 2siBdHcX5xqyaNlt; 1.9 date 2008.10.01.17.46.49; author rse; state Exp; branches; next 1.8; commitid QB0JDPIvQTQsYWkt; 1.8 date 2008.09.18.18.13.45; author rse; state Exp; branches; next 1.7; commitid FXFIVNsO9ciCxhjt; 1.7 date 2008.09.12.17.55.11; author rse; state Exp; branches; next 1.6; commitid 9dlZNDxQkwLcDvit; 1.6 date 2008.09.06.07.52.32; author rse; state Exp; branches; next 1.5; commitid f7kJWKCiqePpuGht; 1.5 date 2008.05.05.18.01.55; author rse; state Exp; branches; next 1.4; commitid 8HLmnHbWmaPzQN1t; 1.4 date 2008.03.10.21.25.00; author rse; state Exp; branches; next 1.3; commitid IFWDnlUu05OQLCUs; 1.3 date 2008.01.23.20.05.27; author rse; state Exp; branches; next 1.2; commitid j8z5izX99LJdQzOs; 1.2 date 2007.10.26.15.58.56; author rse; state Exp; branches; next 1.1; commitid 6ewTLIWH31t2l7Ds; 1.1 date 2007.03.02.08.01.28; author rse; state Exp; branches; next ; commitid XDBvJC1jU3rxlu8s; desc @@ 1.15 log @workaround architecture detection for at least FreeBSD/amd64 and fix substitution @ text @Index: configure.pl --- configure.pl.orig 2009-07-23 20:03:04 +0200 +++ configure.pl 2009-08-07 14:02:36 +0200 @@@@ -2305,7 +2305,7 @@@@ } my $uname = $$config{'uname'}; - if($uname ne '') { + if($uname ne '' and $uname !~ m/FreeBSD/) { my $cpu = guess_cpu_from_this($uname); if($cpu ne '') Index: src/build-data/cc/gcc --- src/build-data/cc/gcc.orig 2009-07-23 20:03:05 +0200 +++ src/build-data/cc/gcc 2009-08-07 14:01:16 +0200 @@@@ -10,8 +10,8 @@@@ add_lib_dir_option "-L" add_lib_option "-l" -lang_flags "-D_REENTRANT -ansi -Wno-long-long" -warning_flags "-W -Wall" +lang_flags "-D_REENTRANT -Wno-long-long" +warning_flags "" #warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter" lib_opt_flags "-O2 -finline-functions" Index: src/build-data/makefile/unix.in --- src/build-data/makefile/unix.in.orig 2009-07-23 20:03:05 +0200 +++ src/build-data/makefile/unix.in 2009-08-07 14:01:16 +0200 @@@@ -22,7 +22,7 @@@@ BINDIR = $(DESTDIR)/bin LIBDIR = $(DESTDIR)/%{libdir} HEADERDIR = $(DESTDIR)/%{includedir}/botan -DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) +DOCDIR = $(DESTDIR)/%{docdir} PKGCONF_DIR = $(LIBDIR)/pkgconfig CONFIG_SCRIPT = %{botan_config} Index: src/utils/types.h --- src/utils/types.h.orig 2009-07-23 20:03:06 +0200 +++ src/utils/types.h 2009-08-07 14:01:16 +0200 @@@@ -22,7 +22,7 @@@@ typedef unsigned __int64 u64bit; #elif defined(__KCC) typedef unsigned __long_long u64bit; -#elif defined(__GNUG__) +#elif defined(__GNUC__) __extension__ typedef unsigned long long u64bit; #else typedef unsigned long long u64bit; @ 1.14 log @upgrading package: botan 1.8.1 -> 1.8.3 @ text @d1 12 d14 2 a15 2 --- src/build-data/cc/gcc.orig 2009-07-11 17:41:26 +0200 +++ src/build-data/cc/gcc 2009-07-11 22:29:13 +0200 d28 2 a29 2 --- src/build-data/makefile/unix.in.orig 2009-07-11 17:41:26 +0200 +++ src/build-data/makefile/unix.in 2009-07-11 22:31:35 +0200 d40 2 a41 2 --- src/utils/types.h.orig 2009-07-11 17:41:27 +0200 +++ src/utils/types.h 2009-07-11 22:29:13 +0200 @ 1.13 log @upgrading package: botan 1.7.19 -> 1.7.20 @ text @d2 3 a4 3 --- src/build-data/cc/gcc.orig 2008-11-09 19:14:48 +0100 +++ src/build-data/cc/gcc 2008-11-10 22:07:42 +0100 @@@@ -8,8 +8,8 @@@@ d16 3 a18 3 --- src/build-data/makefile/unix.in.orig 2008-11-09 19:14:48 +0100 +++ src/build-data/makefile/unix.in 2008-11-10 22:07:42 +0100 @@@@ -26,7 +26,7 @@@@ d20 4 a23 4 LIBDIR = $(DESTDIR)/@@{var:libdir} HEADERDIR = $(DESTDIR)/@@{var:includedir}/botan -DOCDIR = $(DESTDIR)/@@{var:docdir}/Botan-$(VERSION) +DOCDIR = $(DESTDIR)/@@{var:docdir} d26 1 a26 1 CONFIG_SCRIPT = @@{var:botan-config} d28 3 a30 3 --- src/utils/types.h.orig 2008-11-09 19:14:49 +0100 +++ src/utils/types.h 2008-11-10 22:07:42 +0100 @@@@ -20,7 +20,7 @@@@ @ 1.12 log @upgrading package: botan 1.7.17 -> 1.7.18 @ text @d2 2 a3 2 --- src/build-data/cc/gcc.orig 2008-10-23 01:46:15 +0200 +++ src/build-data/cc/gcc 2008-10-23 08:56:18 +0200 d16 2 a17 2 --- src/build-data/makefile/unix.in.orig 2008-10-23 01:46:15 +0200 +++ src/build-data/makefile/unix.in 2008-10-23 09:15:20 +0200 a26 7 @@@@ -122,4 +122,4 @@@@ done $(INSTALL_CMD_DATA) $(STATIC_LIB) $(LIBDIR) $(INSTALL_CMD_EXEC) $(CONFIG_SCRIPT) $(BINDIR) - $(INSTALL_CMD_DATA) $(PKGCONFIG) $(PKGCONF_DIR) \ No newline at end of file + $(INSTALL_CMD_DATA) $(PKGCONFIG) $(PKGCONF_DIR) d28 2 a29 2 --- src/utils/types.h.orig 2008-10-23 01:46:16 +0200 +++ src/utils/types.h 2008-10-23 08:56:18 +0200 @ 1.11 log @upgrading package: botan 1.7.15 -> 1.7.16 @ text @d2 2 a3 2 --- src/build-data/cc/gcc.orig 2008-10-09 15:52:30 +0200 +++ src/build-data/cc/gcc 2008-10-10 18:52:56 +0200 d16 2 a17 2 --- src/build-data/makefile/unix.in.orig 2008-10-09 15:52:30 +0200 +++ src/build-data/makefile/unix.in 2008-10-10 18:50:19 +0200 d24 1 d27 7 a33 1 d35 2 a36 2 --- src/utils/types.h.orig 2008-10-09 15:52:31 +0200 +++ src/utils/types.h 2008-10-10 18:50:19 +0200 @ 1.10 log @upgrading package: botan 1.7.14 -> 1.7.15 @ text @d2 2 a3 2 --- src/build-data/cc/gcc.orig 2008-10-07 23:13:19 +0200 +++ src/build-data/cc/gcc 2008-10-08 08:33:47 +0200 d12 1 a12 1 #warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter" d16 2 a17 2 --- src/build-data/makefile/unix.in.orig 2008-10-07 23:13:19 +0200 +++ src/build-data/makefile/unix.in 2008-10-08 08:34:11 +0200 d28 2 a29 2 --- src/utils/types.h.orig 2008-10-07 23:13:21 +0200 +++ src/utils/types.h 2008-10-08 08:29:40 +0200 @ 1.9 log @upgrading package: botan 1.7.13 -> 1.7.14 @ text @d2 2 a3 2 --- src/build-data/cc/gcc.orig 2008-09-30 18:59:48 +0200 +++ src/build-data/cc/gcc 2008-10-01 19:45:12 +0200 d12 1 a12 1 #warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations" d16 2 a17 2 --- src/build-data/makefile/unix.in.orig 2008-09-30 18:59:48 +0200 +++ src/build-data/makefile/unix.in 2008-10-01 19:45:12 +0200 d19 5 a23 5 BINDIR = $(INSTALLROOT)/bin LIBDIR = $(INSTALLROOT)/@@{var:libdir} HEADERDIR = $(INSTALLROOT)/@@{var:includedir}/botan -DOCDIR = $(INSTALLROOT)/@@{var:docdir}/Botan-$(VERSION) +DOCDIR = $(INSTALLROOT)/@@{var:docdir} d28 2 a29 2 --- src/utils/types.h.orig 2008-09-30 18:59:48 +0200 +++ src/utils/types.h 2008-10-01 19:45:12 +0200 @ 1.8 log @upgrading package: botan 1.7.11 -> 1.7.12 @ text @d1 3 a3 15 Index: include/types.h --- include/types.h.orig 2008-09-18 16:48:26 +0200 +++ include/types.h 2008-09-18 19:54:39 +0200 @@@@ -20,7 +20,7 @@@@ typedef unsigned __int64 u64bit; #elif defined(__KCC) typedef unsigned __long_long u64bit; -#elif defined(__GNUG__) +#elif defined(__GNUC__) __extension__ typedef unsigned long long u64bit; #else typedef unsigned long long u64bit; Index: misc/config/cc/gcc --- misc/config/cc/gcc.orig 2008-09-18 16:48:26 +0200 +++ misc/config/cc/gcc 2008-09-18 19:56:23 +0200 d15 3 a17 3 Index: misc/config/makefile/unix.in --- misc/config/makefile/unix.in.orig 2008-09-18 16:48:26 +0200 +++ misc/config/makefile/unix.in 2008-09-18 19:54:39 +0200 d27 12 @ 1.7 log @upgrading package: botan 1.7.10 -> 1.7.11 @ text @d2 2 a3 2 --- include/types.h.orig 2008-09-11 23:10:24 +0200 +++ include/types.h 2008-09-12 19:44:10 +0200 d14 2 a15 2 --- misc/config/cc/gcc.orig 2008-09-11 23:10:24 +0200 +++ misc/config/cc/gcc 2008-09-12 19:51:32 +0200 d24 1 a26 1 check_opt_flags "-O2" d28 2 a29 2 --- misc/config/makefile/unix.in.orig 2008-09-11 23:10:24 +0200 +++ misc/config/makefile/unix.in 2008-09-12 19:44:10 +0200 @ 1.6 log @upgrading package: botan 1.7.9 -> 1.7.10 @ text @d2 2 a3 2 --- include/types.h.orig 2008-09-06 00:39:52 +0200 +++ include/types.h 2008-09-06 09:22:51 +0200 d14 2 a15 2 --- misc/config/cc/gcc.orig 2008-09-06 00:39:53 +0200 +++ misc/config/cc/gcc 2008-09-06 09:43:03 +0200 a23 1 #warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow -Wcast-qual -Wmissing-declarations" d26 1 d28 2 a29 2 --- misc/config/makefile/unix.in.orig 2008-09-06 00:39:53 +0200 +++ misc/config/makefile/unix.in 2008-09-06 09:22:51 +0200 @ 1.5 log @upgrading package: botan 1.7.5 -> 1.7.6 @ text @d2 2 a3 2 --- include/types.h.orig 2008-05-05 15:09:54 +0200 +++ include/types.h 2008-05-05 19:53:59 +0200 d14 2 a15 2 --- misc/config/cc/gcc.orig 2008-05-05 15:09:54 +0200 +++ misc/config/cc/gcc 2008-05-05 19:55:07 +0200 d24 1 a26 1 check_opt_flags "-O2" d28 2 a29 2 --- misc/config/makefile/unix.in.orig 2008-05-05 15:09:54 +0200 +++ misc/config/makefile/unix.in 2008-05-05 19:53:59 +0200 @ 1.4 log @upgrading package: botan 1.7.3 -> 1.7.4 @ text @d2 2 a3 2 --- include/types.h.orig 2008-03-10 18:27:28 +0100 +++ include/types.h 2008-03-10 22:21:25 +0100 d14 5 a18 3 --- misc/config/cc/gcc.orig 2008-03-10 18:27:28 +0100 +++ misc/config/cc/gcc 2008-03-10 22:22:00 +0100 @@@@ -10,8 +10,8 @@@@ a19 2 lib_opt_flags "-O2 -finline-functions" check_opt_flags "-O2" d25 2 a26 2 so_obj_flags "-fPIC" debug_flags "-g" d28 2 a29 2 --- misc/config/makefile/unix.in.orig 2008-03-10 18:27:28 +0100 +++ misc/config/makefile/unix.in 2008-03-10 22:21:25 +0100 d37 2 a38 2 OWNER = @@{var:install_user} GROUP = @@{var:install_group} @ 1.3 log @upgrading package: botan 1.7.2 -> 1.7.3 @ text @d2 2 a3 2 --- include/types.h.orig 2008-01-23 15:10:39 +0100 +++ include/types.h 2008-01-23 20:52:30 +0100 d14 2 a15 2 --- misc/config/cc/gcc.orig 2008-01-23 15:10:39 +0100 +++ misc/config/cc/gcc 2008-01-23 20:55:53 +0100 d21 2 a22 2 -warning_flags "-Wextra -Wall -Wcast-align -Wcast-qual -Wstrict-aliasing=2 -Wold-style-cast -Wundef -Wpointer-arith -Wredundant-decls -Wdisabled-optimization" +lang_flags "-D_REENTRANT" d28 2 a29 2 --- misc/config/makefile/unix.in.orig 2008-01-23 15:10:39 +0100 +++ misc/config/makefile/unix.in 2008-01-23 20:52:30 +0100 @ 1.2 log @upgrading package: botan 1.7.0 -> 1.7.2 @ text @d1 12 d14 2 a15 2 --- misc/config/cc/gcc.orig 2007-07-23 18:11:54 +0200 +++ misc/config/cc/gcc 2007-09-05 08:24:07 +0200 d21 2 a22 2 -warning_flags "-W -Wall" +lang_flags "-D_REENTRANT" d28 2 a29 2 --- misc/config/makefile/unix.in.orig 2007-07-23 18:11:54 +0200 +++ misc/config/makefile/unix.in 2007-09-05 08:23:05 +0200 a38 12 Index: include/types.h --- include/types.h.orig 2007-07-23 18:11:53 +0200 +++ include/types.h 2007-09-05 08:27:30 +0200 @@@@ -20,7 +20,7 @@@@ typedef unsigned __int64 u64bit; #elif defined(__KCC) typedef unsigned __long_long u64bit; -#elif defined(__GNUG__) +#elif defined(__GNUC__) __extension__ typedef unsigned long long u64bit; #else typedef unsigned long long u64bit; @ 1.1 log @new package: botan 1.6.1 (C++ Cryptography Library) @ text @d1 14 d16 2 a17 2 --- misc/config/makefile/unix.in.orig 2007-01-20 11:57:30 +0100 +++ misc/config/makefile/unix.in 2007-03-02 08:55:38 +0100 d27 12 @