Index: head/security/letskencrypt/files/patch-extern.h =================================================================== --- head/security/letskencrypt/files/patch-extern.h (revision 420480) +++ head/security/letskencrypt/files/patch-extern.h (nonexistent) @@ -1,11 +0,0 @@ ---- extern.h.orig 2016-07-24 05:54:33 UTC -+++ extern.h -@@ -188,7 +188,7 @@ int fileproc(int, const char *); - int keyproc(int, const char *, - const char **, size_t, int); - int netproc(int, int, int, int, int, int, int, int, int, -- const char *const *, size_t); -+ const char *const *, size_t, const char *); - - /* - * Debugging functions. Property changes on: head/security/letskencrypt/files/patch-extern.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/letskencrypt/files/patch-main.c =================================================================== --- head/security/letskencrypt/files/patch-main.c (revision 420480) +++ head/security/letskencrypt/files/patch-main.c (nonexistent) @@ -1,55 +0,0 @@ ---- main.c.orig 2016-07-24 05:54:33 UTC -+++ main.c -@@ -30,6 +30,8 @@ - - #include "extern.h" - -+#define AGREEMENT "https://letsencrypt.org" \ -+ "/documents/LE-SA-v1.1.1-August-1-2016.pdf" - #define SSL_DIR "/etc/ssl/letsencrypt" - #define SSL_PRIV_DIR "/etc/ssl/letsencrypt/private" - #define ETC_DIR "/etc/letsencrypt" -@@ -74,7 +76,7 @@ doasprintf(const char *fmt, ...) - int - main(int argc, char *argv[]) - { -- const char *domain; -+ const char *domain, *agreement; - char *certdir, *acctkey, *chngdir, *keyfile; - int key_fds[2], acct_fds[2], chng_fds[2], - cert_fds[2], file_fds[2], dns_fds[2], -@@ -91,9 +93,13 @@ main(int argc, char *argv[]) - newacct = remote = revoke = verbose = force = - multidir = staging = newkey = 0; - certdir = keyfile = acctkey = chngdir = NULL; -+ agreement = AGREEMENT; - -- while (-1 != (c = getopt(argc, argv, "FmnNrstvf:c:C:k:"))) -+ while (-1 != (c = getopt(argc, argv, "bFmnNrstva:f:c:C:k:"))) - switch (c) { -+ case ('a'): -+ agreement = optarg; -+ break; - case ('c'): - free(certdir); - if (NULL == (certdir = strdup(optarg))) -@@ -282,7 +288,8 @@ main(int argc, char *argv[]) - chng_fds[1], cert_fds[1], - dns_fds[1], rvk_fds[1], - newacct, revoke, staging, -- (const char *const *)alts, altsz); -+ (const char *const *)alts, altsz, -+ agreement); - free(alts); - exit(c ? EXIT_SUCCESS : EXIT_FAILURE); - } -@@ -459,7 +466,8 @@ main(int argc, char *argv[]) - (2 == c ? EXIT_SUCCESS : 2)); - usage: - fprintf(stderr, "usage: %s " -- "[-FnNrsv] " -+ "[-bFmnNrsv] " -+ "[-a agreement] " - "[-C challengedir] " - "[-c certdir] " - "[-f accountkey] " Property changes on: head/security/letskencrypt/files/patch-main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/letskencrypt/files/patch-netproc.c =================================================================== --- head/security/letskencrypt/files/patch-netproc.c (revision 420480) +++ head/security/letskencrypt/files/patch-netproc.c (nonexistent) @@ -1,48 +0,0 @@ ---- netproc.c.orig 2016-07-24 05:54:33 UTC -+++ netproc.c -@@ -31,8 +31,6 @@ - - #define URL_REAL_CA "https://acme-v01.api.letsencrypt.org/directory" - #define URL_STAGE_CA "https://acme-staging.api.letsencrypt.org/directory" --#define URL_LICENSE "https://letsencrypt.org" \ -- "/documents/LE-SA-v1.0.1-July-27-2015.pdf" - - #define RETRY_DELAY 5 - #define RETRY_MAX 10 -@@ -333,7 +331,8 @@ sreq(struct conn *c, const char *addr, c - * Returns non-zero on success. - */ - static int --donewreg(struct conn *c, const struct capaths *p) -+donewreg(struct conn *c, const char *agreement, -+ const struct capaths *p) - { - int rc; - char *req; -@@ -342,7 +341,7 @@ donewreg(struct conn *c, const struct ca - rc = 0; - dodbg("%s: new-reg", p->newreg); - -- if (NULL == (req = json_fmt_newreg(URL_LICENSE))) -+ if (NULL == (req = json_fmt_newreg(agreement))) - warnx("json_fmt_newreg"); - else if ((lc = sreq(c, p->newreg, req)) < 0) - warnx("%s: bad comm", p->newreg); -@@ -585,7 +584,7 @@ dofullchain(struct conn *c, const char * - int - netproc(int kfd, int afd, int Cfd, int cfd, int dfd, int rfd, - int newacct, int revoke, int staging, -- const char *const *alts, size_t altsz) -+ const char *const *alts, size_t altsz, const char *agreement) - { - int rc; - size_t i; -@@ -690,7 +689,7 @@ netproc(int kfd, int afd, int Cfd, int c - - /* If new, register with the CA server. */ - -- if (newacct && ! donewreg(&c, &paths)) -+ if (newacct && ! donewreg(&c, agreement, &paths)) - goto out; - - /* Pre-authorise all domains with CA server. */ Property changes on: head/security/letskencrypt/files/patch-netproc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/letskencrypt/files/patch-letskencrypt.1 =================================================================== --- head/security/letskencrypt/files/patch-letskencrypt.1 (revision 420480) +++ head/security/letskencrypt/files/patch-letskencrypt.1 (nonexistent) @@ -1,26 +0,0 @@ ---- letskencrypt.1.orig 2016-07-24 05:54:34 UTC -+++ letskencrypt.1 -@@ -1,4 +1,4 @@ --.Dd $Mdocdate: July 16 2016 $ -+.Dd $Mdocdate: July 28 2016 $ - .Dt LETSKENCRYPT 1 - .Os - .Sh NAME -@@ -10,6 +10,7 @@ - .Sh SYNOPSIS - .Nm letskencrypt - .Op Fl FmnNrsv -+.Op Fl a Ar agreement - .Op Fl C Ar challengedir - .Op Fl c Ar certdir - .Op Fl f Ar accountkey -@@ -78,6 +79,9 @@ staging server instead of the real thing - .It Fl v - Verbose operation. - Specify twice to also trace communication and data transfers. -+.It Fl a Ar agreement -+Use an alternative agreement URL. -+The default uses the current one, but it may be out of date. - .It Fl C Ar challengedir - Where to register challenges. - See Property changes on: head/security/letskencrypt/files/patch-letskencrypt.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property