Sebastian Jaenicke:

added cyrus-sasl2 and modify cyrus-sasl to allow them to co-exist. 
updated snmpsession (1.00), nessus (2.0.10a), rrdtool (1.0.46), xinetd (2.3.13),
ypserv (2.12.1) and xmms-crossfade (0.3.4)
[2004030903143703085] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2520 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/tsa/cyrus-sasl/cyrus-sasl.conf

@@ -21,7 +21,10 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 var_append confopt ' ' '--disable-krb4'
+var_append confopt ' ' '--includedir=/$prefix/include/sasl'
 
 # have to use gdbm for now since bdb4 isn't supported
 var_append confopt ' ' '--with-dblib=gdbm'
 
+var_append INSTALL_WRAPPER_FILTER "|" \
+	'sed -e "s,man3/sasl.3,man3/sasl1_sasl.3,"'

package/tsa/cyrus-sasl2/cyrus-sasl2.conf

@@ -0,0 +1,24 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/tsa/cyrus-sasl2/cyrus-sasl2.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+var_append confopt ' ' '--includedir=/$prefix/include/sasl2'
+

package/tsa/cyrus-sasl2/cyrus-sasl2.desc

@@ -0,0 +1,41 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/tsa/cyrus-sasl2/cyrus-sasl2.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] SASL is the Simple Authentication and Security Layer
+
+[T] SASL is the Simple Authentication and Security Layer
+
+[U] http://asg.web.cmu.edu/sasl/ 
+
+[A] Cyrus staff at CMU
+[M] Sebastian Jaenicke <tsa@jaenicke.org>
+
+[C] base/library
+
+[L] OpenSource
+[S] Stable
+[V] 2.1.17
+[P] X -----5---9 227.000
+
+[D] 1767045939 cyrus-sasl-2.1.17.tar.gz ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+

package/tsa/cyrus-sasl2/sasl2_includes.patch

@@ -0,0 +1,24 @@
+diff -Nur cyrus-sasl-2.1.17.orig/include/Makefile.in cyrus-sasl-2.1.17/include/Makefile.in
+--- cyrus-sasl-2.1.17.orig/include/Makefile.in	2003-12-01 17:35:06.000000000 +0100
++++ cyrus-sasl-2.1.17/include/Makefile.in	2004-01-13 22:03:41.000000000 +0100
+@@ -226,7 +226,7 @@
+ 
+ noinst_HEADERS = gai.h exits.h
+ 
+-saslincludedir = $(includedir)/sasl
++saslincludedir = $(includedir)
+ saslinclude_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h
+ 
+ noinst_PROGRAMS = makemd5
+diff -Nur cyrus-sasl-2.1.17.orig/utils/Makefile.in cyrus-sasl-2.1.17/utils/Makefile.in
+--- cyrus-sasl-2.1.17.orig/utils/Makefile.in	2003-12-01 17:35:08.000000000 +0100
++++ cyrus-sasl-2.1.17/utils/Makefile.in	2004-01-13 22:05:19.000000000 +0100
+@@ -253,7 +253,7 @@
+ smtptest_DEPENDENCIES = ./smtptest.lo ./libsfsasl2.la
+ smtptest_LDADD = ./smtptest.lo ./libsfsasl2.la @SFIO_LIB_FLAGS@ @DMALLOC_LIBS@ $(all_sasl_libs)
+ 
+-saslincludedir = $(includedir)/sasl
++saslincludedir = $(includedir)
+ 
+ saslinclude_HEADERS = @SASL_UTIL_HEADERS_EXTRA@
+ EXTRA_HEADERS = sfsasl.h

package/tsa/nessus/nessus.desc

@@ -23,21 +23,22 @@
 
 [I] Nessus security scanner
 
-[T] The "Nessus" Project aims to provide to the internet community a free, powerful,
-[T] up-to-date and easy to use remote security scanner.
+[T] The "Nessus" Project aims to provide to the Internet community a free,
+[T] powerful, up-to-date and easy to use remote security scanner.
 [T]
-[T] A security scanner is a software which will audit remotely a given network and
-[T] determine whether bad guys (aka 'crackers') may break into it, or misuse it in
-[T] some way.
+[T] A security scanner is a software which will audit remotely a given network
+[T] and determine whether bad guys (aka 'crackers') may break into it, or 
+[T] misuse it in some way.
 [T]
