lockfile-progs 0.1.17 might be candidate for wheezy
Please feel free to ignore this, but there were a few bugfixes in
lockfile-progs 0.1.17 (just uploaded to sid) that I thought might make
it appropriate for consideration for wheezy:
1) No longer (unintentionally) includes .git* in the source package.
2) Fixes cross-build problem. (Closes: #694842)
3) No longer documents "-p", but then ignores it. (Closes: #686057)
The latter fix means that -p (--use-pid) will actually work.
Previously, the lockfile-progs would just accept and ignore -p, which
means that you would think that --use-pid was in effect, when it wasn't.
-p, --use-pid
Write the parent process id (PPID) to the lockfile whenever a lock‐
file is created, and use that pid when checking a lock's validity.
See the lockfile_create(3) manpage for more information. This
option applies to lockfile-create and lockfile-check. NOTE: this
option will not work correctly between machines sharing a filesys‐
tem.
Below should be the precise changes (ignoring the removal of .git*) from
0.0.16.
Thanks, and let me know if you'd like any further information.
diff -Nru --exclude .git --exclude .gitignore lockfile-progs-0.1.16/debian/changelog lockfile-progs-0.1.17/debian/changelog
--- lockfile-progs-0.1.16/debian/changelog 2011-09-25 10:28:48.000000000 -0500
+++ lockfile-progs-0.1.17/debian/changelog 2012-12-01 12:17:33.000000000 -0600
@@ -1,3 +1,18 @@
+lockfile-progs (0.1.17) unstable; urgency=low
+
+ * Add "p" to getopt_long()'s short options so the "-p" arg will actually work.
+ As the manpage states, "-p" was intended to be the short argument for
+ "--use-pid", but since "p" wasn't added to the getopt_long()
+ optstring, it didn't actually work. Fix it.
+ Thanks to Michael Deegan <bugs@wibble.darktech.org> for the report.
+ (Closes: #686057)
+
+ * Fix cross-builds; use the cross-compiler when cross-building.
+ Thanks to Colin Watson <cjwatson@ubuntu.com> for the report and the
+ patch. (Closes: #694842)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 01 Dec 2012 12:16:09 -0600
+
lockfile-progs (0.1.16) unstable; urgency=low
* Remove unused rc variable in chk() to silence gcc warning.
diff -Nru --exclude .git --exclude .gitignore lockfile-progs-0.1.16/debian/rules lockfile-progs-0.1.17/debian/rules
--- lockfile-progs-0.1.16/debian/rules 2010-06-12 12:40:56.000000000 -0500
+++ lockfile-progs-0.1.17/debian/rules 2012-12-01 11:58:50.000000000 -0600
@@ -1,7 +1,14 @@
#!/usr/bin/make -f
-# Copyright 1998 Rob Browning <rlb@defaultvalue.org>
+# Copyright 1998-2012 Rob Browning <rlb@defaultvalue.org>
# This file is covered under the terms of the Gnu Public License.
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+export CC := $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
export CFLAGS := -DDEBIAN -O2 -g
export LDFLAGS := -g
diff -Nru --exclude .git --exclude .gitignore lockfile-progs-0.1.16/lockfile-progs.c lockfile-progs-0.1.17/lockfile-progs.c
--- lockfile-progs-0.1.16/lockfile-progs.c 2011-08-21 18:28:53.000000000 -0500
+++ lockfile-progs-0.1.17/lockfile-progs.c 2012-12-01 11:34:13.000000000 -0600
@@ -122,7 +122,7 @@
int usage_error = 0;
int opt_result;
- const char *short_opts = "r:olqv";
+ const char *short_opts = "r:oplqv";
struct option long_opts[] = {
{ "retry", required_argument, NULL, 'r' },
{ "oneshot", no_argument, NULL, 'o' },
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
Reply to: