diff --git a/system/rsyslog/README b/system/rsyslog/README index 89601b1dac..52f70523ee 100644 --- a/system/rsyslog/README +++ b/system/rsyslog/README @@ -19,3 +19,5 @@ PGSQL=yes|no (default: no), requires postgresql RELP=yes|no (default: no), requires librelp LIBDBI=yes|no (default: no), requires libdbi GNUTLS=yes|no (default: no), requires gnutls + +NOTE: docutils is only needed at compile time - not needed for runtime. diff --git a/system/rsyslog/config/rsyslog.conf b/system/rsyslog/config/rsyslog.conf index 64b586ff95..e4451c3b22 100644 --- a/system/rsyslog/config/rsyslog.conf +++ b/system/rsyslog/config/rsyslog.conf @@ -1,7 +1,7 @@ # /etc/rsyslog.conf Configuration file for rsyslog. # # For more information see -# /usr/doc/rsyslog-@VERSION@/html/rsyslog_conf.html +# rsyslog.conf (5) manpage or http://www.rsyslog.com/doc/rsyslog_conf.html ################# diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild index b4929db35a..8cfdadde8c 100644 --- a/system/rsyslog/rsyslog.SlackBuild +++ b/system/rsyslog/rsyslog.SlackBuild @@ -22,7 +22,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rsyslog -VERSION=${VERSION:-7.6.3} +VERSION=${VERSION:-8.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -83,7 +83,6 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-cached-man-pages \ --build=$ARCH-slackware-linux \ $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option @@ -92,7 +91,6 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/etc/rc.d/ cat $CWD/config/rsyslog.conf > $PKG/etc/rsyslog.conf.new -sed -i "s/@VERSION@/$VERSION/" $PKG/etc/rsyslog.conf.new cat $CWD/config/rc.rsyslogd > $PKG/etc/rc.d/rc.rsyslogd.new chmod 0755 $PKG/etc/rc.d/rc.rsyslogd.new @@ -108,11 +106,10 @@ done find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/*.{jpg,html,png} $PKG/usr/doc/$PRGNAM-$VERSION/html chmod -R 0644 $PKG/usr/doc/$PRGNAM-$VERSION/* cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info index f8122e7529..1dc7260499 100644 --- a/system/rsyslog/rsyslog.info +++ b/system/rsyslog/rsyslog.info @@ -1,10 +1,10 @@ PRGNAM="rsyslog" -VERSION="7.6.3" +VERSION="8.4.2" HOMEPAGE="http://www.rsyslog.com/" -DOWNLOAD="http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz" -MD5SUM="09c29847fff170bece92975f1bb05caa" +DOWNLOAD="http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.4.2.tar.gz" +MD5SUM="5d0f39d5a4fdd4b3b91d80450f17f22e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="%README% json-c libee libestr liblogging" +REQUIRES="%README% docutils json-c libee libestr liblogging" MAINTAINER="Christophe Trussardi" EMAIL="chris@teria.org"