Gah - forgot to CC: bugs -------- Original Message -------- Subject: Re: Bug#535691: RFH: munin packaging help Date: Mon, 06 Jul 2009 17:09:33 +0200 From: Niels Thykier <niels@thykier.net> To: Holger Levsen <holger@layer-acht.org> References: <[🔎] 200907041342.21979.holger@layer-acht.org> <[🔎] 4A50B25A.80504@thykier.net> <[🔎] 200907061106.43742.holger@layer-acht.org> Holger Levsen wrote: > Hi Niels, > > On Sonntag, 5. Juli 2009, Niels Thykier wrote: >> I am not sure I am able to dedicate myself long term to this package, >> but I have examined the patches for munin >> (http://patch-tracking.debian.net/package/munin/1.2.6-12) and compared >> them to munin-trunk (r2285). I have attached my finding, which mainly >> determines which of the patches are still valid. > > cool, thats nice for anyone packaging 1.3! > >> I may have a look at the source package and implement these changes >> later depending on what my sponsor says about my current package. > > cheers! just dont blindly upload please, better we prepare it in svn first. > i'd be happy to commit stuff to svn, if you send me suitable patches. > > > Thanks, > Holger > Hey again I have made some patches to deal with (some of) the patch modifications. (The easy ones obviously ^^). The first patch (00_rename.patch) will rename all current patches (prefixing them with an X). The following patches will then take some of the X-patches, rename them to their new number and make the modifications required (path updates). All of the patches have been made from a modifying a clone of the debian folder from "lenny" should be applied to the debian dir using: patch -d debian -p1 < $PATCH For the new patches I have used the new naming convention you started. That is 200 have already been applied by upstream in the latest version, 100 are debian specific (determined by whether the patch mentioned a debian bug) and I have introduced the 300 which are patches to the upstream code. So far all 300-patches save for 312 and 313 are plug-in related. So if you want to create a separate series for plug-ins and for "other" patches, these are the only 2 that needs "re-naming" so far. I have discard the old number completely when I renamed a patch into the new numbering convention, but I have retrained their order in the "series" file. I also added ".patch" to patches that did not have it for consistency. Notes regarding the patches (in debian/patches) * 200-patches - Their path has not been updated, they would not apply cleanly to the svn trunk anyway since they have really been included. * X-patches - They will not patch cleanly - they have not been updated. * The rest - The will not patch cleanly against older versions of the upstream code, since they have moved around a lot of folders. (e.g. node/node.d* is now plugins/node.d*) I have tested that all new patches (save for the 200-ones) applies cleanly on munin-trunk (r2285) by removing all the irrelevant patches from the series-file and running debian/rules patch. However the patches I have included do not remove patches from the series-file. Anyhow these patches updates 39 of the patches, so you are down to 15 that needs checking and renaming. I have updated "patch_notes" (removing those I have already finished). I can fix the patches under "Not-fixed plugins" and may do so if I get bored again, but I will need some help with the last 10. I lack the insight to tell if the upstream replacements covers the problem or not. ~Niels
Attachment:
patches.tar.gz
Description: application/gzip
--- Fixed --- 211-munin-manpage.patch -> 206-munin-manpage.patch Though, the man-page (munin.8) included by upstream goes into section 8. You may want to create a new patch to move it to section 1. --- Not-fixed plugins --- * all plugin patches should change path from "node/node.d..." to "plugins/node.d..." [...] * Below this point the patches may need some extra modification. X290-postfix_spooldir - NB: The file has been changed. X240-amavis-logtail.patch - NB: The file has been changed. X250-amavis-maillog.patch - NB: The file has been changed. X460-netstat.regex.patch - Regex has been modified (for readability - functionallity does not appear to have changed.) X235-ip_.patch - NB: Half of the patch is now invalid (comments have been replaced with some explaination) --- May have been fixed satisfiable --- X234-smart_.patch - (now: plugins/node.d/smart_.in) It checks an environment variable to determine whether the extra arguments should be inserted. --- Needs more checking: --- X460-munin-cgi-graph-mkdir.patch - script looks rewritten / cannot find the context. - NB: file moved to master/_bin/munin-html.in X391-munin-node-ipv6.patch - File seems to have been deleted or rewritten (suspect it is now called node/sbin/munin-node) X390-munin-run-ipv6.patch - File seems to have been deleted or rewritten (suspect it is now called node/sbin/munin-run) X340-nfsd-fix.patch - Rewritten as plugins/node.d.linux/nfsd.in X220-Makefile.patch - Cannot find the patched code nor its contents. - Given the structual modifications to the code the patch is probably invalid and is either not required or needs to be "rewritten" from scratch. X210-munindoc-manpage.patch - Makefile: modified - may require some rewriting. - Makefile: munindoc does not appear to be built by default, re-patch - munindoc.in: moved to node/bin/munindoc.in, but changes seems to still be valid. X420-munin-limits.excessive-notifications.patch - Munin.pm does not exist anymore. - munin-limits.in has been renamed to master/_bin/munin-limits.in - Could not find any of the patch contexts in munin-limits.in X530-node.d.linux-cpu-scale-with-HZ - Parts of the patch has been included or it has been rewritten (unsure if it works correctly). - moved to plugins/node.d.linux/cpu.in X540-node.d-acpi-lenny - Replaced by plugins/node.d.linux/acpi.in - Seems to have been rewritten from scratch.
Attachment:
signature.asc
Description: PGP signature
Attachment:
signature.asc
Description: OpenPGP digital signature