From 3422d8760f54e403bda12aa58dc5256bb132ebf3 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Thu, 18 Aug 2005 08:22:29 +0000
Subject: [PATCH] Clear setgid bit on regular files prior to tarring up a
 release.

---
 ChangeLog   |  5 +++++
 Makefile.am | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34772cd71..1d30d18ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-18  Carl Worth  <cworth@cworth.org>
+
+	* Makefile.am: Clear setgid bit on regular files prior to tarring
+	up a release.
+
 2005-08-18  Kristian Høgsberg  <krh@redhat.com>
 
 	* configure.in: Fix typo in freetype configure check.
diff --git a/Makefile.am b/Makefile.am
index 0d48a0cea..d39d13c5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,11 +43,6 @@ $(gpg_file): $(sha1_file)
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
-release-remove-old:
-	rm -f $(tar_file) $(sha1_file) $(gpg_file)
-
-release-check: release-verify-even-micro release-verify-newer release-remove-old distcheck
-
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(CAIRO_VERSION_MICRO)" = "`echo $(CAIRO_VERSION_MICRO)/2*2 | bc`" \
@@ -65,6 +60,18 @@ release-verify-newer:
 		&& false)
 	@echo "Good."
 
+release-remove-old:
+	rm -f $(tar_file) $(sha1_file) $(gpg_file)
+
+# Maybe it's just my system, but somehow group sticky bits keep
+# getting set and this causes failures in un-tarring on some systems.
+# Until I figure out where the sticky bit is coming from, just clean
+# these up before building a release.
+release-cleanup-group-sticky:
+	find . -type f | xargs chmod g-s
+
+release-check: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky distcheck
+
 release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	mkdir -p releases
 	scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
@@ -99,4 +106,4 @@ release-publish: release-upload releases/$(sha1_file)
 	@echo "Last but not least, do not forget to bump up the micro"
 	@echo "version component to the next (odd) number and commit."
 
-.PHONY: release-check release-remove-old release-verify-even-micro release-verify-newer release-check release-publish release-upload
+.PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish