From: Michael Tremer Date: Tue, 9 Mar 2010 20:46:44 +0000 (+0100) Subject: Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.9-beta1~412^2~39 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=2f2b526964081aab5872404691c2c3615e45da12;hp=0b34d1a225efdf278a72abb9d5a8eaed6bd206df Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next --- diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index d7df625e98..e6abdc2b56 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -740,6 +740,8 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_proxy_http.html.en #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en +#srv/web/ipfire/manual/mod/mod_reqtimeout.html +#srv/web/ipfire/manual/mod/mod_reqtimeout.html.en #srv/web/ipfire/manual/mod/mod_rewrite.html #srv/web/ipfire/manual/mod/mod_rewrite.html.en #srv/web/ipfire/manual/mod/mod_setenvif.html @@ -1242,6 +1244,7 @@ usr/lib/apache/mod_proxy_connect.so usr/lib/apache/mod_proxy_ftp.so usr/lib/apache/mod_proxy_http.so usr/lib/apache/mod_proxy_scgi.so +usr/lib/apache/mod_reqtimeout.so usr/lib/apache/mod_rewrite.so usr/lib/apache/mod_setenvif.so usr/lib/apache/mod_speling.so @@ -1259,7 +1262,7 @@ usr/lib/apache/mod_vhost_alias.so #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.3.9 +usr/lib/libapr-1.so.0.4.2 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index e86c53b966..faae91839f 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -19,8 +19,8 @@ usr/bin/ssh-keyscan #usr/lib/openssh usr/lib/openssh/sftp-server usr/lib/openssh/ssh-keysign +usr/lib/openssh/ssh-pkcs11-helper usr/sbin/sshd -#usr/share/Ssh.bin #usr/share/man/man1/scp.1 #usr/share/man/man1/sftp.1 #usr/share/man/man1/slogin.1 @@ -34,4 +34,5 @@ usr/sbin/sshd #usr/share/man/man5/sshd_config.5 #usr/share/man/man8/sftp-server.8 #usr/share/man/man8/ssh-keysign.8 +#usr/share/man/man8/ssh-pkcs11-helper.8 #usr/share/man/man8/sshd.8 diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index 016e84193d..c075845f62 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -39,8 +39,6 @@ usr/bin/openssl #usr/include/openssl/engine.h #usr/include/openssl/err.h #usr/include/openssl/evp.h -#usr/include/openssl/fips.h -#usr/include/openssl/fips_rand.h #usr/include/openssl/hmac.h #usr/include/openssl/idea.h #usr/include/openssl/krb5_asn.h @@ -94,8 +92,6 @@ usr/bin/openssl #usr/lib/engines/libnuron.so #usr/lib/engines/libsureware.so #usr/lib/engines/libubsec.so -#usr/lib/fips_premain.c -#usr/lib/fips_premain.c.sha1 #usr/lib/libcrypto.a usr/lib/libcrypto.so usr/lib/libcrypto.so.0.9.8 @@ -659,6 +655,72 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/OpenSSL_add_all_digests.3 #usr/share/man/man3/OpenSSL_add_ssl_algorithms.3 #usr/share/man/man3/PEM.3 +#usr/share/man/man3/PEM_read_DHparams.3 +#usr/share/man/man3/PEM_read_DSAPrivateKey.3 +#usr/share/man/man3/PEM_read_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_DSAparams.3 +#usr/share/man/man3/PEM_read_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_read_PKCS7.3 +#usr/share/man/man3/PEM_read_PUBKEY.3 +#usr/share/man/man3/PEM_read_PrivateKey.3 +#usr/share/man/man3/PEM_read_RSAPrivateKey.3 +#usr/share/man/man3/PEM_read_RSAPublicKey.3 +#usr/share/man/man3/PEM_read_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_X509.3 +#usr/share/man/man3/PEM_read_X509_AUX.3 +#usr/share/man/man3/PEM_read_X509_CRL.3 +#usr/share/man/man3/PEM_read_X509_REQ.3 +#usr/share/man/man3/PEM_read_bio_DHparams.3 +#usr/share/man/man3/PEM_read_bio_DSAPrivateKey.3 +#usr/share/man/man3/PEM_read_bio_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_bio_DSAparams.3 +#usr/share/man/man3/PEM_read_bio_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_read_bio_PKCS7.3 +#usr/share/man/man3/PEM_read_bio_PUBKEY.3 +#usr/share/man/man3/PEM_read_bio_PrivateKey.3 +#usr/share/man/man3/PEM_read_bio_RSAPrivateKey.3 +#usr/share/man/man3/PEM_read_bio_RSAPublicKey.3 +#usr/share/man/man3/PEM_read_bio_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_read_bio_X509.3 +#usr/share/man/man3/PEM_read_bio_X509_AUX.3 +#usr/share/man/man3/PEM_read_bio_X509_CRL.3 +#usr/share/man/man3/PEM_read_bio_X509_REQ.3 +#usr/share/man/man3/PEM_write_DHparams.3 +#usr/share/man/man3/PEM_write_DSAPrivateKey.3 +#usr/share/man/man3/PEM_write_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_DSAparams.3 +#usr/share/man/man3/PEM_write_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_write_PKCS7.3 +#usr/share/man/man3/PEM_write_PKCS8PrivateKey.3 +#usr/share/man/man3/PEM_write_PKCS8PrivateKey_nid.3 +#usr/share/man/man3/PEM_write_PUBKEY.3 +#usr/share/man/man3/PEM_write_PrivateKey.3 +#usr/share/man/man3/PEM_write_RSAPrivateKey.3 +#usr/share/man/man3/PEM_write_RSAPublicKey.3 +#usr/share/man/man3/PEM_write_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_X509.3 +#usr/share/man/man3/PEM_write_X509_AUX.3 +#usr/share/man/man3/PEM_write_X509_CRL.3 +#usr/share/man/man3/PEM_write_X509_REQ.3 +#usr/share/man/man3/PEM_write_X509_REQ_NEW.3 +#usr/share/man/man3/PEM_write_bio_DHparams.3 +#usr/share/man/man3/PEM_write_bio_DSAPrivateKey.3 +#usr/share/man/man3/PEM_write_bio_DSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_bio_DSAparams.3 +#usr/share/man/man3/PEM_write_bio_NETSCAPE_CERT_SEQUENCE.3 +#usr/share/man/man3/PEM_write_bio_PKCS7.3 +#usr/share/man/man3/PEM_write_bio_PKCS8PrivateKey.3 +#usr/share/man/man3/PEM_write_bio_PKCS8PrivateKey_nid.3 +#usr/share/man/man3/PEM_write_bio_PUBKEY.3 +#usr/share/man/man3/PEM_write_bio_PrivateKey.3 +#usr/share/man/man3/PEM_write_bio_RSAPrivateKey.3 +#usr/share/man/man3/PEM_write_bio_RSAPublicKey.3 +#usr/share/man/man3/PEM_write_bio_RSA_PUBKEY.3 +#usr/share/man/man3/PEM_write_bio_X509.3 +#usr/share/man/man3/PEM_write_bio_X509_AUX.3 +#usr/share/man/man3/PEM_write_bio_X509_CRL.3 +#usr/share/man/man3/PEM_write_bio_X509_REQ.3 +#usr/share/man/man3/PEM_write_bio_X509_REQ_NEW.3 #usr/share/man/man3/PKCS12_create.3 #usr/share/man/man3/PKCS12_parse.3 #usr/share/man/man3/PKCS7_decrypt.3 @@ -741,6 +803,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/SSL_CTX_add_session.3 #usr/share/man/man3/SSL_CTX_callback_ctrl.3 #usr/share/man/man3/SSL_CTX_check_private_key.3 +#usr/share/man/man3/SSL_CTX_clear_options.3 #usr/share/man/man3/SSL_CTX_ctrl.3 #usr/share/man/man3/SSL_CTX_flush_sessions.3 #usr/share/man/man3/SSL_CTX_free.3 @@ -838,6 +901,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/SSL_callback_ctrl.3 #usr/share/man/man3/SSL_check_private_key.3 #usr/share/man/man3/SSL_clear.3 +#usr/share/man/man3/SSL_clear_options.3 #usr/share/man/man3/SSL_connect.3 #usr/share/man/man3/SSL_ctrl.3 #usr/share/man/man3/SSL_do_handshake.3 @@ -868,6 +932,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/SSL_get_peer_certificate.3 #usr/share/man/man3/SSL_get_quiet_shutdown.3 #usr/share/man/man3/SSL_get_rbio.3 +#usr/share/man/man3/SSL_get_secure_renegotiation_support.3 #usr/share/man/man3/SSL_get_session.3 #usr/share/man/man3/SSL_get_shutdown.3 #usr/share/man/man3/SSL_get_ssl_method.3 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d2130b6900..8f02a4c12d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -132,7 +132,7 @@ * hostapd-0.6.9 * hplip-2.7.10 * htop-0.8.1 -* httpd-2.2.14 +* httpd-2.2.15 * hwdata * iana-etc-2.10 * icecast-2.3.2 @@ -247,8 +247,8 @@ * open-vm-tools-2009.05.22-167859 * openldap-2.3.20 * openmailadmin-1.0.0 -* openssh-5.3p1 -* openssl-0.9.8l +* openssh-5.4p1 +* openssl-0.9.8m * openswan-2.6.24 * openswan-2.6.24-kmod-2.6.32.9-ipfire * openswan-2.6.24-kmod-2.6.32.9-ipfire-xen diff --git a/lfs/apache2 b/lfs/apache2 index 94c38c72ed..920bccdb4b 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.2.14 +VER = 2.2.15 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = a5226203aaf97e5b941c41a71c112704 +$(DL_FILE)_MD5 = 016cec97337eccead2aad6a7c27f2e14 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index c64cd5692a..ffcf476818 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 5.3p1 +VER = 5.4p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 13563dbf61f36ca9a1e4254260131041 +$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index 878f52b0ce..96c66bbb84 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 0.9.8l +VER = 0.9.8m THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 05a0ece1372392a2cf310ebb96333025 +$(DL_FILE)_MD5 = 898bf125370926d5f692a2201124f8ec install : $(TARGET)