From 67d9e9a278171ea7cd0e9e2c5b754a50887d4752 Mon Sep 17 00:00:00 2001
From: "A. Karl Kornel" <akkornel@stanford.edu>
Date: Fri, 22 Jan 2016 23:36:04 -0800
Subject: Customize the path to Perl in the server scripts

The server scripts now have a unique string where the Perl path should
be, and the Makefile uses sed to insert the correct path at build time
(using the path determined by configure).

The server scripts now have .in extensions, and setting the executable
flag is handled by the Makefile.

We also have to change autogen, because it looks for the scripts in
the server directory when it generates the man pages.
---
 autogen | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'autogen')

diff --git a/autogen b/autogen
index 3b8bc1b..c725fd9 100755
--- a/autogen
+++ b/autogen
@@ -13,10 +13,15 @@ for doc in client/wallet client/wallet-rekey ; do
     pod2man --release="$version" --center=wallet \
         --name=`basename "$doc" | tr a-z A-Z` "$doc".pod > "$doc".1
 done
-for doc in contrib/wallet-rekey-periodic contrib/wallet-summary \
-           contrib/wallet-unknown-hosts server/keytab-backend   \
-           server/wallet-admin server/wallet-backend            \
-           server/wallet-report ; do
+for doc in contrib/wallet-rekey-periodic contrib/wallet-summary  \
+           contrib/wallet-unknown-hosts ; do
     pod2man --release="$version" --center=wallet --section=8 \
         --name=`basename "$doc" | tr a-z A-Z` "$doc" > "$doc".8
 done
+for doc in server/keytab-backend server/wallet-admin \
+           server/wallet-admin server/wallet-backend \
+           server/wallet-report ; do
+    pod2man --release="$version" --center=wallet --section=8 \
+        --name=`basename "$doc" | tr a-z A-Z` "$doc.in" > "$doc".8
+done
+
-- 
cgit v1.2.3


From eafb48ca60858a6dc480568ff570e8a997ee5113 Mon Sep 17 00:00:00 2001
From: Russ Allbery <eagle@eyrie.org>
Date: Sun, 27 May 2018 21:40:28 -0700
Subject: Rename autogen to bootstrap

Rename the script to bootstrap from a Git checkout to bootstrap,
matching the emerging consensus in the Autoconf world.
---
 NEWS      |  3 +++
 autogen   | 27 ---------------------------
 bootstrap | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100755 autogen
 create mode 100755 bootstrap

(limited to 'autogen')

diff --git a/NEWS b/NEWS
index 2bfedde..23137e2 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,9 @@ wallet 1.4 (unreleased)
     for all Perl scripts.  This allows wallet to use a version of Perl at
     a non-standard path.  Patches from Karl Kornel.
 
+    Rename the script to bootstrap from a Git checkout to bootstrap,
+    matching the emerging consensus in the Autoconf world.
+
     Update to rra-c-util 7.2:
 
     * Improve configure output for krb5-config testing.
diff --git a/autogen b/autogen
deleted file mode 100755
index c725fd9..0000000
--- a/autogen
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Run this shell script to bootstrap as necessary after a fresh checkout.
-
-set -e
-
-# Regenerate all the autotools files.
-autoreconf -i --force
-
-# Generate manual pages.
-version=`grep '^wallet' NEWS | head -1 | cut -d' ' -f2`
-for doc in client/wallet client/wallet-rekey ; do
-    pod2man --release="$version" --center=wallet \
-        --name=`basename "$doc" | tr a-z A-Z` "$doc".pod > "$doc".1
-done
-for doc in contrib/wallet-rekey-periodic contrib/wallet-summary  \
-           contrib/wallet-unknown-hosts ; do
-    pod2man --release="$version" --center=wallet --section=8 \
-        --name=`basename "$doc" | tr a-z A-Z` "$doc" > "$doc".8
-done
-for doc in server/keytab-backend server/wallet-admin \
-           server/wallet-admin server/wallet-backend \
-           server/wallet-report ; do
-    pod2man --release="$version" --center=wallet --section=8 \
-        --name=`basename "$doc" | tr a-z A-Z` "$doc.in" > "$doc".8
-done
-
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..c725fd9
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Run this shell script to bootstrap as necessary after a fresh checkout.
+
+set -e
+
+# Regenerate all the autotools files.
+autoreconf -i --force
+
+# Generate manual pages.
+version=`grep '^wallet' NEWS | head -1 | cut -d' ' -f2`
+for doc in client/wallet client/wallet-rekey ; do
+    pod2man --release="$version" --center=wallet \
+        --name=`basename "$doc" | tr a-z A-Z` "$doc".pod > "$doc".1
+done
+for doc in contrib/wallet-rekey-periodic contrib/wallet-summary  \
+           contrib/wallet-unknown-hosts ; do
+    pod2man --release="$version" --center=wallet --section=8 \
+        --name=`basename "$doc" | tr a-z A-Z` "$doc" > "$doc".8
+done
+for doc in server/keytab-backend server/wallet-admin \
+           server/wallet-admin server/wallet-backend \
+           server/wallet-report ; do
+    pod2man --release="$version" --center=wallet --section=8 \
+        --name=`basename "$doc" | tr a-z A-Z` "$doc.in" > "$doc".8
+done
+
-- 
cgit v1.2.3