Merge branch 'master' of ssh://git.proteanos.com/opkbuild/opkbuild

4 files changed, 30 insertions, 33 deletions

diff --git a/Makefile.am b/Makefile.am
index 6acc869..1a2b918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with opkbuild.  If not, see <http://www.gnu.org/licenses/>.
 
+KEY='2250 31F0 47FF E516 63ED  516F 1A45 9ECD E4D6 04BE'
+
 if IN_GIT
 PACKAGE_VERSION_GIT = $$(git describe --tags --dirty | sed 's|^[^/-]*[/-]||')
 else
@@ -140,11 +142,14 @@ release:
 	md5sum $(DIST_ARCHIVES) >MD5SUMS
 	sha256sum $(DIST_ARCHIVES) >SHA256SUMS
 	set -e; \
+	sigs=''; \
 	for f in $(DIST_ARCHIVES); do \
-		gpg --armor --sign $${f}; \
-	done
-	ssh files@files.proteanos.com mkdir -p files/pub/$(PACKAGE)
-	rsync -az --progress --stats $(DIST_ARCHIVES) MD5SUMS SHA256SUMS \
+		gpg --local-user $(KEY) --armor --sign $${f}; \
+		sigs="$${sigs} $${f}.asc"; \
+	done; \
+	ssh files@files.proteanos.com mkdir -p files/pub/$(PACKAGE); \
+	rsync -az --progress --stats $(DIST_ARCHIVES) $${sigs} \
+		MD5SUMS SHA256SUMS \
 		files@files.proteanos.com:files/pub/$(PACKAGE)/$(VERSION)/
 	'$(srcdir)/scripts/announce-release.sh' \
 		$(PACKAGE) $(VERSION) '$(PACKAGE_NAME)'
diff --git a/NEWS b/NEWS
index 9002dbc..06ed5b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+opkbuild version 4.0.0+dev
+--------------------------
+
+Released: ????-??-??
+
+Bug fixes and minor changes:
+
+  * Dates in manual pages are now generated correctly, regardless of the
+    output formatting of the ls command at build time.
+  * configure no longer checks for make.  This was needed for mksysconf,
+    which was removed in version 4.0.0.
+
 opkbuild version 4.0.0
 ----------------------
 
diff --git a/configure.ac b/configure.ac
index f7f6fe1..9faf35f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with opkbuild.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([opkbuild], [4.0.0],
+AC_INIT([opkbuild], [4.0.0+dev],
 	[mailto:proteanos-dev@lists.proteanos.com], [opkbuild],
 	[http://www.proteanos.com/dev/opkbuild/])
 AC_SUBST([PACKAGE_DESCRIPTION], ['opkbuild'])
@@ -59,31 +59,6 @@ AC_ARG_WITH(
 )
 
 AC_ARG_WITH(
-	[make],
-	[AS_HELP_STRING([--with-make=PATH], [path to make utility])],
-	[
-		case "${withval}" in
-			'yes'|'')
-				AC_MSG_ERROR([--with-make requires an argument])
-				;;
-			'no')
-				AC_MSG_ERROR([make is required])
-				;;
-			*)
-				MAKE="${withval}"
-				AC_SUBST([MAKE])
-				;;
-		esac
-	],
-	[
-		AC_PATH_PROG([MAKE], [make])
-		if test -z "${MAKE}"; then
-			AC_MSG_ERROR([make not found])
-		fi
-	]
-)
-
-AC_ARG_WITH(
 	[opkg],
 	[AS_HELP_STRING([--with-opkg=PATH], [path to opkg utility])],
 	[
@@ -111,7 +86,7 @@ AC_ARG_WITH(
 AC_ARG_WITH(
 	[metadata],
 	[AS_HELP_STRING([--with-metadata=SYSTEM],
-		[use SYSTEM metadata plugin \[default: proteanos\]])],
+		[use SYSTEM metadata plugin @<:@default: proteanos@:>@])],
 	[
 		case "${withval}" in
 			'yes'|'')
diff --git a/tools/mtime.sh b/tools/mtime.sh
index c2f9dfa..7207f9e 100755
--- a/tools/mtime.sh
+++ b/tools/mtime.sh
@@ -23,14 +23,19 @@ get_mtime()
 {
 	local file="${1}"
 	shift 1
+	local mode=
+	local links=
+	local owner=
+	local group=
+	local size=
 	local m=
 	local d=
 	local y=
 	local now_m=
 	local now_y=
 
-	read m d y <<-EOF
-		$(LC_ALL=POSIX ls -l "${file}" | cut -d ' ' -f 6-8)
+	read -r mode links owner group size m d y <<-EOF
+		$(LC_ALL=POSIX ls -l "${file}")
 		EOF
 	case "${m}" in
 		'Jan')  m=1;; 'Feb')  m=2;; 'Mar')  m=3;; 'Apr')  m=4;;