1 files changed, 55 insertions, 11 deletions
diff --git a/system/syslog-ng/syslog-ng.SlackBuild b/system/syslog-ng/syslog-ng.SlackBuild
index d48861f7c5..eeba4000a3 100644
--- a/system/syslog-ng/syslog-ng.SlackBuild
+++ b/system/syslog-ng/syslog-ng.SlackBuild
@@ -22,8 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Updates and extras, thanks to Janos Szigetvari, Szekesfehervar, Hungary
+
 PRGNAM=syslog-ng
-VERSION=${VERSION:-3.7.3}
+VERSION=${VERSION:-3.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,6 +63,48 @@ case "$GEOIP" in
            *) GEOIP='--disable-geoip' ;;
 esac
 
+# Build without debug information by default
+DEBUG=${DEBUG:-no}
+case "$DEBUG" in
+         yes) DEBUG='--enable-debug' ;;
+           *) DEBUG='--disable-debug' ;;
+esac
+
+# Build without SQL support by default
+SQL=${SQL:-no}
+case "$SQL" in
+         yes) SQL='--enable-sql' ;;
+           *) SQL='--disable-sql' ;;
+esac
+
+# Build without MongoDB support by default
+MONGODB=${MONGODB:-no}
+case "$MONGODB" in
+         yes) MONGODB='--enable-mongodb' ;;
+           *) MONGODB='--disable-mongodb' ;;
+esac
+
+# Build without Riemann support by default
+RIEMANN=${RIEMANN:-no}
+case "$RIEMANN" in
+         yes) RIEMANN='--enable-riemann' ;;
+           *) RIEMANN='--disable-riemann' ;;
+esac
+
+# Build without support for Java-based destinations by default
+JAVA=${JAVA:-no}
+case "$JAVA" in
+         yes) JAVA='--enable-java --enable-java-modules' ;;
+           *) JAVA='--disable-java --disable-java-modules' ;;
+esac
+
+# Build with support for UDP source-address spoofing by default
+SPOOF_SOURCE=${SPOOF_SOURCE:-no}
+case "$SPOOF_SOURCE" in
+         yes) SPOOF_SOURCE='--enable-spoof-source' ;;
+           *) SPOOF_SOURCE='--disable-spoof-source' ;;
+esac
+
 set -e
 
 rm -rf $PKG
@@ -76,6 +120,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+[ -f configure ] || ./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,23 +130,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/syslog-ng \
   --localstatedir=/var \
   --with-pidfile-dir=/var/run \
+  --enable-manpages \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-dynamic-linking \
   --with-embedded-crypto \
-  $GEOIP \
+  $GEOIP $DEBUG $SQL $MONGODB \
+  $RIEMANN $JAVA $SPOOF_SOURCE \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-# Generate manual pages by hand
-for i in 1 5 8; do
-  xsltproc --xinclude --output $PKG/usr/man/man$i/ \
-    /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
-    doc/man/*.$i.xml
-done
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -124,10 +165,13 @@ install -D -m0644 -oroot -groot $CWD/syslog-ng.logrotate $PKG/etc/logrotate.d/sy
 mkdir -p $PKG/var/lib/syslog-ng
 
 # Cruft removal
-rmdir $PKG/usr/libexec
+[ -d $PKG/usr/libexec ] && rmdir $PKG/usr/libexec
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CONTRIBUTING.md COPYING INSTALL NEWS.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+# Copy whatever documentation upstream provides
+for i in AUTHORS CONTRIBUTING* COPYING GPL* INSTALL LGPL* NEWS* README* VERSION
+  do [ -f $i ] && cp -a $i $PKG/usr/doc/$PRGNAM-$VERSION
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE