From cd5af0c535b354d9a7588f5a7c3e5286b1c2d64a Mon Sep 17 00:00:00 2001 From: Kenshi Muto Date: Tue, 9 Aug 2016 18:11:33 +0200 Subject: [PATCH] Do not write VCS tags into installed conffiles Bug: https://github.com/apple/cups/issues/2369 Origin: vendor Author: Didier Raboud Patch-Name: removecvstag.patch Gbp-Pq: Name 0021-Do-not-write-VCS-tags-into-installed-conffiles.patch --- conf/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/Makefile b/conf/Makefile index 42a123f..db0060d 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -69,8 +69,12 @@ install-data: $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ else \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ + grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \ + mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \ fi ; \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \ + grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \ + mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/mime for file in $(REPLACE); do \