Browse Source

fix patching by bringing back lost patch chunk

master
parent
commit
0ca4221168
  1. 44
      acmetool/acmetool.patch

44
acmetool/acmetool.patch

@ -1,6 +1,32 @@
Index: src/github.com/hlandau/acme/cmd/acmetool/main.go
--- src/github.com/hlandau/acme/cmd/acmetool/main.go.orig 2017-01-07 10:46:51.000000000 +0100
+++ src/github.com/hlandau/acme/cmd/acmetool/main.go 2017-01-07 12:32:30.819982000 +0100
@@ -46,7 +45,7 @@
stdioFlag = kingpin.Flag("stdio", "Don't attempt to use console dialogs; fall back to stdio prompts").Bool()
- responseFileFlag = kingpin.Flag("response-file", "Read dialog responses from the given file (default: $ACME_STATE_DIR/conf/responses)").ExistingFile()
+ responseFileFlag = kingpin.Flag("response-file", "Read dialog responses from the given file").Default("@l_prefix@/etc/acmetool/responses.yaml").ExistingFile()
reconcileCmd = kingpin.Command("reconcile", reconcileHelp).Default()
@@ -128,13 +127,6 @@
interaction.NoDialog = true
}
- if *responseFileFlag == "" {
- p := filepath.Join(*stateFlag, "conf/responses")
- if _, err := os.Stat(p); err == nil {
- *responseFileFlag = p
- }
- }
-
if *responseFileFlag != "" {
err := loadResponseFile(*responseFileFlag)
log.Errore(err, "cannot load response file, continuing anyway")
Index: src/github.com/hlandau/acme/cmd/acmetool/quickstart.go
--- src/github.com/hlandau/acme/cmd/acmetool/quickstart.go.orig 2016-04-02 18:38:26.000000000 +0200
+++ src/github.com/hlandau/acme/cmd/acmetool/quickstart.go 2016-04-03 10:59:42.557286859 +0200
--- src/github.com/hlandau/acme/cmd/acmetool/quickstart.go.orig 2017-01-07 10:46:51.000000000 +0100
+++ src/github.com/hlandau/acme/cmd/acmetool/quickstart.go 2017-01-07 12:32:08.756448000 +0100
@@ -83,12 +83,6 @@
promptSystemd()
}
@ -15,9 +41,9 @@ Index: src/github.com/hlandau/acme/cmd/acmetool/quickstart.go
}
Index: src/github.com/hlandau/acme/hooks/hooks.go
--- src/github.com/hlandau/acme/hooks/hooks.go.orig 2016-04-02 18:38:26.000000000 +0200
+++ src/github.com/hlandau/acme/hooks/hooks.go 2016-04-03 10:59:11.828688881 +0200
@@ -27,13 +27,6 @@
--- src/github.com/hlandau/acme/hooks/hooks.go.orig 2017-01-07 10:46:51.000000000 +0100
+++ src/github.com/hlandau/acme/hooks/hooks.go 2017-01-07 12:32:08.756604000 +0100
@@ -39,13 +39,6 @@
func init() {
// Allow overriding at build time.
p := DefaultPath
@ -32,8 +58,8 @@ Index: src/github.com/hlandau/acme/hooks/hooks.go
DefaultPath = p
RecommendedPath = p
Index: src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go
--- src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go.orig 2016-04-02 18:38:40.000000000 +0200
+++ src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go 2016-04-03 10:59:11.828688881 +0200
--- src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go.orig 2017-01-07 10:47:17.000000000 +0100
+++ src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go 2017-01-07 12:32:08.756735000 +0100
@@ -1,4 +1,4 @@
-// +build linux,cgo
+// +build foo
@ -41,8 +67,8 @@ Index: src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go
package caps
Index: src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go
--- src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go.orig 2016-04-02 18:38:40.000000000 +0200
+++ src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go 2016-04-03 10:59:11.828688881 +0200
--- src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go.orig 2017-01-07 10:47:17.000000000 +0100
+++ src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go 2017-01-07 12:32:08.756848000 +0100
@@ -1,4 +1,4 @@
-// +build !linux linux,!cgo
+// +build !foo

Loading…
Cancel
Save