From owner-p4-projects@FreeBSD.ORG  Mon Jan 31 14:41:13 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D32CD16A4D0; Mon, 31 Jan 2005 14:41:12 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB39A16A4CE
	for <perforce@freebsd.org>; Mon, 31 Jan 2005 14:41:12 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 921B043D1F
	for <perforce@freebsd.org>; Mon, 31 Jan 2005 14:41:12 +0000 (GMT)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0VEfC0S050783
	for <perforce@freebsd.org>; Mon, 31 Jan 2005 14:41:12 GMT
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0VEfC0X050780
	for perforce@freebsd.org; Mon, 31 Jan 2005 14:41:12 GMT
	(envelope-from des@freebsd.org)
Date: Mon, 31 Jan 2005 14:41:12 GMT
Message-Id: <200501311441.j0VEfC0X050780@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 70041 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Jan 2005 14:41:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=70041

Change 70041 by des@des.at.des.thinksec.com on 2005/01/31 14:40:49

	Dynamically branding a release with today's date has caused trouble
	in the past, and it confuses autoconf.  From now on, dist.sh will
	extract the release date from openpam_version.h.

Affected files ...

.. //depot/projects/openpam/dist.sh#11 edit

Differences ...

==== //depot/projects/openpam/dist.sh#11 (text+ko) ====

@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-# $P4: //depot/projects/openpam/dist.sh#10 $
+# $P4: //depot/projects/openpam/dist.sh#11 $
 #
 
 set -e
 
-release=$(date '+%Y%m%d')
+srcdir=$(dirname $(realpath $0))
+release=$(perl -ne '/^#define\s+_OPENPAM_VERSION\s+(\d+)/ && print $1' \
+    $srcdir/include/security/openpam_version.h)
 distname="openpam-${release}"
 tarball="${distname}.tar.gz"
 
@@ -18,14 +20,10 @@
     echo "Adding ${file}"
     install -c -m 0644 "${file}" "${distname}/${file}" || exit 1
 done
-for file in autogen.sh configure depcomp install-sh ltconfig ltmain.sh ; do
+for file in autogen.sh configure depcomp install-sh ltmain.sh ; do
     echo "Adjusting permissions for ${file}"
     chmod a+x "${distname}/${file}"
 done
-(cd "${distname}" && grep -rl YYYYMMDD *) | while read file ; do
-    echo "Datestamping ${file}"
-    perl -p -i -e "s/YYYYMMDD/${release}/g" "${distname}/${file}"
-done
 find "${distname}" | sort -r | xargs touch -t "${release}0000"
 tar zcf "${tarball}" "${distname}"
 dd if=/dev/zero of="${tarball}" conv=notrunc bs=4 oseek=1 count=1