diff --git a/www-apache/mod_admserv/Manifest b/www-apache/mod_admserv/Manifest
new file mode 100644
index 00000000..757c4c2c
--- /dev/null
+++ b/www-apache/mod_admserv/Manifest
@@ -0,0 +1,16 @@
+AUX 48_mod_admserv.conf 2203 RMD160 78dc946a243ba783e4895c9a5ee7262ae312ac13 SHA1 9b1d91f1a4f3d2c25aca34fa2660edf3a09211d9 SHA256 e6483197a7ae278cf2cc3ede66bfda68265e37de1d2c9a566a2de06d1e8462ec
+MD5 c436627c47261be99603ab1aef3b5fb7 files/48_mod_admserv.conf 2203
+RMD160 78dc946a243ba783e4895c9a5ee7262ae312ac13 files/48_mod_admserv.conf 2203
+SHA256 e6483197a7ae278cf2cc3ede66bfda68265e37de1d2c9a566a2de06d1e8462ec files/48_mod_admserv.conf 2203
+AUX mod_admserv-cvs.sh 322 RMD160 be52065129fd8c8f7826c11e2bf6cd6bcfc4162f SHA1 797653f0706ae8aaa91dcdc3597048ddb1542534 SHA256 5c9f64157085a5946ec80e33313a85bc28621efe7d5f19d950754b43c0e8098d
+MD5 d2acf6cd494e44c0c043db4462d905ea files/mod_admserv-cvs.sh 322
+RMD160 be52065129fd8c8f7826c11e2bf6cd6bcfc4162f files/mod_admserv-cvs.sh 322
+SHA256 5c9f64157085a5946ec80e33313a85bc28621efe7d5f19d950754b43c0e8098d files/mod_admserv-cvs.sh 322
+DIST mod_admserv-1.0-20070807.tar.bz2 234824 RMD160 d4805615a13659f4db7f90733a3b6501a99bd8fd SHA1 b54e0f13e8228cabc0086b69c39766dcd2f51bde SHA256 76dfa4b5cf7269277a1d9e4756342632dc5840c468eafb14089e846c545dfd8e
+EBUILD mod_admserv-1.0.20070807.ebuild 1035 RMD160 ba12218e663f073b8c5d854405e93ce09e2faf4a SHA1 d83f0e5ddc158cc39db95de118ab86c2825bf910 SHA256 93070a3a2c0277ad0df0ea213bc4dbaa217886b0dc9ab1041adf649e596ddae6
+MD5 d09584776a6418d351ef4b21fdd57aee mod_admserv-1.0.20070807.ebuild 1035
+RMD160 ba12218e663f073b8c5d854405e93ce09e2faf4a mod_admserv-1.0.20070807.ebuild 1035
+SHA256 93070a3a2c0277ad0df0ea213bc4dbaa217886b0dc9ab1041adf649e596ddae6 mod_admserv-1.0.20070807.ebuild 1035
+MD5 21554c28e797c89565d4aeb9091ef2ea files/digest-mod_admserv-1.0.20070807 277
+RMD160 f805a82f9f7106fae7b9b03b1ef12c8516f725bd files/digest-mod_admserv-1.0.20070807 277
+SHA256 a4a512ecdbdbfea3d19437c70d4aae4aee014f6eefd0702f49f130afcc0bafe0 files/digest-mod_admserv-1.0.20070807 277
diff --git a/www-apache/mod_admserv/files/48_mod_admserv.conf b/www-apache/mod_admserv/files/48_mod_admserv.conf
new file mode 100644
index 00000000..41864685
--- /dev/null
+++ b/www-apache/mod_admserv/files/48_mod_admserv.conf
@@ -0,0 +1,77 @@
+# BEGIN COPYRIGHT BLOCK
+#
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# END COPYRIGHT BLOCK
+
+# To get the Admin Express working properly, add the following to
+# apache, either directly or thru an Include /path/to/this.conf
+
+# These 2 need to be fixed/added in the main httpd.conf
+# LoadModule admserv_module modules/libmodadmserv.so
+# ServerTokens Minor
+
+SetEnv NETSITE_ROOT /opt/redhat-ds
+SetEnv ADMSERV_ROOT /opt/redhat-ds/admin-serv/config/
+
+ScriptAlias /clients/orgchart/bin/ "/opt/redhat-ds/clients/orgchart/bin/"
+ScriptAlias /clients/dsgw/bin/ "/opt/redhat-ds/clients/dsgw/bin/"
+ScriptAlias /bin/admin/admin/bin/ "/opt/redhat-ds/bin/admin/admin/bin/"
+ScriptAlias /dist/ "/opt/redhat-ds/dist/"
+
+
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+
+
+
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+ NESCompatEnv on
+
+
+
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+
+
+RewriteEngine on
+RewriteRule ^/$ /dist/download [R,L,QSA]
+
+# Handle the initial login
+
+ SetHandler user-auth
+ AuthUserFile /opt/redhat-ds/admin-serv/config/admpw
+ AuthType basic
+ AuthName "Admin Server"
+ Require valid-user
+
+
+# Handle Console tasks
+
+ AuthUserFile /home/rcrit/redhat-ds/admin-serv/config/admpw
+ AuthType basic
+ AuthName "Admin Server"
+ Require valid-user
+ Options +ExecCGI
+
+
diff --git a/www-apache/mod_admserv/files/digest-mod_admserv-1.0.20070807 b/www-apache/mod_admserv/files/digest-mod_admserv-1.0.20070807
new file mode 100644
index 00000000..a4eb2236
--- /dev/null
+++ b/www-apache/mod_admserv/files/digest-mod_admserv-1.0.20070807
@@ -0,0 +1,3 @@
+MD5 43d57912f75ed0dbe92898bd9fd15fc0 mod_admserv-1.0-20070807.tar.bz2 234824
+RMD160 d4805615a13659f4db7f90733a3b6501a99bd8fd mod_admserv-1.0-20070807.tar.bz2 234824
+SHA256 76dfa4b5cf7269277a1d9e4756342632dc5840c468eafb14089e846c545dfd8e mod_admserv-1.0-20070807.tar.bz2 234824
diff --git a/www-apache/mod_admserv/mod_admserv-1.0.20070807.ebuild b/www-apache/mod_admserv/mod_admserv-1.0.20070807.ebuild
new file mode 100644
index 00000000..8923629a
--- /dev/null
+++ b/www-apache/mod_admserv/mod_admserv-1.0.20070807.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit apache-module ssl-cert versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+
+KEYWORDS="amd64 ~sparc ~x86"
+
+DESCRIPTION="An Apache 2.0 module for implementing the admin server functionality required by Fedora Admin Server and Directory Server"
+HOMEPAGE="http://directory.fedora.redhat.com/"
+SRC_URI="ftp://mars.arge.at/fedora-ds/${PN}-${MY_PV}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/mozldap-6.0.2
+ >=net-nds/fedora-ds-adminutil-1.1.4
+ >=dev-libs/nss-3.11.4
+ >=dev-libs/nspr-4.6.4
+ >=dev-libs/icu-3.4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+APACHE2_MOD_CONF="48_${PN}"
+APACHE2_MOD_DEFINE="ADMSERV"
+
+DOCFILES="LICENSE NOTICE README"
+
+need_apache2
+
+src_compile() {
+ econf --with-apxs=${APXS2} \
+ || die "econf failed"
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ apache-module_src_install
+}
diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
new file mode 100644
index 00000000..f2ecc9da
--- /dev/null
+++ b/www-apache/mod_nss/Manifest
@@ -0,0 +1,16 @@
+AUX 47_mod_nss.conf 8602 RMD160 b7d527de532ad1248af59c5645a9c67c12eaafb8 SHA1 b44e9e718193dc1a980822009a813cedf2ee4132 SHA256 da0cbcbf0dac88d4a5415e854708bd8fef1ee7c5fb6c96e591c64ad1add9d594
+MD5 a45c299cb0a949c28837a47eb8147dd0 files/47_mod_nss.conf 8602
+RMD160 b7d527de532ad1248af59c5645a9c67c12eaafb8 files/47_mod_nss.conf 8602
+SHA256 da0cbcbf0dac88d4a5415e854708bd8fef1ee7c5fb6c96e591c64ad1add9d594 files/47_mod_nss.conf 8602
+AUX mod_nss-cvs.sh 314 RMD160 acab081bccba390040f97327ef09f9152caf1b13 SHA1 3812f30b8f76369698586aaafe0cd3baf65a627c SHA256 5385b15e22dfdd25825f18f36fdc9913348486c6c8a8b3fe948351a74f87f6dd
+MD5 1e78f986157ff5b793d80db42005ce9f files/mod_nss-cvs.sh 314
+RMD160 acab081bccba390040f97327ef09f9152caf1b13 files/mod_nss-cvs.sh 314
+SHA256 5385b15e22dfdd25825f18f36fdc9913348486c6c8a8b3fe948351a74f87f6dd files/mod_nss-cvs.sh 314
+DIST mod_nss-1.0-20070807.tar.bz2 299588 RMD160 e7149125a84fd787e051b5bbf322850d9878c18d SHA1 673da20dddd1c3cc6ebaaad159ceda2a3e0f8e1c SHA256 cc96181ee251e1951e23bca4998b709accb1564d5655a6cffe63c386179ceb11
+EBUILD mod_nss-1.0.20070807.ebuild 914 RMD160 0c89b6511c0bab8a7b93c6e05a4d047824a497bb SHA1 28b7db5c76144f4d0639eb733782807e011fb8e8 SHA256 a5969285482031a88f98e135738141c4c632497bd2c22ed60deba60351f4dcd6
+MD5 cc82a9e460cb43f5c4333852fa523c34 mod_nss-1.0.20070807.ebuild 914
+RMD160 0c89b6511c0bab8a7b93c6e05a4d047824a497bb mod_nss-1.0.20070807.ebuild 914
+SHA256 a5969285482031a88f98e135738141c4c632497bd2c22ed60deba60351f4dcd6 mod_nss-1.0.20070807.ebuild 914
+MD5 2783fd098e67b28bc5e134ada3845ff3 files/digest-mod_nss-1.0.20070807 265
+RMD160 84e0d2d51f5bb500fa4332ae583a930b3b4da129 files/digest-mod_nss-1.0.20070807 265
+SHA256 6e55a545407615bd3fe32d29e56962ee41205b760114b87513597f35680eb4f8 files/digest-mod_nss-1.0.20070807 265
diff --git a/www-apache/mod_nss/files/47_mod_nss.conf b/www-apache/mod_nss/files/47_mod_nss.conf
new file mode 100644
index 00000000..e08d196c
--- /dev/null
+++ b/www-apache/mod_nss/files/47_mod_nss.conf
@@ -0,0 +1,213 @@
+#
+# This is the Apache server configuration file providing SSL support using.
+# the mod_nss plugin. It contains the configuration directives to instruct
+# the server how to serve pages over an https connection.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do. They're here only as hints or reminders. If you are unsure
+# consult the online docs. You have been warned.
+#
+
+
+ LoadModule gnutls_module modules/mod_gnutls.so
+
+
+
+#
+# When we also provide SSL we have to listen to the
+# standard HTTP port (see above) and to the HTTPS port
+#
+# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
+# Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:8443"
+#
+Listen 8443
+
+##
+## SSL Global Context
+##
+## All SSL configuration in this context applies both to
+## the main server and all SSL-enabled virtual hosts.
+##
+
+#
+# Some MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl .crl
+
+# Pass Phrase Dialog:
+# Configure the pass phrase gathering process.
+# The filtering dialog program (`builtin' is a internal
+# terminal dialog) has to provide the pass phrase on stdout.
+NSSPassPhraseDialog builtin
+
+
+# Pass Phrase Helper:
+# This helper program stores the token password pins between
+# restarts of Apache.
+NSSPassPhraseHelper /usr/sbin/nss_pcache
+
+# Configure the SSL Session Cache.
+# NSSSessionCacheSize is the number of entries in the cache.
+# NSSSessionCacheTimeout is the SSL2 session timeout (in seconds).
+# NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds).
+NSSSessionCacheSize 10000
+NSSSessionCacheTimeout 100
+NSSSession3CacheTimeout 86400
+
+#
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the SSL library.
+# The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. Those platforms usually also provide a non-blocking
+# device, /dev/urandom, which may be used instead.
+#
+# This does not support seeding the RNG with each connection.
+
+NSSRandomSeed startup builtin
+#NSSRandomSeed startup file:/dev/random 512
+#NSSRandomSeed startup file:/dev/urandom 512
+
+
+
+
+
+##
+## SSL Virtual Host Context
+##
+
+
+
+# General setup for the virtual host
+#DocumentRoot "/usr/htdocs"
+#ServerName www.example.com:8443
+#ServerAdmin you@example.com
+
+# mod_nss can log to separate log files, you can choose to do that if you'd like
+# LogLevel is not inherited from httpd.conf.
+#ErrorLog /usr/logs/error_log
+#TransferLog /usr/logs/access_log
+LogLevel warn
+
+# SSL Engine Switch:
+# Enable/Disable SSL for this virtual host.
+NSSEngine on
+
+# SSL Cipher Suite:
+# List the ciphers that the client is permitted to negotiate.
+# See the mod_nss documentation for a complete list.
+
+# SSL 3 ciphers. SSL 2 is disabled by default.
+NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha
+
+# SSL 3 ciphers + ECC ciphers. SSL 2 is disabled by default.
+#
+# Comment out the NSSCipherSuite line above and use the one below if you have
+# ECC enabled NSS and mod_nss and want to use Elliptical Curve Cryptography
+#NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha,-ecdh_ecdsa_null_sha,+ecdh_ecdsa_rc4_128_sha,+ecdh_ecdsa_3des_sha,+ecdh_ecdsa_aes_128_sha,+ecdh_ecdsa_aes_256_sha,-ecdhe_ecdsa_null_sha,+ecdhe_ecdsa_rc4_128_sha,+ecdhe_ecdsa_3des_sha,+ecdhe_ecdsa_aes_128_sha,+ecdhe_ecdsa_aes_256_sha,-ecdh_rsa_null_sha,+ecdh_rsa_128_sha,+ecdh_rsa_3des_sha,+ecdh_rsa_aes_128_sha,+ecdh_rsa_aes_256_sha,-echde_rsa_null,+ecdhe_rsa_rc4_128_sha,+ecdhe_rsa_3des_sha,+ecdhe_rsa_aes_128_sha,+ecdhe_rsa_aes_256_sha
+
+NSSProtocol SSLv3,TLSv1
+
+# SSL Certificate Nickname:
+# The nickname of the RSA server certificate you are going to use.
+NSSNickname Server-Cert
+
+# SSL Certificate Nickname:
+# The nickname of the ECC server certificate you are going to use, if you
+# have an ECC-enabled version of NSS and mod_nss
+#NSSECCNickname Server-Cert-ecc
+
+# Server Certificate Database:
+# The NSS security database directory that holds the certificates and
+# keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
+# Provide the directory that these files exist.
+NSSCertificateDatabase /etc/apache2
+
+# Database Prefix:
+# In order to be able to store multiple NSS databases in one directory
+# they need unique names. This option sets the database prefix used for
+# cert8.db and key3.db.
+#NSSDBPrefix my-prefix-
+
+# Client Authentication (Type):
+# Client certificate verification type. Types are none, optional and
+# require.
+#NSSVerifyClient none
+
+#
+# Online Certificate Status Protocol (OCSP).
+# Verify that certificates have not been revoked before accepting them.
+#NSSOCSP off
+
+#
+# Use a default OCSP responder. If enabled this will be used regardless
+# of whether one is included in a client certificate. Note that the
+# server certificate is verified during startup.
+#
+# NSSOCSPDefaultURL defines the service URL of the OCSP responder
+# NSSOCSPDefaultName is the nickname of the certificate to trust to
+# sign the OCSP responses.
+#NSSOCSPDefaultResponder on
+#NSSOCSPDefaultURL http://example.com/ocsp/status
+#NSSOCSPDefaultName ocsp-nickname
+
+# Access Control:
+# With SSLRequire you can do per-directory access control based
+# on arbitrary complex boolean expressions containing server
+# variable checks and other lookup directives. The syntax is a
+# mixture between C and Perl. See the mod_nss documentation
+# for more details.
+#
+#NSSRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \
+# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#
+
+# SSL Engine Options:
+# Set various options for the SSL engine.
+# o FakeBasicAuth:
+# Translate the client X.509 into a Basic Authorisation. This means that
+# the standard Auth/DBMAuth methods can be used for access control. The
+# user name is the `one line' version of the client's X.509 certificate.
+# Note that no password is obtained from the user. Every entry in the user
+# file needs this password: `xxj31ZMTZzkVA'.
+# o ExportCertData:
+# This exports two additional environment variables: SSL_CLIENT_CERT and
+# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+# server (always existing) and the client (only existing when client
+# authentication is used). This can be used to import the certificates
+# into CGI scripts.
+# o StdEnvVars:
+# This exports the standard SSL/TLS related `SSL_*' environment variables.
+# Per default this exportation is switched off for performance reasons,
+# because the extraction step is an expensive operation and is usually
+# useless for serving static content. So one usually enables the
+# exportation for CGI and SSI requests only.
+# o StrictRequire:
+# This denies access when "NSSRequireSSL" or "NSSRequire" applied even
+# under a "Satisfy any" situation, i.e. when it applies access is denied
+# and no other module can change it.
+# o OptRenegotiate:
+# This enables optimized SSL connection renegotiation handling when SSL
+# directives are used in per-directory context.
+#NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
+
+ NSSOptions +StdEnvVars
+
+
+ NSSOptions +StdEnvVars
+
+
+# Per-Server Logging:
+# The home of a custom SSL log file. Use this when you want a
+# compact non-error SSL logfile on a virtual host basis.
+#CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \
+# "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+
+
+
diff --git a/www-apache/mod_nss/files/digest-mod_nss-1.0.20070807 b/www-apache/mod_nss/files/digest-mod_nss-1.0.20070807
new file mode 100644
index 00000000..48f04b17
--- /dev/null
+++ b/www-apache/mod_nss/files/digest-mod_nss-1.0.20070807
@@ -0,0 +1,3 @@
+MD5 eff5d5404a8769247c560bf3e36c580c mod_nss-1.0-20070807.tar.bz2 299588
+RMD160 e7149125a84fd787e051b5bbf322850d9878c18d mod_nss-1.0-20070807.tar.bz2 299588
+SHA256 cc96181ee251e1951e23bca4998b709accb1564d5655a6cffe63c386179ceb11 mod_nss-1.0-20070807.tar.bz2 299588
diff --git a/www-apache/mod_nss/mod_nss-1.0.20070807.ebuild b/www-apache/mod_nss/mod_nss-1.0.20070807.ebuild
new file mode 100644
index 00000000..26c73aa1
--- /dev/null
+++ b/www-apache/mod_nss/mod_nss-1.0.20070807.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit apache-module ssl-cert versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+
+KEYWORDS="amd64 ~sparc ~x86"
+
+DESCRIPTION="SSL/TLS module for the Apache HTTP server"
+HOMEPAGE="http://directory.fedoraproject.org/wiki/Mod_nss"
+SRC_URI="ftp://mars.arge.at/fedora-ds/${PN}-${MY_PV}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/nss-3.11.4
+ >=dev-libs/nspr-4.6.4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="NSS"
+
+DOCFILES="LICENSE NOTICE README"
+
+need_apache2
+
+src_compile() {
+ econf --with-apxs=${APXS2} || die "econf failed"
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ mv -f ".libs/libmodnss.so" ".libs/${PN}.so"
+
+ dosbin gencert nss_pcache
+ dohtml docs/mod_nss.html
+
+ apache-module_src_install
+}