[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  03e725858a77a8d76452903516c2529fd30c6f40 (commit)
      from  907dca8062c2e3b9d2e1242258ee7de822c87447 (commit)


- Log -----------------------------------------------------------------
commit 03e725858a77a8d76452903516c2529fd30c6f40
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Aug 15 13:44:20 2015 -0400

    Fix most of relupd target

-----------------------------------------------------------------------

Summary of changes:
 .gitignore | 11 ++++-------
 Makefile   | 23 ++++++++++++++++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4c749a..f448120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.swp
 *.inc
+blog
 sitemap.txt
 docs/faq.txt
 news/changelog.txt
@@ -8,10 +9,6 @@ source/license.txt
 docs/HOWTO/*.txt
 source/*.gz*
 source/*.patch
-source/old/x/*.tar.gz*
-source/old/0.9.x/*.tar.gz*
-source/old/0.9.x/*.patch
-source/old/1.0.0/*.tar.gz*
-source/old/1.0.1/*.tar.gz*
-source/old/1.0.2/*.tar.gz*
-source/old/fips/*.tar.gz*
+source/old/*/*.tar.gz*
+source/old/*/*.patch
+source/old/*/*.txt.asc
diff --git a/Makefile b/Makefile
index dc5711b..1028456 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,10 @@
 
 ##  Snapshot directory
 SNAP = /var/cache/openssl/checkouts/openssl
+## Where releases are found.
 RELEASEDIR = /var/www/openssl/source
 
+
 # All simple generated files.
 SIMPLE = newsflash.inc sitemap.txt \
 	 docs/faq.txt docs/faq.inc docs/fips.inc \
@@ -22,17 +24,28 @@ SRCLISTS = \
 
 all: $(SIMPLE) $(SRCLISTS)
 
-# Legacy targets
-simple: all
-generated: all
-manpages: all
-rebuild: all
 relupd: all
+	if [ "`id -un`" != openssl ]; then \
+	    echo "You must run this as 'openssl'" ; \
+	    echo "     sudo -u openssl -H make"; \
+	    exit 1; \
+	fi
+	cd $(SNAP)/.. ; for dir in openssl* ; do \
+	    echo Updating $$dir ; ( cd $$dir ; git pull $(QUIET) ) ; \
+	done
+	git pull $(QUIET)
+	$(MAKE)
 
 # To be fixed.
 hack-source_htaccess:
 	exit 1;
 
+# Legacy targets
+simple: all
+generated: all
+manpages: all
+rebuild: all
+
 clean:
 	rm -f $(SIMPLE)