# HG changeset patch
# User meillo@marmaro.de
# Date 1232018203 -3600
# Node ID c80b6b6fb798ca185cf7d9b86e0c76eed6bd95da
# Parent  397e94509bd95bcfbf854d769fc26ce5fcaec5e2
moved tables from input to tbl

diff -r 397e94509bd9 -r c80b6b6fb798 thesis/input/mta-comparison.tex
--- a/thesis/input/mta-comparison.tex	Thu Jan 15 12:16:20 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-\begin{tabular}[hbt]{| p{0.13\textwidth} || p{0.13\textwidth} | p{0.13\textwidth} | p{0.13\textwidth} | p{0.13\textwidth} | p{0.13\textwidth} |}
-	\hline
-	                 & sendmail & exim & qmail & postfix & masqmail \\
-	\hline
-	version regarded &  &  &  &  &  \\
-	\hline \hline
-	First release & 1983 & 1995 & 1996 & 1999 & 1999 \\
-	\hline
-	Lines of code (with sloccount on debian packages)& 93k & 54k & 18k & 92k & 14k \\
-	\hline
-	Architecture & monolithic & monolithic & modular & modular & monolithic \\
-	\hline
-	Design goals & flexibility & general, flexible \& extensive facilities for checking & security & performance and security & for non-permanent Internet connection \\
-	\hline
-\end{tabular}
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/input/mta-market-share.tex
--- a/thesis/input/mta-market-share.tex	Thu Jan 15 12:16:20 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-\begin{tabular}[hbt]{| r || p{0.16\textwidth} r | p{0.16\textwidth} r | p{0.16\textwidth} r |}
-	\hline
-	\# &
-Bernstein & 2001 &
-O'ReillyNet & 2007 &
-MailRadar & \\
-	\hline \hline
-	1 &
-\textbf{sendmail} & 42.3\,\% &
-\textbf{sendmail} & 12.3\,\% &
-\textbf{sendmail} & 24\,\% \\
-	\hline
-	2 &
-Microsoft Exchange & 18.4\,\% &
-\textbf{postfix} & 8.6\,\% &
-\textbf{postfix} & 20\,\% \\
-	\hline
-	3 &
-\textbf{qmail} & 17.4\,\% &
-Microsoft Exchange & 7.6\,\% &
-\textbf{qmail} & 17\,\% \\
-	\hline
-	4 &
-IMail & 5.9\,\% &
-\textbf{qmail} & 5.3\,\% &
-Microsoft Mail & 15\,\% \\
-	\hline
-	5 &
-\textbf{postfix} & 1.6\,\% &
-\textbf{exim} & 5.0\,\% &
-\textbf{exim} & 13\,\% \\
-	\hline
-	6 &
-\textbf{exim} & 1.5\,\% &
-Cisco & 3.0\,\% &
-IMail & 2\,\% \\
-	\hline
-	7 &
-NTMail & 1.3\,\% &
-Barracuda & 2.8\,\% &
-Microsoft Exchange & 1\,\% \\
-%	\hline
-%	8 &
-%NetWin Dmail & 0.8\,\% &
-% &  &
-%mail security layers & 1\,\% \\
-%	\hline
-%	9 &
-%Software.com Post.Office & 0.6\,\% &
-% &  &
-%InterMail & 1\,\% \\
-%	\hline
-%	10 &
-% & &
-% & &
-%Lotus Domino & 1\,\% \\
-%	\hline
-	\hline \hline
-	&
-\textit{mail security layers} & $\approx$ 4\,\% & %smap 2.4 and some small ones
-\textit{mail security layers} & $\approx$ 22\,\% &
-\textit{mail security layers} & $\approx$ 2\,\% \\ % symantec 1
-	\hline
-\end{tabular}
-
-
-
-%\begin{tabular}[hbt]{| r || p{0.16\textwidth} r | p{0.16\textwidth} r | p{0.16\textwidth} r |}
-%	\hline
-%	\# & O'ReillyNet & 2007 & MailRadar & YYYY & Bernstein & 2001 \\
-%	\hline \hline
-%	1 & \textbf{sendmail} & 12.3\,\% & \textbf{sendmail} & 24\,\% & \textbf{sendmail} & 42.3\,\% \\
-%	\hline
-%	2 & \textbf{postfix} & 8.6\,\% & \textbf{postfix} & 20\,\% & Microsoft Exchange & 18.4\,\% \\
-%	\hline
-%	3 & Postini & 8.5\,\% & \textbf{qmail} & 17\,\% & \textbf{qmail} & 17.4\,\% \\
-%	\hline
-%	4 & Microsoft Exchange & 7.6\,\% & Microsoft Mail & 15\,\% & IMail & 5.9\,\% \\
-%	\hline
-%	5 & MXLogic & 6.0\,\% & \textbf{exim} & 13\,\% & smap & 2.4\,\% \\
-%	\hline
-%	6 & \textbf{qmail} & 5.3\,\% & IMail & 2\,\% & \textbf{postfix} & 1.6\,\% \\
-%	\hline
-%	7 & \textbf{exim} & 5.0\,\% & Microsoft Exchange & 1\,\% & \textbf{exim} & 1.5\,\% \\
-%	\hline
-%	8 & Concentric Hosting & 4.5\,\% & Symantec Mail Security & 1\,\% & NTMail & 1.3\,\% \\
-%	\hline
-%	9 & Cisco & 3.0\,\% & InterMail & 1\,\% & NetWin Dmail & 0.8\,\% \\
-%	\hline
-%	10 & Barracuda & 2.8\,\% & Lotus Domino & 1\,\% & Software.com Post.Office & 0.6\,\% \\
-%	\hline
-%\end{tabular}
-
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/input/new-masqmail-permissions.tex
--- a/thesis/input/new-masqmail-permissions.tex	Thu Jan 15 12:16:20 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-% new-masqmail-permissions
-
-\begin{tabular}[hbt]{| l || l | l |}
-	\hline
-	module & runs as owner:group & daemon \\
-	\hline
-	\hline
-	sendmail & the invoking one & no \\
-	\hline
-	smtpd & root->nobody & yes (or via inetd) \\
-	\hline
-	queue-in & setgid masqmail & no \\
-	\hline
-	scanning & masqmail & yes \\
-	\hline
-	queue-out & masqmail & yes \\
-	\hline
-	pipe & masqmail & no \\
-	\hline
-	smtp & masqmail->nobody & no \\
-	\hline
-\end{tabular}
-
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/input/requirements.tex
--- a/thesis/input/requirements.tex	Thu Jan 15 12:16:20 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-\begin{tabular}[hbt]{| l || c | c | c |}
-	\hline
-	Requirement & Importance & Pending work & Focus \\
-	\hline \hline
-	\RF1: In/out channels    & ++ & - & + \\
-	\RF2: Mail queue         & ++ & - & + \\
-	\RF3: Header sanitizing  & 0 & - & - \\
-	\RF4: Aliasing           & 0 & - & - \\
-	\RF5: Route selection    & + & - & 0 \\
-	\RF6: Authentication     & ++ & + & +++ \\
-	\RF7: Encryption         & ++ & + & +++ \\
-	\RF8: Spam prevention    & + & ++ & +++ \\
-	\RF9: Malware handling   & - & + & 0 \\
-	\RF10: Archiving         & - & + & 0 \\
-	\hline
-	\RG1: Security           & ++ & + & +++ \\
-	\RG2: Reliability        & ++ & + & +++ \\
-	\RG3: Robustness         & + & + & ++ \\
-	\RG4: Extendability      & + & ++ & +++ \\
-	\RG5: Maintainability    & + & 0 & + \\
-	\RG6: Testability        & 0 & 0 & 0 \\
-	\RG7: Performance        & -{}- & - & -{}-{}- \\
-	\RG8: Availability       & - & - & -{}- \\
-	\RG9: Portability        & - & -{}- & -{}-{}- \\
-	\RG10: Usability         & + & -{}- & - \\
-	\hline
-\end{tabular}
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/input/strategies.tex
--- a/thesis/input/strategies.tex	Thu Jan 15 12:16:20 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-\begin{tabular}[Hbt]{| l | c || c | c | c |}
-	\hline
-	Requirement           & Focus & S1 & S2 & S3 \\
-	\hline \hline
-	\RF7: encryption (\TODO1)       & +++ & x  &    &   \\
-	\RF6: authentication (\TODO2)   & +++ & x  &    &   \\
-	\RG1: security (\TODO3)         & +++ &    & x  & x \\
-	\RG2: reliability (\TODO4)      & +++ &    &    & x \\
-	\RF8: spam handling (\TODO5)    & +++ & x  & x  & x \\
-	\RG4: extendability (\TODO6)    & +++ &    &    & x \\
-	\hline
-	\RG3: robustness        & ++  &    &    & x \\
-	\hline
-	\RF1: in/out channels   & +   & x  & x  & x \\
-	\RF2: mail queueing     & +   &    &    & x \\
-	\RG5: maintainability   & +   &    &    & x \\
-	\hline
-	\RF5: route selection   & 0   & x  &    &   \\
-	\RF9: malware handling  & 0   & x  & x  & x \\
-	\RF10: archiving        & 0   & x  &    & x \\
-	\RG6: testability       & 0   &    &    & x \\
-	\hline
-	\RF3: header sanitizing & -   & x  &    &   \\
-	\RF4: aliasing          & -   & x  &    &   \\
-	\RG10: usability        & -   & x  &    &   \\
-	\hline
-	\RG8: availability      & -{}- & x &    &   \\
-	\hline
-	\RG7: performance       & -{}-{}- & x &  &  \\
-	\RG9: portability       & -{}-{}- & x &  &  \\
-	\hline \hline
-	Score (Sum of `+')      & 23  & 9  & 7  & 17 \\
-	\hline
-\end{tabular}
-
-
-
-
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tbl/mta-comparison.tbl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thesis/tbl/mta-comparison.tbl	Thu Jan 15 12:16:43 2009 +0100
@@ -0,0 +1,15 @@
+\begin{tabular}[hbt]{| p{0.13\textwidth} || p{0.13\textwidth} | p{0.13\textwidth} | p{0.13\textwidth} | p{0.13\textwidth} | p{0.13\textwidth} |}
+	\hline
+	                 & sendmail & exim & qmail & postfix & masqmail \\
+	\hline
+	version regarded &  &  &  &  &  \\
+	\hline \hline
+	First release & 1983 & 1995 & 1996 & 1999 & 1999 \\
+	\hline
+	Lines of code (with sloccount on debian packages)& 93k & 54k & 18k & 92k & 14k \\
+	\hline
+	Architecture & monolithic & monolithic & modular & modular & monolithic \\
+	\hline
+	Design goals & flexibility & general, flexible \& extensive facilities for checking & security & performance and security & for non-permanent Internet connection \\
+	\hline
+\end{tabular}
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tbl/mta-market-share.tbl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thesis/tbl/mta-market-share.tbl	Thu Jan 15 12:16:43 2009 +0100
@@ -0,0 +1,93 @@
+\begin{tabular}[hbt]{| r || p{0.16\textwidth} r | p{0.16\textwidth} r | p{0.16\textwidth} r |}
+	\hline
+	\# &
+Bernstein & 2001 &
+O'ReillyNet & 2007 &
+MailRadar & \\
+	\hline \hline
+	1 &
+\textbf{sendmail} & 42.3\,\% &
+\textbf{sendmail} & 12.3\,\% &
+\textbf{sendmail} & 24\,\% \\
+	\hline
+	2 &
+Microsoft Exchange & 18.4\,\% &
+\textbf{postfix} & 8.6\,\% &
+\textbf{postfix} & 20\,\% \\
+	\hline
+	3 &
+\textbf{qmail} & 17.4\,\% &
+Microsoft Exchange & 7.6\,\% &
+\textbf{qmail} & 17\,\% \\
+	\hline
+	4 &
+IMail & 5.9\,\% &
+\textbf{qmail} & 5.3\,\% &
+Microsoft Mail & 15\,\% \\
+	\hline
+	5 &
+\textbf{postfix} & 1.6\,\% &
+\textbf{exim} & 5.0\,\% &
+\textbf{exim} & 13\,\% \\
+	\hline
+	6 &
+\textbf{exim} & 1.5\,\% &
+Cisco & 3.0\,\% &
+IMail & 2\,\% \\
+	\hline
+	7 &
+NTMail & 1.3\,\% &
+Barracuda & 2.8\,\% &
+Microsoft Exchange & 1\,\% \\
+%	\hline
+%	8 &
+%NetWin Dmail & 0.8\,\% &
+% &  &
+%mail security layers & 1\,\% \\
+%	\hline
+%	9 &
+%Software.com Post.Office & 0.6\,\% &
+% &  &
+%InterMail & 1\,\% \\
+%	\hline
+%	10 &
+% & &
+% & &
+%Lotus Domino & 1\,\% \\
+%	\hline
+	\hline \hline
+	&
+\textit{mail security layers} & $\approx$ 4\,\% & %smap 2.4 and some small ones
+\textit{mail security layers} & $\approx$ 22\,\% &
+\textit{mail security layers} & $\approx$ 2\,\% \\ % symantec 1
+	\hline
+\end{tabular}
+
+
+
+%\begin{tabular}[hbt]{| r || p{0.16\textwidth} r | p{0.16\textwidth} r | p{0.16\textwidth} r |}
+%	\hline
+%	\# & O'ReillyNet & 2007 & MailRadar & YYYY & Bernstein & 2001 \\
+%	\hline \hline
+%	1 & \textbf{sendmail} & 12.3\,\% & \textbf{sendmail} & 24\,\% & \textbf{sendmail} & 42.3\,\% \\
+%	\hline
+%	2 & \textbf{postfix} & 8.6\,\% & \textbf{postfix} & 20\,\% & Microsoft Exchange & 18.4\,\% \\
+%	\hline
+%	3 & Postini & 8.5\,\% & \textbf{qmail} & 17\,\% & \textbf{qmail} & 17.4\,\% \\
+%	\hline
+%	4 & Microsoft Exchange & 7.6\,\% & Microsoft Mail & 15\,\% & IMail & 5.9\,\% \\
+%	\hline
+%	5 & MXLogic & 6.0\,\% & \textbf{exim} & 13\,\% & smap & 2.4\,\% \\
+%	\hline
+%	6 & \textbf{qmail} & 5.3\,\% & IMail & 2\,\% & \textbf{postfix} & 1.6\,\% \\
+%	\hline
+%	7 & \textbf{exim} & 5.0\,\% & Microsoft Exchange & 1\,\% & \textbf{exim} & 1.5\,\% \\
+%	\hline
+%	8 & Concentric Hosting & 4.5\,\% & Symantec Mail Security & 1\,\% & NTMail & 1.3\,\% \\
+%	\hline
+%	9 & Cisco & 3.0\,\% & InterMail & 1\,\% & NetWin Dmail & 0.8\,\% \\
+%	\hline
+%	10 & Barracuda & 2.8\,\% & Lotus Domino & 1\,\% & Software.com Post.Office & 0.6\,\% \\
+%	\hline
+%\end{tabular}
+
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tbl/new-masqmail-permissions.tbl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thesis/tbl/new-masqmail-permissions.tbl	Thu Jan 15 12:16:43 2009 +0100
@@ -0,0 +1,23 @@
+% new-masqmail-permissions
+
+\begin{tabular}[hbt]{| l || l | l |}
+	\hline
+	module & runs as owner:group & daemon \\
+	\hline
+	\hline
+	sendmail & the invoking one & no \\
+	\hline
+	smtpd & root->nobody & yes (or via inetd) \\
+	\hline
+	queue-in & setgid masqmail & no \\
+	\hline
+	scanning & masqmail & yes \\
+	\hline
+	queue-out & masqmail & yes \\
+	\hline
+	pipe & masqmail & no \\
+	\hline
+	smtp & masqmail->nobody & no \\
+	\hline
+\end{tabular}
+
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tbl/requirements.tbl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thesis/tbl/requirements.tbl	Thu Jan 15 12:16:43 2009 +0100
@@ -0,0 +1,27 @@
+\begin{tabular}[hbt]{| l || c | c | c |}
+	\hline
+	Requirement & Importance & Pending work & Focus \\
+	\hline \hline
+	\RF1: In/out channels    & ++ & - & + \\
+	\RF2: Mail queue         & ++ & - & + \\
+	\RF3: Header sanitizing  & 0 & - & - \\
+	\RF4: Aliasing           & 0 & - & - \\
+	\RF5: Route selection    & + & - & 0 \\
+	\RF6: Authentication     & ++ & + & +++ \\
+	\RF7: Encryption         & ++ & + & +++ \\
+	\RF8: Spam prevention    & + & ++ & +++ \\
+	\RF9: Malware handling   & - & + & 0 \\
+	\RF10: Archiving         & - & + & 0 \\
+	\hline
+	\RG1: Security           & ++ & + & +++ \\
+	\RG2: Reliability        & ++ & + & +++ \\
+	\RG3: Robustness         & + & + & ++ \\
+	\RG4: Extendability      & + & ++ & +++ \\
+	\RG5: Maintainability    & + & 0 & + \\
+	\RG6: Testability        & 0 & 0 & 0 \\
+	\RG7: Performance        & -{}- & - & -{}-{}- \\
+	\RG8: Availability       & - & - & -{}- \\
+	\RG9: Portability        & - & -{}- & -{}-{}- \\
+	\RG10: Usability         & + & -{}- & - \\
+	\hline
+\end{tabular}
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tbl/strategies.tbl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thesis/tbl/strategies.tbl	Thu Jan 15 12:16:43 2009 +0100
@@ -0,0 +1,38 @@
+\begin{tabular}[Hbt]{| l | c || c | c | c |}
+	\hline
+	Requirement           & Focus & S1 & S2 & S3 \\
+	\hline \hline
+	\RF7: encryption (\TODO1)       & +++ & x  &    &   \\
+	\RF6: authentication (\TODO2)   & +++ & x  &    &   \\
+	\RG1: security (\TODO3)         & +++ &    & x  & x \\
+	\RG2: reliability (\TODO4)      & +++ &    &    & x \\
+	\RF8: spam handling (\TODO5)    & +++ & x  & x  & x \\
+	\RG4: extendability (\TODO6)    & +++ &    &    & x \\
+	\hline
+	\RG3: robustness        & ++  &    &    & x \\
+	\hline
+	\RF1: in/out channels   & +   & x  & x  & x \\
+	\RF2: mail queueing     & +   &    &    & x \\
+	\RG5: maintainability   & +   &    &    & x \\
+	\hline
+	\RF5: route selection   & 0   & x  &    &   \\
+	\RF9: malware handling  & 0   & x  & x  & x \\
+	\RF10: archiving        & 0   & x  &    & x \\
+	\RG6: testability       & 0   &    &    & x \\
+	\hline
+	\RF3: header sanitizing & -   & x  &    &   \\
+	\RF4: aliasing          & -   & x  &    &   \\
+	\RG10: usability        & -   & x  &    &   \\
+	\hline
+	\RG8: availability      & -{}- & x &    &   \\
+	\hline
+	\RG7: performance       & -{}-{}- & x &  &  \\
+	\RG9: portability       & -{}-{}- & x &  &  \\
+	\hline \hline
+	Score (Sum of `+')      & 23  & 9  & 7  & 17 \\
+	\hline
+\end{tabular}
+
+
+
+
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tex/3-MailTransferAgents.tex
--- a/thesis/tex/3-MailTransferAgents.tex	Thu Jan 15 12:16:20 2009 +0100
+++ b/thesis/tex/3-MailTransferAgents.tex	Thu Jan 15 12:16:43 2009 +0100
@@ -98,7 +98,7 @@
 
 \begin{table}
 	\begin{center}
-		\input{input/mta-market-share.tex}
+		\input{tbl/mta-market-share.tbl}
 	\end{center}
 	\caption{Market share of \MTA{}s}
 	\label{tab:mta-market-share}
@@ -187,7 +187,7 @@
 \begin{table}
 % FIXME: improve table data!!!
 	\begin{center}
-		\input{input/mta-comparison.tex}
+		\input{tbl/mta-comparison.tbl}
 	\end{center}
 	\caption{Comparison of MTAs}
 	\label{tab:mta-comparison}
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tex/4-MasqmailsFuture.tex
--- a/thesis/tex/4-MasqmailsFuture.tex	Thu Jan 15 12:16:20 2009 +0100
+++ b/thesis/tex/4-MasqmailsFuture.tex	Thu Jan 15 12:16:43 2009 +0100
@@ -352,7 +352,7 @@
 
 \begin{table}
 	\begin{center}
-		\input{input/requirements.tex}
+		\input{tbl/requirements.tbl}
 	\end{center}
 	\caption{Importance of and pending work for requirements}
 	\label{tab:requirements}
@@ -430,7 +430,7 @@
 
 \begin{table}
 	\begin{center}
-		\input{input/strategies.tex}
+		\input{tbl/strategies.tbl}
 	\end{center}
 	\caption{Development strategies and their suitability for requirements}
 	\label{tab:strategies}
diff -r 397e94509bd9 -r c80b6b6fb798 thesis/tex/5-Improvements.tex
--- a/thesis/tex/5-Improvements.tex	Thu Jan 15 12:16:20 2009 +0100
+++ b/thesis/tex/5-Improvements.tex	Thu Jan 15 12:16:43 2009 +0100
@@ -463,7 +463,7 @@
 
 \begin{table}
 	\begin{center}
-		\input{input/new-masqmail-permissions.tex}
+		\input{tbl/new-masqmail-permissions.tbl}
 	\end{center}
 	\caption{Ownership and permissions of the modules}
 	\label{tab:new-masqmail-permission}