Merge pull request #95 from rst0git/fix-proto-name-conflict

crit/images: fix name conflict with letsencrypt

Author: adrianreber

crit/Makefile

@@ -18,13 +18,16 @@ update-proto:
 	git clone --depth 1 --branch master https://github.com/checkpoint-restore/criu criu-temp
 	cp criu-temp/images/*.proto ./images/
 	rm -rf criu-temp
-	# To prevent namespace conflicts against protobuf files
-	# from other projects, the files of this repository are
-	# now registered under the package name `criu`.
-	ls ./images/*.proto | xargs sed -i '/syntax/a package criu;'
+	# To prevent namespace conflict with proto files
+	# in github.com/letsencrypt/boulder, we prepend
+	# a prefix to the filenames.
+	mv ./images/sa.proto ./images/criu-sa.proto
+	sed -i 's/sa\.proto/criu-sa\.proto/g' images/*.proto
+	mv ./images/core.proto ./images/criu-core.proto
+	sed -i 's/core\.proto/criu-core\.proto/g' images/*.proto
 
 gen-proto:
-	rm ./images/*.pb.go || true
+	rm -f ./images/*.pb.go
 	@protoc \
 		--proto_path=$(proto_path) \
 		--go_out=$(proto_path) \

crit/images/apparmor.pb.go

@@ -1,5 +1,4 @@
 syntax = "proto2";
-package criu;
 
 message aa_policy {
 	required string		name	= 1;

crit/images/apparmor.proto

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
 syntax = "proto2";
-package criu;
 
 message autofs_entry {
 	required int32		fd			= 1;

crit/images/autofs.pb.go

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
 syntax = "proto2";
-package criu;
 
 message binfmt_misc_entry {
 	required string		name			= 1;

crit/images/autofs.proto

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
 syntax = "proto2";
-package criu;
 
 message bpfmap_data_entry {
 	required uint32	map_id			= 1;