diff --git a/daq/daq.SlackBuild b/daq/daq.SlackBuild index 071e1d7fad..4666724463 100644 --- a/daq/daq.SlackBuild +++ b/daq/daq.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for daq # -# Copyright 2011-2014 Corrado Franco (http://conraid.net) +# Copyright 2011-2015 Corrado Franco (http://conraid.net) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,95 +31,95 @@ set -eu CWD=$(pwd) PRGNAME=${PRGNAME:-daq} -PKGNAME=$(echo $PRGNAME | tr A-Z a-z) -VERSION=${VERSION:-2.0.4} -PKGVERSION=$(echo $VERSION | tr - _) +PKGNAME=$(echo ${PRGNAME} | tr A-Z a-z) +VERSION=${VERSION:-2.0.5} +PKGVERSION=${VERSION//-/_} BUILD=${BUILD:-1} TAG=${TAG:-cf} TMP=${TMP:-/tmp/pkg} -PKG=$TMP/package-$PKGNAME -DOCS="$PKG/usr/doc/$PKGNAME-$PKGVERSION" +PKG=${TMP}/package-${PKGNAME} +PKGDOCDIR="${PKG}/usr/doc/${PKGNAME}-${PKGVERSION}" # Insert document files in this variable DOCFILES=" COPYING ChangeLog README" -ARCH=${ARCH:=""} # Set ARCH or leave blank to determine it automatically/ # Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then +if [ -z ${ARCH:=""} ]; then case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$( uname -m ) ;; + i?86) ARCH=i686 ;; + arm*) ARCH=arm ;; + # Unless ${ARCH} is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; esac fi # Set compiling FLAGS -case "$ARCH" in +case "${ARCH}" in i486) - SLKCFLAGS="-O2 -march=i486 -mtune=i686"; CHOST="i486" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; + SLKCFLAGS="-O2 -march=i486 -mtune=i686"; CHOST="i486" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; i686) - SLKCFLAGS="-O2 -march=i686 -pipe -fomit-frame-pointer"; CHOST="i486" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; + SLKCFLAGS="-O2 -march=i686 -fomit-frame-pointer"; CHOST="i486" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; x86_64) - SLKCFLAGS="-O2 -fPIC -pipe -fomit-frame-pointer"; CHOST="x86_64" - SLKLDFLAGS="-L/lib64 -L/usr/lib64"; LIBDIRSUFFIX="64" - ;; + SLKCFLAGS="-O2 -fPIC -fomit-frame-pointer"; CHOST="x86_64" + SLKLDFLAGS="-L/lib64 -L/usr/lib64"; LIBDIRSUFFIX="64" + ;; *) - SLKCFLAGS="-O2"; CHOST=$ARCH - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; + SLKCFLAGS="-O2"; CHOST=${ARCH} + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; esac # Extract source and prepare: -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PRGNAME-$VERSION -tar xvf $CWD/daq-$VERSION.tar.gz -cd $PRGNAME-$VERSION +rm -rf ${PKG} +mkdir -p ${TMP} ${PKG} +cd ${TMP} +rm -rf ${PRGNAME}-${VERSION} +tar xvf ${CWD}/daq-${VERSION}.tar.gz +cd ${PRGNAME}-${VERSION} # Make sure ownerships and permissions are sane: chown -R root:root . chmod -R u+w,go+r-w,a-s . # Configure -LDFLAGS="$SLKLDFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="${SLKLDFLAGS}" \ +CFLAGS="${SLKCFLAGS}" \ +CXXFLAGS="${SLKCFLAGS}" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-ipv6 \ - --enable-static=yes \ - --host=$CHOST-slackware-linux \ - --build=$CHOST-slackware-linux + --enable-static=no \ + --with-libpcap-includes=/usr/include \ + --with-libpcap-libraries=/usr/lib${LIBDIRSUFFIX} \ + --host=${CHOST}-slackware-linux \ + --build=${CHOST}-slackware-linux # Build and install: -make -make DESTDIR=$PKG install-strip +make -j1 +make DESTDIR=${PKG} install-strip -# Add a documentation directory: -mkdir -p ${DOCS} -for i in ${DOCFILES}; do - if [ -e "${i}" ]; then - if ! [ -L "${i}" ]; then - cp -a "${i}" ${DOCS} - else - cp -LRp "${i}" ${DOCS} - fi - fi; +# If not using static-libs don't install the static libraries +# This has been bugged upstream +for LIB in libdaq_static libdaq_static_modules; do + rm ${PKG}/usr/lib${LIBDIRSUFFIX}/${LIB}.a done +rm ${PKG}/usr/lib${LIBDIRSUFFIX}/libdaq_static* + +# Add a documentation directory: +mkdir -p ${PKGDOCDIR} +cp -a ${DOCFILES} ${PKGDOCDIR} || true # Add a slackbuild script: -install -Dm644 $CWD/$PKGNAME.SlackBuild $DOCS/$PKGNAME.SlackBuild +install -Dm644 ${CWD}/${PKGNAME}.SlackBuild ${PKGDOCDIR}/${PKGNAME}.SlackBuild # Add slack-desc -install -Dm644 $CWD/slack-desc $PKG/install/slack-desc +install -Dm644 ${CWD}/slack-desc ${PKG}/install/slack-desc # Create package: -cd $PKG -/sbin/makepkg -l y -c n $CWD/$PKGNAME-$PKGVERSION-$ARCH-${BUILD}${TAG}.txz +cd ${PKG} +/sbin/makepkg -l y -c n ${CWD}/${PKGNAME}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz diff --git a/daq/daq.info b/daq/daq.info index d617070caf..2d60e3ae9b 100644 --- a/daq/daq.info +++ b/daq/daq.info @@ -1,8 +1,8 @@ NAME="daq" -VERSION="2.0.4" +VERSION="2.0.5" HOMEPAGE="http://www.snort.org" -DOWNLOAD="http://www.snort.org/downloads/snort/daq-2.0.4.tar.gz" -FILENAME="daq-2.0.4.tar.gz" -MD5SUM="65e51d72e9d5d8b397e192e4e5857eff" +DOWNLOAD="http://www.snort.org/downloads/snort/daq-2.0.5.tar.gz" +FILENAME="daq-2.0.5.tar.gz" REQUIRES="" -SHASUM="f2d798e303959c8f2d4a31481f4983fc4d8ba1d9" +MD5SUM="75c00d23f9536bc8da419375f38222cb" +SHASUM="a57d8a30454f4e2e7f784822d492eb444b38abfe"