[Pkg-irc-commits] r286 - in /packages/ngircd/trunk/debian: control ngircd-conf-convert rules
cbiedl-guest at users.alioth.debian.org
cbiedl-guest at users.alioth.debian.org
Sun Nov 13 17:02:25 UTC 2011
Author: cbiedl-guest
Date: Sun Nov 13 17:02:24 2011
New Revision: 286
URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=286
Log:
[ngircd] Add ngircd.conf conversion program
The ngircd.conf file format has changed in version 18. This program
changes the values and sections accordingly.
Added:
packages/ngircd/trunk/debian/ngircd-conf-convert (with props)
Modified:
packages/ngircd/trunk/debian/control
packages/ngircd/trunk/debian/rules
Modified: packages/ngircd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/control?rev=286&op=diff
==============================================================================
--- packages/ngircd/trunk/debian/control (original)
+++ packages/ngircd/trunk/debian/control Sun Nov 13 17:02:24 2011
@@ -16,7 +16,7 @@
Package: ngircd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
lsb-base (>= 3.0-6),
Replaces: ircd
Conflicts: dancer-ircd, ircd-hybrid, ircd-irc2, ircd-ircu, rageircd
Added: packages/ngircd/trunk/debian/ngircd-conf-convert
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/ngircd-conf-convert?rev=286&op=file
==============================================================================
--- packages/ngircd/trunk/debian/ngircd-conf-convert (added)
+++ packages/ngircd/trunk/debian/ngircd-conf-convert Sun Nov 13 17:02:24 2011
@@ -1,0 +1,225 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2011, Christoph Biedl, <debian.axhn at manchmal.in-ulm.de>
+#%# license-gplv2+
+
+=head1 NAME
+
+ngircd-conf-convert - convert ngircd.conf from pre18 version
+
+=head1 VERSION
+
+Version 2011.10.30
+
+=cut
+
+our $VERSION = '2011.10.30';
+
+=head1 SYNOPSIS
+
+convert ngircd.conf from pre18 version
+
+Usage:
+
+ ngircd-conf-convert [options] <old ngircd.conf> <new ngircd.conf>
+
+=cut
+
+use 5.010;
+use strict;
+use warnings;
+
+use Getopt::Long;
+use Pod::Usage;
+
+my $ignorecomments;
+
+=head1 OPTIONS
+
+=over
+
+=cut
+
+{
+ my $help;
+ my $man;
+ my %GetOptions = (
+ 'help|?' => \$help,
+ 'man' => \$man
+ );
+
+=item B<--ignorecomments>
+
+By default, this program will rewrite configuration variables even if
+they are commented out, e.g.
+
+ ;NoDNS = no
+
+to
+
+ ;DNS = yes
+
+Use this option to disable that feature.
+
+=cut
+
+ $GetOptions{'ignorecomments'} = \$ignorecomments;
+
+=item F<old-ngircd.conf> F<new-ngircd.conf>
+
+The old configuration file, and where to write the converted one to.
+The first one must exist, the content of the latter will be
+overwritten. If C<-> is given, content is read from stdin or written
+to stdout, respectively.
+
+=back
+
+=head1 DESCRIPTION
+
+The C<ngircd-conf-convert> converts ngIRCd configuration files according
+to the new section and variable names introduced in version 18.
+
+The changes done are small: Just renamings and adding the appropriate
+section name. No blocks are moved around, you might want to do that
+manually.
+
+Suggested workflow:
+
+ ngircd-conf-convert ngircd.conf ngircd.conf.new
+ # compare dumps created by --configtest
+ </dev/null ngircd --configtest --config ngircd.conf |
+ sed -n '/GLOBAL/,$p' >dump.old
+ </dev/null ngircd --configtest --config ngircd.conf.new |
+ sed -n '/GLOBAL/,$p' >dump.new
+ cmp -s dump.old dump.new || echo "ALERT: configuration was changed!"
+
+Remember: Your C<ngircd.conf> may contain sensitive data, so don't
+do that in a world-readable directory.
+
+=cut
+
+ GetOptions (%GetOptions) or pod2usage (2);
+ pod2usage (1) if ($help);
+ pod2usage (-exitstatus => 0, -ignorecomments => 2) if ($man);
+
+ (scalar (@ARGV) == 2) or
+ die ("Need two file parameters.\n");
+}
+
+my %convert_logic = (
+ # variable name => [ <new section>, <new name>, <invert> ]
+ 'allowremoteoper' => [ 'Options' ],
+ 'chrootdir' => [ 'Options' ],
+ 'connectipv4' => [ 'Options' ],
+ 'connectipv6' => [ 'Options' ],
+ 'connectretry' => [ 'Limits' ],
+ 'maxconnections' => [ 'Limits' ],
+ 'maxconnectionsip' => [ 'Limits' ],
+ 'maxjoins' => [ 'Limits' ],
+ 'maxnicklength' => [ 'Limits' ],
+ 'nodns' => [ 'Options', 'DNS', 1 ],
+ 'noident' => [ 'Options', 'Ident', 1 ],
+ 'nopam' => [ 'Options', 'PAM', 1 ],
+ 'opercanusemode' => [ 'Options' ],
+ 'operservermode' => [ 'Options' ],
+ 'pingtimeout' => [ 'Limits' ],
+ 'pongtimeout' => [ 'Limits' ],
+ 'predefchannelsonly' => [ 'Options' ],
+ 'sslcertfile' => [ 'SSL', 'CertFile' ],
+ 'ssldhfile' => [ 'SSL', 'DHFile' ],
+ 'sslkeyfile' => [ 'SSL', 'KeyFile' ],
+ 'sslkeyfilepassword' => [ 'SSL', 'KeyFilePassword' ],
+ 'sslports' => [ 'SSL', 'Ports' ],
+ 'syslogfacility' => [ 'Options' ],
+ 'webircpassword' => [ 'Options' ],
+);
+
+my $oldvars = join ('|', keys %convert_logic);
+
+my ($old_file, $new_file) = @ARGV;
+my ($old_fh, $new_fh);
+if ($old_file eq '-') {
+ $old_fh = *STDIN;
+} else {
+ (-f $old_file) or
+ die ("Not a file: '$old_file'.\n");
+ open ($old_fh, '<', $old_file) or
+ die ("Canno read '$old_file': $!.\n");
+}
+
+my $section = '';
+# last section read from input
+
+my $set_section = '';
+# section we're currently in
+
+# slurp content
+my @content = <$old_fh>;
+($old_file eq '-') or close ($old_fh);
+
+sub insert_line ($$) {
+ # insert content before the given line. If this is a comment, seek
+ # further backwards.
+ my ($before, $content) = @_;
+ while ($before > 0 && $content[--$before] =~ /^\s*#/) {
+ }
+ splice @content, $before+1, 0, $content;
+}
+
+for (my $i = 0; $i < scalar (@content); $i++) {
+ my $line = $content[$i];
+ if ($line =~ /^\s*\[([a-z]+)\]/i) {
+ $set_section = $section = lc $1;
+ } elsif ($line =~ /^\s*(,|#|$)/) {
+ # nothing to do
+ } elsif (
+ $section eq 'global' &&
+ $line =~ /^(\s*)(;\s*)?($oldvars)(\s*=\s*)(.*?)$/i
+ ) {
+ my ($left, $comment, $var, $middle, $value) =
+ ($1 // '', $2 // '', $3, $4, $5 // '');
+ my ($new_section, $new_var, $invert) = @{$convert_logic{lc $var}};
+ $new_var //= $var;
+ ($comment && $ignorecomments) and
+ next;
+ if ($set_section ne $new_section) {
+ # switch section
+ insert_line ($i, "[$new_section]\n"); $i++;
+ $set_section = $new_section;
+ }
+ $invert and
+ ($value = ($value =~ /^(yes|true|[1-9]\d*)\s*$/) ? 'no' : 'yes');
+ $content[$i] = "$left$comment$new_var$middle$value\n";
+ } elsif ($set_section ne $section) {
+ # other content, switch back to global if necessary
+ die if ($section ne 'global');
+ insert_line ($i, "[Global]\n"); $i++;
+ $set_section = $section;
+ }
+}
+
+
+if ($new_file eq '-') {
+ $new_fh = *STDOUT;
+} else {
+ open ($new_fh, '>', $new_file) or
+ die ("Canno write '$new_file': $!.\n");
+ print $new_fh @content;
+}
+($new_file eq '-') or close ($new_fh);
+
+exit 0;
+
+__END__
+
+=head1 AUTHOR
+
+Christoph Biedl, C<E<lt>debian.axhn at manchmal.in-ulm.deE<gt>>
+
+=head1 COPYRIGHT & LICENSE
+
+ #%# license-gplv2+
+
+=cut
+
+# -- ETYKACLGPAK
Propchange: packages/ngircd/trunk/debian/ngircd-conf-convert
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/ngircd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/rules?rev=286&op=diff
==============================================================================
--- packages/ngircd/trunk/debian/rules (original)
+++ packages/ngircd/trunk/debian/rules Sun Nov 13 17:02:24 2011
@@ -13,14 +13,16 @@
override_dh_auto_install:
dh_auto_install
# install config and sample motd file
- install -m 640 -D debian/ngircd.conf \
- debian/ngircd/etc/ngircd/ngircd.conf
- install -m 640 -D debian/ngircd.motd \
- debian/ngircd/etc/ngircd/ngircd.motd
+ install -m 640 -D $(CURDIR)/debian/ngircd.conf \
+ $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf
+ install -m 640 -D $(CURDIR)/debian/ngircd.motd \
+ $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd
+ install -m 755 -D $(CURDIR)/debian/ngircd-conf-convert \
+ $(CURDIR)/debian/ngircd/usr/share/ngircd/ngircd-conf-convert
# make lintian happy
- rm debian/ngircd/usr/share/doc/ngircd/COPYING
- mv debian/ngircd/usr/share/doc/ngircd/ChangeLog \
- debian/ngircd/usr/share/doc/ngircd/changelog
+ rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING
+ mv $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/ChangeLog \
+ $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/changelog
%:
dh $@
More information about the Pkg-irc-commits
mailing list