update

Makefile.am

@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo
 SUFFIXES = .go
 OBJEXT= none
 
-sbin_PROGRAMS = certmanagerd
+sbin_PROGRAMS = certmanagerd certmanagerdump certmanagerrestore
 bin_PROGRAMS = certmanagerctl
 
 BUILD = $(shell date -u '+%Y-%m-%d-%H%M')
@@ -14,6 +14,14 @@ certmanagerd_SOURCES = cmd/certmanagerd/main.go
 certmanagerd$(EXEEXT): $(certmanagerd_SOURCES) $(EXTRA_certmanagerd_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o certmanagerd$(EXEEXT) $(certmanagerd_SOURCES)
 
+certmanagerdump_SOURCES = cmd/certmanagerdump/maindump.go
+certmanagerdump$(EXEEXT): $(certmanagerdump_SOURCES) $(EXTRA_certmanagerd_SOURCES)
+	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o certmanagerdump$(EXEEXT) $(certmanagerdump_SOURCES)
+
+certmanagerrestore_SOURCES = cmd/certmanagerrestore/mainrestore.go
+certmanagerrestore$(EXEEXT): $(certmanagerrestore_SOURCES) $(EXTRA_certmanagerd_SOURCES)
+	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o certmanagerrestore$(EXEEXT) $(certmanagerrestore_SOURCES)
+
 
 certmanagerctl_SOURCES = cmd/certmanagerctl/main.go \
 	    cmd/certmanagerctl/account.go \
@@ -71,6 +79,7 @@ EXTRA_certmanagerd_SOURCES = \
 	pkg/cm509/testchain_a02.crt \
 	pkg/cm509/testchain_a03.crt \
 	pkg/cm509/x509.go \
+	pkg/cm509/aes256.go \
 	pkg/cmctl/cmctl_grpc.pb.go \
 	pkg/cmctl/cmctl.pb.go \
 	pkg/common/common.go \
@@ -83,6 +92,7 @@ EXTRA_DIST = $(EXTRA_certmanagerd_SOURCES) \
 	internal/test/logic_issuer_import_test.go \
 	pkg/aux509/x509cert_test.go \
 	pkg/cm509/x509_test.go \
+	pkg/cm509/aes256_test.go \
 	internal/test/testchain_a00.crt \
 	internal/test/testchain_a01.crt \
 	internal/test/testchain_a02.crt \
@@ -94,8 +104,6 @@ EXTRA_DIST = $(EXTRA_certmanagerd_SOURCES) \
 	internal/test/testchain_a00.key \
 	etc/certmanager/certmanagerd.yaml \
 	proto/cmctl.proto \
-	go.mod \
-	go.sum \
 	README.md \
 	internal/test/Makefile.in \
 	debian/changelog \
@@ -155,9 +163,9 @@ run:
 	env CGO_ENABLED=1 $(GO) run $(GOFLAGS) ./cmd/certmanagerd/... --daemon=false
 
 
-
 BUILD_DIR = $(shell pwd)/tmp
 
+dpkg: package
 $(DIST_ARCHIVES): dist
 package: $(DIST_ARCHIVES)
 	mkdir -p $(BUILD_DIR)
@@ -174,6 +182,14 @@ debian-package:
 debian-package-clean:
 	$(DBUILDPACKAGE) --rules-target clean -us -uc -ui
 
+TOPDIR= $(shell pwd)/tmp/sysagent-build
+rpm:	dist-gzip
+	$(MKDIR_P) $(TOPDIR)/SOURCES
+	mv -v $(distdir).tar.gz $(TOPDIR)/SOURCES
+	$(RPMBUILD) --define "_topdir $(TOPDIR)"  -v --noclean -ba $(PACKAGE_NAME).spec
+
+
+
 distclean-local: clean 
 	rm -rf autom4te.cache