update some packages to latest upstream

- openssh, aircrack-ng, autoconf, lighttpd
- use mplayer svn version

12 files changed, 69 insertions, 117 deletions

diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index e5803b003..2bf5163eb 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		5.2p1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		ada79c7328a8551bdf55c95e631e7dad
+PKG_VERSION:=		5.3p1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		13563dbf61f36ca9a1e4254260131041
 PKG_DESCR:=		OpenSSH server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib libopenssl
diff --git a/package/openssh/patches/patch-auth2-jpake_c b/package/openssh/patches/patch-auth2-jpake_c
index 3ea529fce..c5e444523 100644
--- a/package/openssh/patches/patch-auth2-jpake_c
+++ b/package/openssh/patches/patch-auth2-jpake_c
@@ -1,6 +1,6 @@
---- openssh-5.2p1.orig/auth2-jpake.c	2008-11-11 06:33:03.000000000 +0100
-+++ openssh-5.2p1/auth2-jpake.c	2009-09-18 12:28:10.000000000 +0200
-@@ -172,7 +172,7 @@ derive_rawsalt(const char *username, u_c
+--- openssh-5.3p1.orig/auth2-jpake.c	2009-06-21 11:50:08.000000000 +0200
++++ openssh-5.3p1/auth2-jpake.c	2009-12-05 12:10:19.000000000 +0100
+@@ -173,7 +173,7 @@ derive_rawsalt(const char *username, u_c
  		fatal("%s: not enough bytes for rawsalt (want %u have %u)",
  		    __func__, len, digest_len);
  	memcpy(rawsalt, digest, len);
@@ -9,7 +9,7 @@
  	xfree(digest);
  }
  
-@@ -197,10 +197,10 @@ makesalt(u_int want, const char *user)
+@@ -198,10 +198,10 @@ makesalt(u_int want, const char *user)
  		fatal("%s: want %u", __func__, want);
  
  	derive_rawsalt(user, rawsalt, sizeof(rawsalt));
@@ -22,7 +22,7 @@
  
  	return ret;
  }
