Hello community,
here is the log from the commit of package yast2-mail
checked in at Sat May 12 12:54:13 CEST 2007.
--------
--- yast2-mail/yast2-mail.changes 2007-05-04 10:39:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2007-05-08 17:48:31.649420000 +0200
@@ -1,0 +2,6 @@
+Tue May 8 17:30:29 CEST 2007 - varkoly@suse.de
+
+- Move MailTableInclude.pm MailTable.pm to yast2.
+- 2.15.9
+
+-------------------------------------------------------------------
Old:
----
yast2-mail-2.15.8.tar.bz2
New:
----
yast2-mail-2.15.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.D23430/_old 2007-05-12 12:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.D23430/_new 2007-05-12 12:54:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mail (Version 2.15.8)
+# spec file for package yast2-mail (Version 2.15.9)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-mail
-Version: 2.15.8
+Version: 2.15.9
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mail-2.15.8.tar.bz2
+Source0: yast2-mail-2.15.9.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
@@ -66,7 +66,7 @@
Peter Varkoly
%prep
-%setup -n yast2-mail-2.15.8
+%setup -n yast2-mail-2.15.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -139,9 +139,6 @@
%doc %{prefix}/share/doc/packages/yast2-mail
#%files aliases
%defattr(-,root,root)
-%dir /usr/share/YaST2/modules
-/usr/share/YaST2/modules/MailTable.pm
-/usr/share/YaST2/modules/MailTableInclude.pm
%dir /usr/share/YaST2/scrconf
/usr/share/YaST2/scrconf/cfg_mail.scr
/usr/share/YaST2/scrconf/mail_aliases.scr
@@ -158,6 +155,9 @@
/usr/share/YaST2/clients/users*
%changelog
+* Tue May 08 2007 - varkoly@suse.de
+- Move MailTableInclude.pm MailTable.pm to yast2.
+- 2.15.9
* Fri May 04 2007 - varkoly@suse.de
- drop package: yast2-mail-alias move modul file MailAlias.ycp to
the package yast2 (269867 - build cycle between yast2-users and yast2-mail)
++++++ yast2-mail-2.15.8.tar.bz2 -> yast2-mail-2.15.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.15.8/src/MailTableInclude.pm new/yast2-mail-2.15.9/src/MailTableInclude.pm
--- old/yast2-mail-2.15.8/src/MailTableInclude.pm 2007-03-21 12:03:10.000000000 +0100
+++ new/yast2-mail-2.15.9/src/MailTableInclude.pm 1970-01-01 01:00:00.000000000 +0100
@@ -1,243 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Author: Martin Vidner
-# $Id: MailTableInclude.pm 35036 2007-01-02 14:40:18Z mvidner $
-# to be included via "do 'MailTableInclude.pm'"
-
-
-use strict;
-
-# the including file must declare these
-our $filename;
-our $continue_escaped_newline;
-our $continue_leading_blanks;
-our $colon;
-
-use Errno qw(ENOENT);
-use YaST::YCP qw(:LOGGING);
-
-# Global variables:
-# The file specifies a map, but we represent it as a list to preserve
-# preceding comments and the order of entries.
-# list entries:
-# { "comment" => " foo\n bar\n", "key" => "root", "value" => "joe, \\root" }
-# that is, comments have the leading '#' stripped but not the newline.
-# Before the first entry, there can be a leading comment, separated by
-# a blank line.
-our $leading_comment;
-our @table;
-our $trailing_comment;
-
-# Parser features:
-
-my $modified = 0;
-my $linenum;
-my $line_comment;
-my $line = "";
-my $backslashed_line;
-
-my $separator;
-my $oseparator;
-
-my $debug = defined($ARGV[0]) && $ARGV[0] eq "-d";
-
-#
-# routine to log and return error
-#
-sub log_error ( $ ) {
- my ($err_msg) = @_;
- y2error ($err_msg);
- return 0;
-}
-
-sub dumpit () {
- print STDERR "line: '$line' line_comment: '$line_comment'\n";
-}
-
-# create a map entry after it has been composed of split lines
-sub parse_line ($)
-{
- my $line = shift;
-
- # is this the first line?
- if ($line ne "")
- {
- if ($line =~ /^(.*?)$separator(.*)$/s)
- {
- push (@table, { "comment" => $line_comment,
- "key" => $1,
- "value" => $2 });
- }
- else
- {
- log_error ("No separator, $filename:$linenum '$line'");
- }
- }
-}
-
-#
-sub parse_file ()
-{
- $linenum = 0;
- $line = "";
- $line_comment = "";
- $backslashed_line = "";
- my $leading_comment_allowed = 1;
-
- $leading_comment = "";
- @table = ();
- $trailing_comment = "";
-
- if (!open (FILE, $filename))
- {
- y2error ("$filename: $!") unless ($! == ENOENT);
- # a missing file will be fixed by the module anyway
- # and y2cc starts all agents :(
- return;
- }
-
- while (<FILE>)
- {
- chomp; # \n
- ++$linenum;
- dumpit () if ($debug);
-
- # Escaped newlines: merge them before any other processing.
- # Is this one escaped?
- if ($continue_escaped_newline && /\\$/)
- {
- print STDERR "$linenum:continued\n" if ($debug);
- chop; # \\
- $backslashed_line .= "$_ ";
- next;
- }
- # Was there one already?
- if ($backslashed_line ne "")
- {
- $_ = $backslashed_line . $_;
- $backslashed_line = "";
- }
-
-
- # Accept comments
- if (/^\#(.*)/)
- {
- print STDERR "$linenum:comment\n" if ($debug);
- $trailing_comment .= "$1\n";
- }
- elsif (/^$/)
- {
- if ($leading_comment_allowed)
- {
- $leading_comment .= $trailing_comment;
- $trailing_comment = "";
- }
- }
- else
- {
- $leading_comment_allowed = 0;
- # $line is the previous line, $_ is the current one
- if (/^\s+(.*)/)
- {
- if ($continue_leading_blanks)
- {
- print STDERR "$linenum:leading blanks\n" if ($debug);
- $line .= $_;
- $line_comment .= $trailing_comment;
- $trailing_comment = "";
- }
- else
- {
- log_error ("Leading whitespace, $filename:$linenum");
- }
- }
- else
- {
- print STDERR "$linenum:regular\n" if ($debug);
- # a regular line. process the _previous_ one
- # because this one might continue
-
- parse_line ($line);
-
- # next buffer
- $line = $_;
- $line_comment = $trailing_comment;
- $trailing_comment = "";
- }
- }
- }
- # end of file, but we must not forget to process the buffer!
- parse_line ($line);
- # only a comment: make it a leading one
- if ($leading_comment_allowed)
- {
- $leading_comment .= $trailing_comment;
- $trailing_comment = "";
- }
-
- close (FILE);
-}
-
-# take a multiline string and write it to FILE with a hash before each line
-sub write_comment ($)
-{
- my $comment = shift;
- foreach my $line (split /\n/, $comment)
- {
- print FILE "\#$line\n";
- }
-}
-#
-sub write_file ()
-{
- return 1 if (! $modified);
-
- open (FILE, ">$filename.YaST2.new") or return log_error ("Creating file: $!");
- if ($leading_comment)
- {
- write_comment ($leading_comment);
- print FILE "\n";
- }
- foreach my $entry (@table)
- {
- write_comment ($entry->{"comment"});
- print FILE $entry->{"key"}, $oseparator, $entry->{"value"}, "\n";
- }
- write_comment ($trailing_comment);
- close (FILE);
-
- if (-f $filename)
- {
- rename $filename, "$filename.YaST2.save" or return log_error ("Creating backup: $!");
- }
- rename "$filename.YaST2.new", $filename or return log_error ("Moving temp file: $!");
-
- $modified = 0;
- return 1;
-}
-
-# interface with MailTable.pm
-
-sub Read ()
-{
- $separator = $colon ? qr/:\s+/ : qr/\s+/;
- $oseparator = $colon ? ":\t" : "\t";
-
- parse_file ();
- $modified = 0;
-
- return \@table;
-}
-
-sub Write ()
-{
- my $value = shift;
- @table = @{$value};
- $modified = 1;
- return 1;
-}
-
-sub Flush ()
-{
- return write_file();
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.15.8/src/MailTable.pm new/yast2-mail-2.15.9/src/MailTable.pm
--- old/yast2-mail-2.15.8/src/MailTable.pm 2007-03-21 12:03:10.000000000 +0100
+++ new/yast2-mail-2.15.9/src/MailTable.pm 1970-01-01 01:00:00.000000000 +0100
@@ -1,149 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Author: Martin Vidner
-# $Id: MailTable.pm 35039 2007-01-03 12:39:54Z mvidner $
-#
-# Accessing sendmail and postfix maps described in
-# makemap(8) and postmap(1)
-
-use strict;
-
-package MailTable;
-use YaST::YCP qw(:LOGGING);
-
-# type information for YCP
-our %TYPEINFO;
-
-my %modules =
- (
- "aliases" => "Aliases",
- "postfix.sendercanonical" => "PostfixSenderCanonical",
- "postfix.virtual" => "PostfixVirtual",
- "sendmail.generics" => "SendmailGenerics",
- "sendmail.virtuser" => "SendmailVirtuser",
- );
-
-BEGIN {$TYPEINFO{Read} = ["function", ["list", ["map", "string", "any"]], "string kind"];}
-sub Read
-{
- my $class = shift;
- my $kind = shift;
-
- if (!exists $modules{$kind}) {
- y2internal ("No module defined for $kind");
- return [];
- }
- no strict "refs";
- return &{"MailTable::$modules{$kind}::Read"}();
-}
-
-
-BEGIN {$TYPEINFO{Write} = ["function", "boolean", "string kind", ["list", ["map", "any", "any"]]];}
-sub Write
-{
- my $class = shift;
- my $kind = shift;
- my $value = shift;
-
- if (!exists $modules{$kind}) {
- y2internal ("No module defined for $kind");
- return 0;
- }
- no strict "refs";
- return &{"MailTable::$modules{$kind}::Write"}($value);
-}
-
-BEGIN {$TYPEINFO{Flush} = ["function", "boolean", "string kind"];}
-sub Flush
-{
- my $class = shift;
- my $kind = shift;
-
- if (!exists $modules{$kind}) {
- y2internal ("No module defined for $kind");
- return 0;
- }
- no strict "refs";
- return &{"MailTable::$modules{$kind}::Flush"}();
-}
-
-BEGIN {$TYPEINFO{FileName} = ["function", "string", "string kind"];}
-sub FileName
-{
- my $class = shift;
- my $kind = shift;
-
- if (!exists $modules{$kind}) {
- y2internal ("No module defined for $kind");
- return "FIXME $kind";
- }
- no strict "refs";
- return ${"MailTable::$modules{$kind}::filename"};
-}
-
-# For testing purposes only
-# Sets filename, returns previous one
-BEGIN {$TYPEINFO{SetFileName} = ["function", "string", "string kind", "string new"];}
-sub SetFileName
-{
- my $class = shift;
- my $kind = shift;
- my $new = shift;
-
- if (!exists $modules{$kind}) {
- y2internal ("No module defined for $kind");
- return "FIXME $kind";
- }
- no strict "refs";
- my $fn_ref = "MailTable::$modules{$kind}::filename";
- my $old = ${$fn_ref};
- ${$fn_ref} = $new;
- return $old;
-}
-
-package MailTable::Aliases;
-
-our $filename = "/etc/aliases";
-our $continue_escaped_newline = 1;
-our $continue_leading_blanks = 1;
-our $colon = 1;
-
-do 'MailTableInclude.pm';
-
-package MailTable::PostfixSenderCanonical;
-
-our $filename = "/etc/postfix/sender_canonical";
-our $continue_escaped_newline = 0;
-our $continue_leading_blanks = 1;
-our $colon = 0;
-
-do 'MailTableInclude.pm';
-
-package MailTable::PostfixVirtual;
-
-our $filename = "/etc/postfix/virtual";
-our $continue_escaped_newline = 0;
-our $continue_leading_blanks = 1;
-our $colon = 0;
-
-do 'MailTableInclude.pm';
-
-package MailTable::SendmailGenerics;
-
-our $filename = "/etc/mail/genericstable";
-our $continue_escaped_newline = 0;
-our $continue_leading_blanks = 0;
-our $colon = 0;
-
-do 'MailTableInclude.pm';
-
-package MailTable::SendmailVirtuser;
-
-our $filename = "/etc/mail/virtusertable";
-our $continue_escaped_newline = 0;
-our $continue_leading_blanks = 0;
-our $colon = 0;
-
-do 'MailTableInclude.pm';
-
-1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.15.8/src/Makefile.am new/yast2-mail-2.15.9/src/Makefile.am
--- old/yast2-mail-2.15.8/src/Makefile.am 2007-05-03 14:52:18.000000000 +0200
+++ new/yast2-mail-2.15.9/src/Makefile.am 2007-05-04 14:25:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for y2c_mail/src
#
-# $Id: Makefile.am 37805 2007-05-03 12:52:16Z varkoly $
+# $Id: Makefile.am 37835 2007-05-04 12:25:20Z varkoly $
#
SUBDIRS = YaPI
@@ -33,10 +33,7 @@
mail.desktop
module_DATA = \
- MailTable.pm \
- MailTableInclude.pm \
Mail.ycp \
- \
MailServer.ycp
ldapschema_DATA = suse-mailserver.schema
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.15.8/src/Makefile.in new/yast2-mail-2.15.9/src/Makefile.in
--- old/yast2-mail-2.15.8/src/Makefile.in 2007-05-03 14:59:11.000000000 +0200
+++ new/yast2-mail-2.15.9/src/Makefile.in 2007-05-08 17:46:06.000000000 +0200
@@ -17,7 +17,7 @@
#
# Makefile.am for y2c_mail/src
#
-# $Id: Makefile.am 37805 2007-05-03 12:52:16Z varkoly $
+# $Id: Makefile.am 37835 2007-05-04 12:25:20Z varkoly $
#
# Makefile.am.common -*- Makefile -*-
@@ -218,10 +218,7 @@
mail.desktop
module_DATA = \
- MailTable.pm \
- MailTableInclude.pm \
Mail.ycp \
- \
MailServer.ycp
ldapschema_DATA = suse-mailserver.schema
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.15.8/VERSION new/yast2-mail-2.15.9/VERSION
--- old/yast2-mail-2.15.8/VERSION 2007-05-04 10:33:48.000000000 +0200
+++ new/yast2-mail-2.15.9/VERSION 2007-05-08 17:42:34.000000000 +0200
@@ -1 +1 @@
-2.15.8
+2.15.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org