diff -Nru cruft-ng-0.4.6/debian/changelog cruft-ng-0.4.7/debian/changelog --- cruft-ng-0.4.6/debian/changelog 2018-01-02 09:17:32.000000000 +0000 +++ cruft-ng-0.4.7/debian/changelog 2018-11-17 17:09:58.000000000 +0000 @@ -1,8 +1,16 @@ +cruft-ng (0.4.7) unstable; urgency=low + + * switch to debhelper compat level 11 + * drop our copy of db.h, use the one provided by mlocate instead + * bump Standards-Version to 4.2.1, no further change needed + + -- Alexandre Detiste Sat, 17 Nov 2018 18:09:58 +0100 + cruft-ng (0.4.6) unstable; urgency=medium * consider all intermediates subdirectories under /etc as OK if those contain some dpkg-managed files - * Declare compliance with Policy 4.1.2 + * Declare compliance with Policy 4.1.3 -- Alexandre Detiste Tue, 02 Jan 2018 10:17:32 +0100 diff -Nru cruft-ng-0.4.6/debian/compat cruft-ng-0.4.7/debian/compat --- cruft-ng-0.4.6/debian/compat 2017-06-29 13:19:03.000000000 +0000 +++ cruft-ng-0.4.7/debian/compat 2018-11-17 17:00:05.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru cruft-ng-0.4.6/debian/control cruft-ng-0.4.7/debian/control --- cruft-ng-0.4.6/debian/control 2018-01-02 09:04:28.000000000 +0000 +++ cruft-ng-0.4.7/debian/control 2018-11-17 17:08:57.000000000 +0000 @@ -2,8 +2,10 @@ Section: admin Priority: optional Maintainer: Alexandre Detiste -Build-Depends: debhelper (>= 10) -Standards-Version: 4.1.3 +Build-Depends: + debhelper (>= 11~), + mlocate (>= 0.26-3), +Standards-Version: 4.2.1 Homepage: https://github.com/a-detiste/cruft-ng/ Vcs-Git: https://github.com/a-detiste/cruft-ng.git Vcs-Browser: https://github.com/a-detiste/cruft-ng diff -Nru cruft-ng-0.4.6/debian/copyright cruft-ng-0.4.7/debian/copyright --- cruft-ng-0.4.6/debian/copyright 2017-07-03 13:19:53.000000000 +0000 +++ cruft-ng-0.4.7/debian/copyright 2018-11-17 17:06:27.000000000 +0000 @@ -3,18 +3,9 @@ Source: https://github.com/a-detiste/cruft-ng/ Files: * -Copyright: 2014-2017 Alexandre Detiste +Copyright: 2014-2018 Alexandre Detiste License: GPL-2+ -Files: mlocate_db.h -Copyright: 2005 Miloslav Trmac -License: mlocate_db_license - You can use this file without restriction. - . - This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty - of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - Files: shellexp.c Copyright: 1998-2000 Anthony Towns 2005-2011 Marcin Owsiany diff -Nru cruft-ng-0.4.6/mlocate.cc cruft-ng-0.4.7/mlocate.cc --- cruft-ng-0.4.6/mlocate.cc 2016-01-18 17:28:44.000000000 +0000 +++ cruft-ng-0.4.7/mlocate.cc 2018-11-17 17:05:08.000000000 +0000 @@ -2,11 +2,7 @@ #include #include #include -#include "mlocate_db.h" -// original filename is 'db.h' -// TODO: should be packaged in /usr/include by 'mlocate' package -// like 'make' provides '/usr/include/gnumake.h' -// and 'sudo' provides '/usr/include/sudo_plugin.h' +#include #include "mlocate.h" diff -Nru cruft-ng-0.4.6/mlocate_db.h cruft-ng-0.4.7/mlocate_db.h --- cruft-ng-0.4.6/mlocate_db.h 2015-02-22 08:26:40.000000000 +0000 +++ cruft-ng-0.4.7/mlocate_db.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -/* Database file format. - -Copyright (C) 2005 Red Hat, Inc. All rights reserved. - -You can use this file without restriction. - -This file is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. - -(This file defines a file format, so even the LGPL seems too restrictive. - Share and enjoy.) - -Author: Miloslav Trmac */ - -#ifndef DB_H__ -#define DB_H__ - -#include - -/* See doc/mlocate.db.5.in */ - -/* File header */ -struct db_header -{ - uint8_t magic[8]; /* See DB_MAGIC below */ - uint32_t conf_size; /* Configuration block size, in big endian */ - uint8_t version; /* File format version, see DB_VERSION* below */ - uint8_t check_visibility; /* Check file visibility in locate(1) */ - uint8_t pad[2]; /* 32-bit total alignment */ - /* Followed by NUL-terminated path of the root of the database */ -}; -/* Followed by a configuration block and an EOF-terminated sequence of - directories. - - The configuration block is a sequence of name-values pairs - (variable name '\0' (variable value '\0')... '\0'), ordered by name. If - more than one value of a variable is present, they are ordered as if by - strcmp (). - - Directory records are not output for unreadable directories; such - directories do have an entry in their parent directory. - - "/" does not have a parent directory, so it is not present in the database - at all. */ - -/* Contains a '\0' byte to unambiguously mark the file as a binary file. */ -#define DB_MAGIC { '\0', 'm', 'l', 'o', 'c', 'a', 't', 'e' } - -#define DB_VERSION_0 0x00 - -/* Directory header */ -struct db_directory -{ - /* Both values 0 mean "invalid, always reread". This coincides with what - Linux FAT, romfs and cramfs drivers do for unknown data. - - ctime should in theory be sufficient, but several Linux filesystems fill - ctime with creation time. Therefore "time" is actually "max of ctime, - mtime". */ - uint64_t time_sec; /* st_[cm]time of the directory in big endian */ - /* st_[cm]tim.tv_nsec of the directory in big endian or 0 if not available */ - uint32_t time_nsec; - uint8_t pad[4]; /* 64-bit total alignment */ - /* Followed by NUL-terminated absolute path of the directory */ -}; -/* Followed by directory entries terminated by DBE_END, sorted by name using - strcmp () */ - -/* Directory entry */ -struct db_entry -{ - uint8_t type; /* See DBE_* below */ - /* Followed by NUL-terminated name if tag != DBE_END */ -}; - -enum - { - DBE_NORMAL = 0, /* A non-directory file */ - DBE_DIRECTORY = 1, /* A directory */ - DBE_END = 2 /* End of directory contents; contains no name */ - }; - -#endif diff -Nru cruft-ng-0.4.6/README.md cruft-ng-0.4.7/README.md --- cruft-ng-0.4.6/README.md 2017-11-17 10:38:11.000000000 +0000 +++ cruft-ng-0.4.7/README.md 2018-10-24 15:47:04.000000000 +0000 @@ -1,8 +1,8 @@ -cruf-ng, a rewrite of Debian 'cruft' engine -=========================================== +cruft-ng, a rewrite of Debian 'cruft' engine +============================================ Cruft is built as a main shell scripts that spawn -hundreds of helper processes (other shell scripts, +hundreds of helper processes (other shell scripts, perl programs, C programs). This project attempts to keep all the main functionality in one process; @@ -31,11 +31,11 @@ so the intermediary spooling in `/var/spool/cruft/` is un-needed; unless it is processed by external tools -* Debian +* Debian * cruft-ng uses mlocate binary database instead of running 'find' on the whole file system, - this way, it can also be setgid mlocate to be + this way, it can also be setgid mlocate to be able to access the db and be run by any user; while cruft need to be run as root. @@ -48,7 +48,7 @@ TODO: ----- - * command switches are currenlty not implemented + * command switches are currenlty not implemented * cruft-ng doesn't detect broken symlinks at this time; it's a different topic and should be split in a @@ -61,6 +61,6 @@ This is licensed GPL-2+, as cruft itself. This reuses `shellexp.c`, explain/* and filters-unex/* from cruft. -1998-2000 Anthony Towns -2005-2011 Marcin Owsiany -2014 Alexandre Detiste +1998-2000 Anthony Towns +2005-2011 Marcin Owsiany +2014 Alexandre Detiste