OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Oct-2005 11:34:44
Branch: HEAD Handle: 2005101410344400
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
fix building under Solaris by using u_intX local typedefs instead of
relying on BSD-style u_intX_t system typedefs
Summary:
Revision Changes Path
1.13 +71 -0 openpkg-src/flowtools/flowtools.patch
1.20 +1 -1 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 27 Sep 2005 12:44:19 -0000
1.12
+++ openpkg-src/flowtools/flowtools.patch 14 Oct 2005 09:34:44 -0000
1.13
@@ -543,3 +543,74 @@
return ret;
} else {
+Index: flow-tools-0.68/lib/ftxlate.c
+--- flow-tools-0.68/lib/ftxlate.c.orig 2005-05-11 16:03:30.000000000
+0200
++++ flow-tools-0.68/lib/ftxlate.c 2005-10-14 11:30:05.597516466 +0200
+@@ -66,15 +66,15 @@
+ #endif
+
+ struct cryptopan {
+- u_int8_t m_key[16]; /* 128 bit secret key */
+- u_int8_t m_pad[16]; /* 128 bit secret pad */
++ u_int8 m_key[16]; /* 128 bit secret key */
++ u_int8 m_pad[16]; /* 128 bit secret pad */
+ #ifdef HAVE_OPENSSL
+ EVP_CIPHER_CTX *cipher_ctx; /* openssl cipher context */
+ #endif /* HAVE_OPENSSL */
+ };
+
+-static int cryptopan_anon(struct cryptopan *cp, u_int32_t orig_addr,
+- u_int32_t *new_addr);
++static int cryptopan_anon(struct cryptopan *cp, u_int32 orig_addr,
++ u_int32 *new_addr);
+ static int cryptopan_free(struct cryptopan *cp);
+ static int cryptopan_init(struct cryptopan *cp, unsigned char *key);
+
+@@ -2095,12 +2095,12 @@
+ * returns: 0 okay
+ * -1 fail
+ */
+-static int cryptopan_anon(struct cryptopan *cp, u_int32_t orig_addr,
u_int32_t *new_addr)
++static int cryptopan_anon(struct cryptopan *cp, u_int32 orig_addr, u_int32
*new_addr)
+ {
+- u_int8_t rin_output[16];
+- u_int8_t rin_input[16];
+- u_int8_t *m_pad;
+- u_int32_t result, first4bytes_pad, first4bytes_input;
++ u_int8 rin_output[16];
++ u_int8 rin_input[16];
++ u_int8 *m_pad;
++ u_int32 result, first4bytes_pad, first4bytes_input;
+ int i, pos;
+
+ result = 0;
+@@ -2108,10 +2108,10 @@
+
+ bcopy(m_pad, rin_input, 16);
+
+- first4bytes_pad = (((u_int32_t) m_pad[0]) << 24) +
+- (((u_int32_t) m_pad[1]) << 16) +
+- (((u_int32_t) m_pad[2]) << 8) +
+- (u_int32_t) m_pad[3];
++ first4bytes_pad = (((u_int32) m_pad[0]) << 24) +
++ (((u_int32) m_pad[1]) << 16) +
++ (((u_int32) m_pad[2]) << 8) +
++ (u_int32) m_pad[3];
+
+ /*
+ * For each prefixes with length from 0 to 31, generate a bit using the
+@@ -2134,10 +2134,10 @@
+ first4bytes_input = ((orig_addr >> (32-pos)) << (32-pos)) |
+ ((first4bytes_pad<<pos) >> pos);
+
+- rin_input[0] = (u_int8_t) (first4bytes_input >> 24);
+- rin_input[1] = (u_int8_t) ((first4bytes_input << 8) >> 24);
+- rin_input[2] = (u_int8_t) ((first4bytes_input << 16) >> 24);
+- rin_input[3] = (u_int8_t) ((first4bytes_input << 24) >> 24);
++ rin_input[0] = (u_int8) (first4bytes_input >> 24);
++ rin_input[1] = (u_int8) ((first4bytes_input << 8) >> 24);
++ rin_input[2] = (u_int8) ((first4bytes_input << 16) >> 24);
++ rin_input[3] = (u_int8) ((first4bytes_input << 24) >> 24);
+
+ /*
+ * Encryption: The Rijndael cipher is used as pseudorandom function.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 29 Sep 2005 08:12:20 -0000
1.19
+++ openpkg-src/flowtools/flowtools.spec 14 Oct 2005 09:34:44 -0000
1.20
@@ -38,7 +38,7 @@
Group: Network
License: BSD
Version: %{V_flowtools}
-Release: 20050929
+Release: 20051014
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
