From 32e335d7fcab82a2de3ac7b735bf3c5657eaf99f Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 7 Oct 2002 19:16:46 +0000 Subject: Use int32_t while dealing with sasldb version not long! This fix cyrus sasl on sparc64. Bump PKGREVISION. --- security/cyrus-sasl/Makefile | 4 +-- security/cyrus-sasl/distinfo | 6 ++-- security/cyrus-sasl/patches/patch-ag | 57 ++++++++++++++++++++++++++++++++++-- security/cyrus-sasl/patches/patch-ap | 55 ++++++++++++++++++++++++++++++++++ security/cyrus-sasl/patches/patch-aq | 35 ++++++++++++++++++++++ 5 files changed, 150 insertions(+), 7 deletions(-) create mode 100644 security/cyrus-sasl/patches/patch-ap create mode 100644 security/cyrus-sasl/patches/patch-aq (limited to 'security/cyrus-sasl') diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 5068d294d24..c098c7f4504 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2002/09/19 09:04:21 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2002/10/07 19:16:46 seb Exp $ DISTNAME= cyrus-sasl-1.5.27 SVR4_PKGNAME= csasl -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index f0593a3503f..cb80f7fe671 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/09/07 07:37:38 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/10/07 19:16:46 seb Exp $ SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes @@ -8,7 +8,7 @@ SHA1 (patch-ac) = b5f99dd4789c19e36c29bbc3fbf47c556e32876e SHA1 (patch-ad) = faa888873c16c3c322e110a6f90380748b138942 SHA1 (patch-ae) = b9f4295f80a64defe0381bce7def7b462bf5d196 SHA1 (patch-af) = 3910389c08f72aaea6c964dbb846843fc57889df -SHA1 (patch-ag) = acfc55182396a96d3fccdb93ba3c6207eb7c154f +SHA1 (patch-ag) = 9eed2d94c7c5546bcecf041c53f53fd51486c221 SHA1 (patch-ah) = 84bb1809f9d1914746ca02de3ffc55149c28dd75 SHA1 (patch-ai) = 55ade1200d2c5b8f20b4c1775d6c3b7d3b8ef278 SHA1 (patch-aj) = 386ebb6e33c93bed497b438b397e903200eb4549 @@ -17,3 +17,5 @@ SHA1 (patch-al) = c54b721c7cc69c1050600633d982e8a05d91e283 SHA1 (patch-am) = 95f01aad91729992d4189da87970e7d7d9cd4ceb SHA1 (patch-an) = 933c350c55361d71c0c3273efaf0b7804edf2eea SHA1 (patch-ao) = 63048c5d49a3e5dcc1065149864e567ef3cabb0e +SHA1 (patch-ap) = 074396e63f20f6457a7f95e29bb3c8c4e7b166ef +SHA1 (patch-aq) = d15cbbcc501a56407fb4cdfc08ef71bfb961f0a4 diff --git a/security/cyrus-sasl/patches/patch-ag b/security/cyrus-sasl/patches/patch-ag index ad8013ec6ca..2bdeeb7f62a 100644 --- a/security/cyrus-sasl/patches/patch-ag +++ b/security/cyrus-sasl/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2000/12/10 09:43:38 jlam Exp $ +$NetBSD: patch-ag,v 1.2 2002/10/07 19:16:47 seb Exp $ ---- plugins/cram.c.orig Sat Mar 11 21:20:00 2000 +--- plugins/cram.c.orig Sat Mar 10 06:56:44 2001 +++ plugins/cram.c -@@ -425,7 +425,7 @@ +@@ -425,7 +425,7 @@ static int server_continue_step (void *c HMAC_MD5_CTX tmphmac; char *digest_str = NULL; @@ -11,3 +11,54 @@ $NetBSD: patch-ag,v 1.1 2000/12/10 09:43:38 jlam Exp $ VL(("CRAM-MD5 Step 2\n")); VL(("Clientin: %s\n",clientin)); +@@ -572,7 +572,7 @@ static int mechanism_db_filled(char *mec + int result; + sasl_server_getsecret_t *getsecret; + void *getsecret_context; +- long version = -1; ++ int32_t version = -1; + + /* get callback so we can request the secret */ + result = utils->getcallback(utils->conn, +@@ -597,8 +597,8 @@ static int mechanism_db_filled(char *mec + + /* check version */ + if (sec != NULL) { +- if (sec->len >= 4) { +- memcpy(&version, sec->data, 4); ++ if (sec->len >= sizeof(int32_t)) { ++ memcpy(&version, sec->data, sizeof(int32_t)); + version = ntohl(version); + } + free(sec); +@@ -633,7 +633,7 @@ static int mechanism_fill_db(char *mech_ + sasl_server_putsecret_t *putsecret; + void *putsecret_context; + sasl_secret_t *sec = NULL; +- long version; ++ int32_t version; + + /* don't do this again if it's already set */ + if (mydb_initialized == 1) +@@ -652,18 +652,18 @@ static int mechanism_fill_db(char *mech_ + + /* allocate a secret structure that we're going to save to disk */ + sec=(sasl_secret_t *) sparams->utils->malloc(sizeof(sasl_secret_t)+ +- 4); ++ sizeof(int32_t)); + if (sec == NULL) { + result = SASL_NOMEM; + return result; + } + + /* set the size */ +- sec->len = 4; ++ sec->len = sizeof(int32_t); + + /* and insert the data */ + version = htonl(CRAM_MD5_VERSION); +- memcpy(sec->data, &version, 4); ++ memcpy(sec->data, &version, sizeof(int32_t)); + + /* do the store */ + result = putsecret(putsecret_context, diff --git a/security/cyrus-sasl/patches/patch-ap b/security/cyrus-sasl/patches/patch-ap new file mode 100644 index 00000000000..435f6101617 --- /dev/null +++ b/security/cyrus-sasl/patches/patch-ap @@ -0,0 +1,55 @@ +$NetBSD: patch-ap,v 1.1 2002/10/07 19:16:48 seb Exp $ + +--- plugins/digestmd5.c.orig Sat Mar 10 12:07:21 2001 ++++ plugins/digestmd5.c +@@ -2714,7 +2714,7 @@ static int mechanism_db_filled(char *mec + int result; + sasl_server_getsecret_t *getsecret; + void *getsecret_context; +- long tmpversion = -1; ++ int32_t tmpversion = -1; + + /* get callback so we can request the secret */ + result = utils->getcallback(utils->conn, +@@ -2738,8 +2738,8 @@ static int mechanism_db_filled(char *mec + /* check version */ + if (sec != NULL) + { +- if (sec->len >= 4) { +- memcpy(&tmpversion, sec->data, 4); ++ if (sec->len >= sizeof(int32_t)) { ++ memcpy(&tmpversion, sec->data, sizeof(int32_t)); + tmpversion = ntohl(tmpversion); + } + free(sec); +@@ -2776,7 +2776,7 @@ static int mechanism_db_filled(char *mec + static int mechanism_fill_db(char *mech_name, sasl_server_params_t *sparams) + { + int result; +- long tmpversion; ++ int32_t tmpversion; + sasl_server_putsecret_t *putsecret; + void *putsecret_context; + sasl_secret_t *sec = NULL; +@@ -2798,18 +2798,18 @@ static int mechanism_fill_db(char *mech_ + + /* allocate a secret structure that we're going to save to disk */ + sec=(sasl_secret_t *) sparams->utils->malloc(sizeof(sasl_secret_t)+ +- 4); ++ sizeof(int32_t)); + if (sec == NULL) { + result = SASL_NOMEM; + return result; + } + + /* set the size */ +- sec->len = 4; ++ sec->len = sizeof(int32_t); + + /* and insert the data */ + tmpversion = htonl(DIGEST_MD5_VERSION); +- memcpy(sec->data, &tmpversion, 4); ++ memcpy(sec->data, &tmpversion, sizeof(int32_t)); + + /* do the store */ + result = putsecret(putsecret_context, diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq new file mode 100644 index 00000000000..e2490fb2d4e --- /dev/null +++ b/security/cyrus-sasl/patches/patch-aq @@ -0,0 +1,35 @@ +$NetBSD: patch-aq,v 1.1 2002/10/07 19:16:49 seb Exp $ + +--- plugins/srp.c.orig Mon Apr 10 00:54:11 2000 ++++ plugins/srp.c +@@ -1243,7 +1243,7 @@ static int mechanism_fill_db(char *mech_ + sasl_server_putsecret_t *putsecret; + void *putsecret_context; + sasl_secret_t *sec = NULL; +- long version; ++ int32_t version; + + /* don't do this again if it's already set */ + if (mydb_initialized == 1) +@@ -1262,18 +1262,18 @@ static int mechanism_fill_db(char *mech_ + + /* allocate a secret structure that we're going to save to disk */ + sec=(sasl_secret_t *) sparams->utils->malloc(sizeof(sasl_secret_t)+ +- 4); ++ sizeof(int32_t)); + if (sec == NULL) { + result = SASL_NOMEM; + return result; + } + + /* set the size */ +- sec->len = 4; ++ sec->len = sizeof(int32_t); + + /* and insert the data */ + version = htonl(SRP_VERSION); +- memcpy(sec->data, &version, 4); ++ memcpy(sec->data, &version, sizeof(int32_t)); + + /* do the store */ + result = putsecret(putsecret_context, -- cgit v1.2.3