-@@ -354,7 +354,7 @@ auth2_jpake_get_pwdata(Authctxt *authctx
+@@ -355,7 +355,7 @@ auth2_jpake_get_pwdata(Authctxt *authctx
  	debug3("%s: scheme = %s", __func__, *hash_scheme);
  	JPAKE_DEBUG_BN((*s, "%s: s = ", __func__));
  #endif
@@ -31,7 +31,7 @@
  	xfree(secret);
  }
  
-@@ -395,12 +395,12 @@ auth2_jpake_start(Authctxt *authctxt)
+@@ -396,12 +396,12 @@ auth2_jpake_start(Authctxt *authctxt)
  	packet_send();
  	packet_write_wait();
  
@@ -48,7 +48,7 @@
  	xfree(x3_proof);
  	xfree(x4_proof);
  
-@@ -447,8 +447,8 @@ input_userauth_jpake_client_step1(int ty
+@@ -448,8 +448,8 @@ input_userauth_jpake_client_step1(int ty
  	    &pctx->b,
  	    &x4_s_proof, &x4_s_proof_len));
  
@@ -59,7 +59,7 @@
  	xfree(x1_proof);
  	xfree(x2_proof);
  
-@@ -462,7 +462,7 @@ input_userauth_jpake_client_step1(int ty
+@@ -463,7 +463,7 @@ input_userauth_jpake_client_step1(int ty
  	packet_send();
  	packet_write_wait();
  
@@ -68,7 +68,7 @@
  	xfree(x4_s_proof);
  
  	/* Expect step 2 packet from peer */
-@@ -503,7 +503,7 @@ input_userauth_jpake_client_step2(int ty
+@@ -504,7 +504,7 @@ input_userauth_jpake_client_step2(int ty
  	    &pctx->k,
  	    &pctx->h_k_sid_sessid, &pctx->h_k_sid_sessid_len));
  
diff --git a/package/openssh/patches/patch-channels_c b/package/openssh/patches/patch-channels_c
index 3712809e4..babf434b3 100644
--- a/package/openssh/patches/patch-channels_c
+++ b/package/openssh/patches/patch-channels_c
@@ -1,5 +1,5 @@
---- openssh-5.2p1.orig/channels.c	2009-02-14 06:28:21.000000000 +0100
-+++ openssh-5.2p1/channels.c	2009-09-18 12:29:28.000000000 +0200
+--- openssh-5.3p1.orig/channels.c	2009-08-28 03:02:37.000000000 +0200
++++ openssh-5.3p1/channels.c	2009-12-05 12:10:19.000000000 +0100
 @@ -411,7 +411,7 @@ channel_free(Channel *c)
  		if (cc->abandon_cb != NULL)
  			cc->abandon_cb(c, cc->ctx);
@@ -9,7 +9,7 @@
  		xfree(cc);
  	}
  	if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
-@@ -2447,7 +2447,7 @@ channel_input_status_confirm(int type, u
+@@ -2449,7 +2449,7 @@ channel_input_status_confirm(int type, u
  		return;
  	cc->cb(type, c, cc->ctx);
  	TAILQ_REMOVE(&c->status_confirms, cc, entry);
@@ -18,7 +18,7 @@
  	xfree(cc);
  }
  
-@@ -2941,7 +2941,7 @@ channel_connect_ctx_free(struct channel_
+@@ -2943,7 +2943,7 @@ channel_connect_ctx_free(struct channel_
  	xfree(cctx->host);
  	if (cctx->aitop)
  		freeaddrinfo(cctx->aitop);
diff --git a/package/openssh/patches/patch-clientloop_c b/package/openssh/patches/patch-clientloop_c
index 1da1d31c9..cdd0615d6 100644
--- a/package/openssh/patches/patch-clientloop_c
+++ b/package/openssh/patches/patch-clientloop_c
@@ -1,6 +1,6 @@
---- openssh-5.2p1.orig/clientloop.c	2009-02-14 06:28:21.000000000 +0100
-+++ openssh-5.2p1/clientloop.c	2009-09-18 12:28:59.000000000 +0200
-@@ -487,7 +487,7 @@ client_global_request_reply(int type, u_
+--- openssh-5.3p1.orig/clientloop.c	2009-08-28 03:21:07.000000000 +0200
++++ openssh-5.3p1/clientloop.c	2009-12-05 12:10:19.000000000 +0100
+@@ -488,7 +488,7 @@ client_global_request_reply(int type, u_
  		gc->cb(type, seq, gc->ctx);
  	if (--gc->ref_count <= 0) {
  		TAILQ_REMOVE(&global_confirms, gc, entry);
@@ -9,7 +9,7 @@
  		xfree(gc);
  	}
  
-@@ -768,7 +768,7 @@ process_cmdline(void)
+@@ -769,7 +769,7 @@ process_cmdline(void)
  	int cancel_port;
  	Forward fwd;
  
diff --git a/package/openssh/patches/patch-configure b/package/openssh/patches/patch-configure
deleted file mode 100644
index aa0b7af45..000000000
--- a/package/openssh/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openssh-5.2p1.orig/configure	2009-02-23 01:18:14.000000000 +0100
-+++ openssh-5.2p1/configure	2009-05-01 12:34:00.000000000 +0200
-@@ -26712,7 +26712,7 @@ echo "${ECHO_T}yes" >&6; }
- #define HEIMDAL 1
- _ACEOF
- 
--					 K5LIBS="-lkrb5 -ldes"
-+					 K5LIBS="-lkrb5"
- 					 K5LIBS="$K5LIBS -lcom_err -lasn1"
- 					 { echo "$as_me:$LINENO: checking for net_write in -lroken" >&5
- echo $ECHO_N "checking for net_write in -lroken... $ECHO_C" >&6; }
diff --git a/package/openssh/patches/patch-jpake_c b/package/openssh/patches/patch-jpake_c
index 37b69ee45..c4dfdedce 100644
--- a/package/openssh/patches/patch-jpake_c
+++ b/package/openssh/patches/patch-jpake_c
@@ -1,15 +1,6 @@
---- openssh-5.2p1.orig/jpake.c	2008-11-05 06:20:46.000000000 +0100
-+++ openssh-5.2p1/jpake.c	2009-09-18 12:26:24.000000000 +0200
-@@ -160,7 +160,7 @@ hash_buffer(const u_char *buf, u_int len
- 	success = 0;
-  out:
- 	EVP_MD_CTX_cleanup(&evp_md_ctx);
--	bzero(digest, sizeof(digest));
-+	memset(digest, 0, sizeof(digest));
- 	digest_len = 0;
- 	return success;
- }
-@@ -259,7 +259,7 @@ jpake_free(struct jpake_ctx *pctx)
+--- openssh-5.3p1.orig/jpake.c	2009-03-05 14:58:22.000000000 +0100
++++ openssh-5.3p1/jpake.c	2009-12-05 12:10:19.000000000 +0100
+@@ -104,7 +104,7 @@ jpake_free(struct jpake_ctx *pctx)
  #define JPAKE_BUF_CLEAR_FREE(v, l)		\
  	do {					\
  		if ((v) != NULL) {		\
@@ -18,7 +9,7 @@
  			xfree(v);		\
  			(v) = NULL;		\
  			(l) = 0;		\
-@@ -287,7 +287,7 @@ jpake_free(struct jpake_ctx *pctx)
+@@ -132,7 +132,7 @@ jpake_free(struct jpake_ctx *pctx)
  #undef JPAKE_BN_CLEAR_FREE
  #undef JPAKE_BUF_CLEAR_FREE
  
@@ -27,7 +18,7 @@
  	xfree(pctx);
  }
  
-@@ -592,7 +592,7 @@ jpake_check_confirm(const BIGNUM *k,
+@@ -437,7 +437,7 @@ jpake_check_confirm(const BIGNUM *k,
  	else if (memcmp(peer_confirm_hash, expected_confirm_hash,
  	    expected_confirm_hash_len) == 0)
  		success = 1;
diff --git a/package/openssh/patches/patch-monitor_c b/package/openssh/patches/patch-monitor_c
index 8992b3e6e..db7e7a370 100644
--- a/package/openssh/patches/patch-monitor_c
+++ b/package/openssh/patches/patch-monitor_c
@@ -1,6 +1,6 @@
---- openssh-5.2p1.orig/monitor.c	2009-02-14 06:33:31.000000000 +0100
-+++ openssh-5.2p1/monitor.c	2009-09-18 12:31:53.000000000 +0200
-@@ -2029,8 +2029,8 @@ mm_answer_jpake_step1(int sock, Buffer *
+--- openssh-5.3p1.orig/monitor.c	2009-06-21 10:58:46.000000000 +0200
++++ openssh-5.3p1/monitor.c	2009-12-05 12:10:19.000000000 +0100
+@@ -2042,8 +2042,8 @@ mm_answer_jpake_step1(int sock, Buffer *
  	debug3("%s: sending step1", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m);
  
@@ -11,7 +11,7 @@
  	xfree(x3_proof);
  	xfree(x4_proof);
  
-@@ -2059,8 +2059,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf
+@@ -2072,8 +2072,8 @@ mm_answer_jpake_get_pwdata(int sock, Buf
  	debug3("%s: sending pwdata", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m);
  
@@ -22,7 +22,7 @@
  	xfree(hash_scheme);
  	xfree(salt);
  
-@@ -2099,8 +2099,8 @@ mm_answer_jpake_step2(int sock, Buffer *
+@@ -2112,8 +2112,8 @@ mm_answer_jpake_step2(int sock, Buffer *
  
  	JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__));
  
@@ -33,7 +33,7 @@
  	xfree(x1_proof);
  	xfree(x2_proof);
  
-@@ -2112,7 +2112,7 @@ mm_answer_jpake_step2(int sock, Buffer *
+@@ -2125,7 +2125,7 @@ mm_answer_jpake_step2(int sock, Buffer *
  	debug3("%s: sending step2", __func__);
  	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m);
  
@@ -42,7 +42,7 @@
  	xfree(x4_s_proof);
  
  	monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);
-@@ -2146,7 +2146,7 @@ mm_answer_jpake_key_confirm(int sock, Bu
+@@ -2159,7 +2159,7 @@ mm_answer_jpake_key_confirm(int sock, Bu
  
  	JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__));
  
@@ -51,7 +51,7 @@
  	buffer_clear(m);
  
  	/* pctx->k is sensitive, not sent */
-@@ -2180,7 +2180,7 @@ mm_answer_jpake_check_confirm(int sock, 
+@@ -2193,7 +2193,7 @@ mm_answer_jpake_check_confirm(int sock, 
  
  	JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__));
  
diff --git a/package/openssh/patches/patch-myproposal_h b/package/openssh/patches/patch-myproposal_h
deleted file mode 100644
index 38345863e..000000000
--- a/package/openssh/patches/patch-myproposal_h
+++ /dev/null
@@ -1,45 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openssh-5.2p1.orig/myproposal.h	2009-01-28 06:33:31.000000000 +0100
-+++ openssh-5.2p1/myproposal.h	2009-05-01 14:00:47.000000000 +0200
-@@ -42,15 +42,35 @@
- 
- #define	KEX_DEFAULT_PK_ALG	"ssh-rsa,ssh-dss"
- 
-+
-+#ifndef OPENSSL_NO_AES192
-+#define KEX_ENCRYPT_AES192	",aes192-ctr,aes192-cbc"
-+#else
-+#define KEX_ENCRYPT_AES192
-+#endif
-+#ifndef OPENSSL_NO_BF
-+#define KEX_ENCRYPT_BF		",blowfish-cbc"
-+#else
-+#define KEX_ENCRYPT_BF
-+#endif
-+#ifndef OPENSSL_NO_CAST 
-+#define KEX_ENCRYPT_CAST	",cast128-cbc"
-+#define KEX_MAC_CAST		",hmac-ripemd160,hmac-ripemd160@openssh.com"
-+#else
-+#define KEX_ENCRYPT_CAST
-+#define KEX_MAC_CAST
-+#endif
-+
- #define	KEX_DEFAULT_ENCRYPT \
--	"aes128-ctr,aes192-ctr,aes256-ctr," \
-+	"aes128-ctr,aes256-ctr," \
- 	"arcfour256,arcfour128," \
--	"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
--	"aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
-+	"aes128-cbc,3des-cbc," \
-+	"aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" \
-+	 KEX_ENCRYPT_AES192 KEX_ENCRYPT_BF KEX_ENCRYPT_CAST
- #define	KEX_DEFAULT_MAC \
--	"hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \
--	"hmac-ripemd160@openssh.com," \
--	"hmac-sha1-96,hmac-md5-96"
-+	"hmac-md5,hmac-sha1,umac-64@openssh.com," \
-+	"hmac-sha1-96,hmac-md5-96" \
-+	KEX_MAC_CAST
- #define	KEX_DEFAULT_COMP	"none,zlib@openssh.com,zlib"
- #define	KEX_DEFAULT_LANG	""
- 
diff --git a/package/openssh/patches/patch-schnorr_c b/package/openssh/patches/patch-schnorr_c
index aff2497ba..8a9e4a950 100644
--- a/package/openssh/patches/patch-schnorr_c
+++ b/package/openssh/patches/patch-schnorr_c
@@ -1,11 +1,29 @@
---- openssh-5.2p1.orig/schnorr.c	2009-02-21 02:45:18.000000000 +0100
-+++ openssh-5.2p1/schnorr.c	2009-09-18 12:28:29.000000000 +0200
-@@ -105,7 +105,7 @@ schnorr_hash(const BIGNUM *p, const BIGN
+--- openssh-5.3p1.orig/schnorr.c	2009-03-07 02:01:47.000000000 +0100
++++ openssh-5.3p1/schnorr.c	2009-12-05 12:10:08.000000000 +0100
+@@ -101,7 +101,7 @@ schnorr_hash(const BIGNUM *p, const BIGN
+ 	SCHNORR_DEBUG_BN((h, "%s: h = ", __func__));
   out:
  	buffer_free(&b);
- 	EVP_MD_CTX_cleanup(&evp_md_ctx);
 -	bzero(digest, digest_len);
 +	memset(digest, 0, digest_len);
  	xfree(digest);
  	digest_len = 0;
  	if (success == 0)
+@@ -451,7 +451,7 @@ hash_buffer(const u_char *buf, u_int len
+ 	success = 0;
+  out:
+ 	EVP_MD_CTX_cleanup(&evp_md_ctx);
+-	bzero(digest, sizeof(digest));
++	memset(digest, 0, sizeof(digest));
+ 	digest_len = 0;
+ 	return success;
+ }
+@@ -544,7 +544,7 @@ modp_group_free(struct modp_group *grp)
+ 		BN_clear_free(grp->p);
+ 	if (grp->q != NULL)
+ 		BN_clear_free(grp->q);
+-	bzero(grp, sizeof(*grp));
++	memset(grp, 0, sizeof(*grp));
+ 	xfree(grp);
+ }
+ 
diff --git a/package/openssh/patches/patch-session_c b/package/openssh/patches/patch-session_c
index ea9508cfd..fd1e879b3 100644
--- a/package/openssh/patches/patch-session_c
+++ b/package/openssh/patches/patch-session_c
@@ -1,6 +1,6 @@
---- openssh-5.2p1.orig/session.c	2009-01-28 06:29:49.000000000 +0100
-+++ openssh-5.2p1/session.c	2009-09-18 12:25:29.000000000 +0200
-@@ -1865,7 +1865,7 @@ session_unused(int id)
+--- openssh-5.3p1.orig/session.c	2009-08-20 08:20:50.000000000 +0200
++++ openssh-5.3p1/session.c	2009-12-05 12:10:19.000000000 +0100
+@@ -1859,7 +1859,7 @@ session_unused(int id)
  		fatal("%s: insane session id %d (max %d nalloc %d)",
  		    __func__, id, options.max_sessions, sessions_nalloc);
  	}
diff --git a/package/openssh/patches/patch-ssh_c b/package/openssh/patches/patch-ssh_c
index 486429320..d9edf659e 100644
--- a/package/openssh/patches/patch-ssh_c
+++ b/package/openssh/patches/patch-ssh_c
@@ -1,6 +1,6 @@
---- openssh-5.2p1.orig/ssh.c	2009-02-14 06:28:21.000000000 +0100
-+++ openssh-5.2p1/ssh.c	2009-09-18 12:26:46.000000000 +0200
-@@ -1277,8 +1277,8 @@ load_public_identity_files(void)
+--- openssh-5.3p1.orig/ssh.c	2009-07-05 23:16:56.000000000 +0200
++++ openssh-5.3p1/ssh.c	2009-12-05 12:10:19.000000000 +0100
+@@ -1280,8 +1280,8 @@ load_public_identity_files(void)
  		options.identity_files[i] = filename;
  		options.identity_keys[i] = public;
  	}
diff --git a/package/openssh/patches/patch-sshconnect2_c b/package/openssh/patches/patch-sshconnect2_c
index 405989001..1e6f16b1f 100644
--- a/package/openssh/patches/patch-sshconnect2_c
+++ b/package/openssh/patches/patch-sshconnect2_c
@@ -1,6 +1,6 @@
---- openssh-5.2p1.orig/sshconnect2.c	2008-11-05 06:20:47.000000000 +0100
-+++ openssh-5.2p1/sshconnect2.c	2009-09-18 12:30:37.000000000 +0200
-@@ -921,14 +921,14 @@ jpake_password_to_secret(Authctxt *authc
+--- openssh-5.3p1.orig/sshconnect2.c	2009-03-05 14:58:22.000000000 +0100
++++ openssh-5.3p1/sshconnect2.c	2009-12-05 12:10:19.000000000 +0100
+@@ -922,14 +922,14 @@ jpake_password_to_secret(Authctxt *authc
  	    &secret, &secret_len) != 0)
  		fatal("%s: hash_buffer", __func__);
  
@@ -18,7 +18,7 @@
  	xfree(secret);
  
  	return ret;
-@@ -965,8 +965,8 @@ input_userauth_jpake_server_step1(int ty
+@@ -966,8 +966,8 @@ input_userauth_jpake_server_step1(int ty
  
  	/* Obtain password and derive secret */
  	pctx->s = jpake_password_to_secret(authctxt, crypt_scheme, salt);
@@ -29,7 +29,7 @@
  	xfree(crypt_scheme);
  	xfree(salt);
  	JPAKE_DEBUG_BN((pctx->s, "%s: s = ", __func__));
-@@ -981,8 +981,8 @@ input_userauth_jpake_server_step1(int ty
+@@ -982,8 +982,8 @@ input_userauth_jpake_server_step1(int ty
  	    &pctx->a,
  	    &x2_s_proof, &x2_s_proof_len);
  
@@ -40,7 +40,7 @@
  	xfree(x3_proof);
  	xfree(x4_proof);
  
-@@ -994,7 +994,7 @@ input_userauth_jpake_server_step1(int ty
+@@ -995,7 +995,7 @@ input_userauth_jpake_server_step1(int ty
  	packet_put_string(x2_s_proof, x2_s_proof_len);
  	packet_send();
  
@@ -49,7 +49,7 @@
  	xfree(x2_s_proof);
  
  	/* Expect step 2 packet from peer */
-@@ -1034,7 +1034,7 @@ input_userauth_jpake_server_step2(int ty
+@@ -1035,7 +1035,7 @@ input_userauth_jpake_server_step2(int ty
  	    &pctx->k,
  	    &pctx->h_k_cid_sessid, &pctx->h_k_cid_sessid_len);
  
@@ -58,7 +58,7 @@
  	xfree(x4_s_proof);
  
  	JPAKE_DEBUG_CTX((pctx, "confirm sending in %s", __func__));
-@@ -1700,8 +1700,8 @@ userauth_jpake(Authctxt *authctxt)
+@@ -1701,8 +1701,8 @@ userauth_jpake(Authctxt *authctxt)
  	packet_put_string(x2_proof, x2_proof_len);
  	packet_send();