-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Control: tag -1 -moreinfo
Hi Jonathan, > Please remove the moreinfo tag and send a debdiff of this upload > relative to the previous Jessie candidate (i.e. skip out the new > upstream release in between) when it's ready. I;ve just uploaded a new version 1:1.4.12-2 to sid. It is based on the version in current stable, only adding the patch to fix #711502 (from upstream https://github.com/ekenberg/quotatool/commit/a83c6d0d1bf623234e860dd7bfd3840c812fc32c), and bumping the standards-version. Debdiff stat: > changelog | 10 + > control | 2 > patches/a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch | 138 > +++++++++++++++++ patches/series > | 1 4 files changed, 150 insertions(+), 1 deletion(-) Full debdiff is attached. I hope this suffcies to allow the package into testing. Many thanks again for allowing that innthe first place; I'm very aware that it is my own laziness that resulted in quotatool's removal in the first place. Thanks! Bas. -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) iQIcBAEBCAAGBQJUlz/UAAoJENGDpRe/qY3mf8cP/3EiffXbp2NtlA507W5418aK 5S9Q6FtpSy7pTZ6A6nMQsW08BHCtm8tnI/h5LqGoFblW0xPJtUpIussxvYj6YhSz xAkd1WqRQ5MEnz02X9Sit+pWwmmn9wvz6x4MjL5H42oirh1g5mtjwOKe/BFWe+3H vCHP1mR/08T6By6JE+Jkulmr7HjylV8FhTMrHJCqN30og/2S7oCo6eCVKRvM7eSa QPxd5YJnLae1jCnEMspc5c9HRRfPaedJKz5yUfH2QaUx6473xJXsbHbgispvIqwV rJM5h+HW3Rs6mqsVj12ebUh9JHX2zd9S2hCF3r62VET/YixCFjpLIItcAoCCN/oE MiWaXOIPGxJH7KoYgcxCzN1ZHnuNVl6qPd4O6Ri56Suaoa/5PtciImY6ymCjKRp0 IehXrnDvg8SndcpcOaPSxDXTNE88leDszgAYwI1ZVMzm0DEMvRwbimF7EqC1nNba awbPzDax6Bp/+V9CEkkn/2K8eE8byqMQK5oD0b2JWEDHY+i1Ih259kGoPFhQf/Qv LQ1JtQsem96lIfEyyhHkwFq5Nev5kJ2YwUX2wSMHr0iiqMEps2UgU+6KMLMycsn0 laS/FDm6C9UIS5AbbeD07FIcT9M/zArD4dwE7hNeNKBFIie4G8KpHZRtW6pqUwXT Bdurpd4P9lk2ONTXeF2x =jPiH -----END PGP SIGNATURE-----
diff -Nru quotatool-1.4.12/debian/changelog quotatool-1.4.12/debian/changelog --- quotatool-1.4.12/debian/changelog 2012-02-26 13:18:20.000000000 +0100 +++ quotatool-1.4.12/debian/changelog 2014-12-21 22:28:29.000000000 +0100 @@ -1,3 +1,13 @@ +quotatool (1:1.4.12-2) unstable; urgency=low + + * Upload to remigrate to testing (see #773063) + * Epoch increased to override new upstream version in unstable + * Fix "Error while detecting kernel quota version" (closes: #711502) + [patch a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch] + * Bumped standard-version to 3.9.6 (no changes needed) + + -- Bas Zoetekouw <b...@debian.org> Sun, 21 Dec 2014 21:54:03 +0100 + quotatool (1.4.12-1) unstable; urgency=low * New upstream release diff -Nru quotatool-1.4.12/debian/control quotatool-1.4.12/debian/control --- quotatool-1.4.12/debian/control 2012-02-26 13:16:08.000000000 +0100 +++ quotatool-1.4.12/debian/control 2014-12-21 22:24:18.000000000 +0100 @@ -2,7 +2,7 @@ Section: admin Priority: extra Maintainer: Bas Zoetekouw <b...@debian.org> -Standards-Version: 3.9.3 +Standards-Version: 3.9.6 Build-Depends: debhelper (>>5), autotools-dev Homepage: http://quotatool.ekenberg.se/ diff -Nru quotatool-1.4.12/debian/patches/a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch quotatool-1.4.12/debian/patches/a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch --- quotatool-1.4.12/debian/patches/a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch 1970-01-01 01:00:00.000000000 +0100 +++ quotatool-1.4.12/debian/patches/a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch 2014-12-21 22:18:30.000000000 +0100 @@ -0,0 +1,138 @@ +From a83c6d0d1bf623234e860dd7bfd3840c812fc32c Mon Sep 17 00:00:00 2001 +From: Johan Ekenberg <jo...@ekenberg.se> +Date: Sat, 22 Dec 2012 21:24:04 +0100 +Subject: [PATCH] Ignore linux initramfs mount entry for rootfs + +--- + src/system.c | 34 ++++++++++++++++++++-------------- + 1 file changed, 20 insertions(+), 14 deletions(-) + +diff --git a/src/system.c b/src/system.c +index e2e236f..38bf1df 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -48,7 +48,7 @@ struct mntent { + + + +-/* ++/* + * system_getfs + * find and verify the device file for + * a given filesystem +@@ -72,7 +72,7 @@ fs_t *system_getfs (char *fs_spec) { + + + #if HAVE_SYS_MNTCTL_H /* AIX, we are again in trouble. */ +- /* first mntctl call is only for getting the size of ++ /* first mntctl call is only for getting the size of + * vmnt array. is there a better way? */ + vmnt_retval = mntctl (MCTL_QUERY, sizeof(int), (char*)&vmnt_size); + if (vmnt_retval != -1) { +@@ -102,7 +102,7 @@ fs_t *system_getfs (char *fs_spec) { + + /* loop through mtab until we get a match */ + do { +- ++ + /* read the next entry */ + #if HAVE_SYS_MNTTAB_H + int retval; +@@ -112,9 +112,9 @@ fs_t *system_getfs (char *fs_spec) { + current_fs=getmntent(etc_mtab); + if ( ! current_fs ) { + #elif HAVE_SYS_MNTCTL_H /* AIX, we are again in trouble. */ +- current_fs->mnt_special = ++ current_fs->mnt_special = + (char*)vmnt + (vmnt->vmt_data[VMT_OBJECT].vmt_off); +- current_fs->mnt_mountp = ++ current_fs->mnt_mountp = + (char*)vmnt + (vmnt->vmt_data[VMT_STUB].vmt_off); + current_fs->vmt_flags = vmnt->vmt_flags; + vmnt = (struct vmount*) ((char*)vmnt + vmnt->vmt_length); +@@ -123,10 +123,16 @@ fs_t *system_getfs (char *fs_spec) { + output_error ("Filesystem %s does not exist", fs_spec); + return NULL; + } +- ++ + output_debug ("Checking device '%s', mounted at '%s'", + current_fs->mnt_special, current_fs->mnt_mountp); + ++ /* Ignore 'rootfs' if looking for mountpoint '/' - created and mounted by Linux initramfs */ ++ if (strcmp("/", fs_spec) == 0 && strcmp(current_fs->mnt_special, "rootfs") == 0) { ++ output_debug ("Ignoring initramfs 'rootfs'\n"); ++ continue; ++ } ++ + /* does the name given match the mount pt or device file ? */ + if ( ! strcmp(current_fs->mnt_special, fs_spec) + || ! strcmp(current_fs->mnt_mountp, fs_spec) ) { +@@ -161,7 +167,7 @@ fs_t *system_getfs (char *fs_spec) { + } + } + else { +-#endif /* HAVE_MNTENT_H */ ++#endif /* HAVE_MNTENT_H */ + strncpy (ent->device, current_fs->mnt_special, PATH_MAX-1); + strncpy (ent->mount_pt, current_fs->mnt_mountp, PATH_MAX-1); + #if HAVE_MNTENT_H +@@ -171,7 +177,7 @@ fs_t *system_getfs (char *fs_spec) { + continue; + } + +- } while ( ! done ) ; ++ } while ( ! done ) ; + + + /* can we write to the device? */ +@@ -181,7 +187,7 @@ fs_t *system_getfs (char *fs_spec) { + output_error ("Filesystem %s is mounted read-only\n", fs_spec); + free(current_fs); + free(vmnt_buffer); +-#else ++#else + if ( hasmntopt(current_fs, "ro") ) { + output_error ("Filesystem %s is mounted read-only\n", fs_spec); + endmntent (etc_mtab); +@@ -194,7 +200,7 @@ fs_t *system_getfs (char *fs_spec) { + #if HAVE_SYS_MNTCTL_H + free(current_fs); + free(vmnt_buffer); +-#else ++#else + endmntent (etc_mtab); + #endif + return ent; +@@ -212,12 +218,12 @@ uid_t system_getuid (char *user) { + char *temp_str; + /* seach by name first */ + pwent = getpwnam (user); +- ++ + if ( pwent == NULL ) { + + /* maybe we were given a numerical id */ + uid = strtol(user, &temp_str, 10); +- pwent = getpwuid ((uid_t) uid); ++ pwent = getpwuid ((uid_t) uid); + if ( (user == temp_str) || ( pwent == NULL ) ) { + output_error ("User %s does not exist\n", user); + return -1; +@@ -233,7 +239,7 @@ gid_t system_getgid (char *group) { + struct group *grent; + int gid; + char *temp_str; +- ++ + /* check for group name first */ + grent = getgrnam (group); + if ( grent == NULL ) { +@@ -245,6 +251,6 @@ gid_t system_getgid (char *group) { + return (gid_t) -1; + } + } +- output_info ("group '%s' has gid %d", group, grent->gr_gid); ++ output_info ("group '%s' has gid %d", group, grent->gr_gid); + return (grent->gr_gid); + } diff -Nru quotatool-1.4.12/debian/patches/series quotatool-1.4.12/debian/patches/series --- quotatool-1.4.12/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ quotatool-1.4.12/debian/patches/series 2014-12-21 22:18:30.000000000 +0100 @@ -0,0 +1 @@ +a83c6d0d1bf623234e860dd7bfd3840c812fc32c.patch
debdiff.sig
Description: Binary data