-[T] Unlike many other security scanners, Nessus does not take anything for granted.
-[T] That is, it will not consider that a given service is running on a fixed port -
-[T] that is, if you run your web server on port 1234, Nessus will detect it and test
-[T] its security. It will not make its security tests regarding the version number of
-[T] the remote services, but will really attempt to exploit the vulnerability.
+[T] Unlike many other security scanners, Nessus does not take anything for 
+[T] granted. That is, it will not consider that a given service is running on
+[T] a fixed port - that is, if you run your web server on port 1234, Nessus 
+[T] will detect it and test its security. It will not make its security tests
+[T] regarding the version number of the remote services, but will really 
+[T] attempt to exploit the vulnerability.
 [T]
-[T] Nessus is very fast, reliable and has a modular architecture that allows you to
-[T] fit it to your needs.
+[T] Nessus is very fast, reliable and has a modular architecture that allows 
+[T] you to fit it to your needs.
 
 [A] Renaud Deraison <deraison@cvs.nessus.org>
 [M] Sebastian Jaenicke <tsa@rocklinux.org>
@@ -46,11 +47,11 @@
 
 [L] GPL
 [S] Stable
-[V] 2.0.8a
+[V] 2.0.10a
 [P] X -----5---9 363.000
 
-[D] 2992713079 libnasl-2.0.8a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.8a/src/
-[D] 1498255473 nessus-core-2.0.8a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.8a/src/
-[D] 1424077425 nessus-libraries-2.0.8a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.8a/src/
-[D] 4241988462 nessus-plugins-2.0.8a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.8a/src/
+[D] 447104428 libnasl-2.0.10a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.10a/src/
+[D] 996379524 nessus-core-2.0.10a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.10a/src/
+[D] 463257632 nessus-libraries-2.0.10a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.10a/src/
+[D] 2617730317 nessus-plugins-2.0.10a.tar.gz ftp://ftp.nessus.org/pub/nessus/nessus-2.0.10a/src/
 

package/tsa/rrdtool/rrdtool.desc

@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.0.45
+[V] 1.0.46
 [P] X -----5---9 318.000
 
-[D] 328551280 rrdtool-1.0.45.tar.gz http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
+[D] 1416231091 rrdtool-1.0.46.tar.gz http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 

package/tsa/snmpsession/snmpsession.desc

@@ -36,8 +36,8 @@
 
 [L] OpenSource
 [S] Stable
-[V] 0.98
+[V] 1.00
 [P] X -----5---9 364.000
 
-[D] 2729035413 SNMP_Session-0.98.tar.gz ftp://ftp.switch.ch/software/sources/network/snmp/perl/
+[D] 4192185833 SNMP_Session-1.00.tar.gz ftp://ftp.switch.ch/software/sources/network/snmp/perl/
 

package/tsa/xinetd/xinetd.desc

@@ -42,8 +42,8 @@
 
 [L] Free-to-use
 [S] Stable
-[V] 2.3.12
+[V] 2.3.13
 [P] X -----5---9 365.000
 
-[D] 2749408855 xinetd-2.3.12.tar.gz http://www.synack.net/xinetd/
+[D] 3973223100 xinetd-2.3.13.tar.gz http://www.synack.net/xinetd/
 

package/tsa/xmms-crossfade/xmms-crossfade.desc

@@ -37,7 +37,7 @@
 
 [L] GPL
 [S] Beta
-[V] 0.3.3
+[V] 0.3.4
 [P] X -----5---9 482.000
 
-[D] 1100981973 xmms-crossfade-0.3.3.tar.gz http://www.mynetcologne.de/~nc-eisenlpe2/xmms-crossfade/
+[D] 2532100701 xmms-crossfade-0.3.4.tar.gz http://www.mynetcologne.de/~nc-eisenlpe2/xmms-crossfade/

package/tsa/ypserv/ypserv.desc

@@ -38,7 +38,7 @@
 
 [L] GPL
 [S] Stable
-[V] 2.9
+[V] 2.12.1
 [P] X -----5---9 140.000
 
-[D] 2850988442 ypserv-2.9.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/net/NIS/
+[D] 1317159809 ypserv-2.12.1.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/net/NIS/