From: Stefan Eissing <icing@apache.org>
Date: Wed, 9 Aug 2017 13:57:33 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0180197f9856c7588fdfd05108826f2216758f76;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

mod_md: new module for managing domains across VirtualHosts



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1804530 13f79535-47bb-0310-9956-ffa450edef68
---

0180197f9856c7588fdfd05108826f2216758f76
diff --cc CHANGES
index cad233d37bb,cad233d37bb..da95d435d09
--- a/CHANGES
+++ b/CHANGES
@@@ -1,6 -1,6 +1,13 @@@
                                                           -*- coding: utf-8 -*-
  Changes with Apache 2.5.0
  
++  *) mod_md: new module for managing domains across VirtualHosts with ACME protocol 
++     implementation for automated certificate signup and renewal. Default CA is
++     the test area of Let's Encrypt right now, so certificates root will not be valid.
++     Will be switched to the real service endpoint rather soon. If you need it now,
++     configure 'MDCertificateAuthority https://acme-v01.api.letsencrypt.org/directory'.
++     Module standard xml documentation coming soonish. [Stefan Eissing] 
++     
    *) mod_ssl, ab: Fix compatibility with LibreSSL.  PR 61184.
       [Bernard Spil <brnrd freebsd.org>, Yann Ylavic]
  
diff --cc modules/md/Makefile
index 00000000000,0e0b4f66ffb..349767a23db
mode 000000,100644..100644
--- a/modules/md/Makefile
+++ b/modules/md/Makefile
@@@ -1,0 -1,65 +1,65 @@@
 -top_srcdir   = /Users/sei/projects/httpd/trunk-md
 -top_builddir = /Users/sei/projects/httpd/trunk-md
 -srcdir       = /Users/sei/projects/httpd/trunk-md/modules/md
 -builddir     = /Users/sei/projects/httpd/trunk-md/modules/md
 -VPATH        = /Users/sei/projects/httpd/trunk-md/modules/md
++top_srcdir   = /Users/sei/projects/httpd/trunk
++top_builddir = /Users/sei/projects/httpd/trunk
++srcdir       = /Users/sei/projects/httpd/trunk/modules/md
++builddir     = /Users/sei/projects/httpd/trunk/modules/md
++VPATH        = /Users/sei/projects/httpd/trunk/modules/md
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements.  See the NOTICE file distributed with
+ # this work for additional information regarding copyright ownership.
+ # The ASF licenses this file to You 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.
+ 
+ #
+ #   standard stuff
+ #
+ 
+ 
+ LTLIBRARY_NAME    = libmd.la
+ LTLIBRARY_SOURCES = \
+ 	md_acme.c \
+ 	md_acme_acct.c \
+ 	md_acme_authz.c \
+ 	md_acme_drive.c \
+ 	md_core.c \
+ 	md_curl.c \
+ 	md_crypt.c \
+ 	md_http.c \
+ 	md_json.c \
+ 	md_jws.c \
+ 	md_log.c \
+ 	md_reg.c \
+ 	md_store.c \
+ 	md_store_fs.c \
+ 	md_util.c
+ 
+ 
+ LTLIBRARY_DEPENDENCIES = md.h
+ 
+ 
+ a2md_OBJECTS = \
+ 	md_cmd_main.c \
+ 	md_cmd_acme.c \
+ 	md_cmd_reg.c \
+ 	md_cmd_store.c
+ 
+ a2md: $(a2md_OBJECTS) $(LTLIBRARY_NAME)
+ 	$(LINK) $(a2md_LTFLAGS) $(a2md_OBJECTS) -lmd $(A2MD_LDADD) $(AP_LIBS)
+ 
+ # top be installed in bin dir
+ bin_PROGRAMS = a2md
+ 
+ TARGETS = $(bin_PROGRAMS)
+ 
+ local-shared-build: $(LTLIBRARY_NAME) $(SHARED_TARGETS) a2md
+ 
+ include $(top_srcdir)/build/library.mk
+ include $(top_srcdir)/build/special.mk