Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next

2026-04-28 03:33:25 +02:00 · 2010-03-09 21:46:44 +01:00
parent 0b34d1a225 48cd21cdc0
commit 2f2b526964
7 changed files with 84 additions and 15 deletions
--- 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
--- 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
--- 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