summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/barnyard2/barnyard2.SlackBuild18
-rw-r--r--network/barnyard2/barnyard2.info2
-rw-r--r--network/barnyard2/doinst.sh1
3 files changed, 9 insertions, 12 deletions
diff --git a/network/barnyard2/barnyard2.SlackBuild b/network/barnyard2/barnyard2.SlackBuild
index 3b3f96a711..da57397e9c 100644
--- a/network/barnyard2/barnyard2.SlackBuild
+++ b/network/barnyard2/barnyard2.SlackBuild
@@ -32,7 +32,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,7 +62,7 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-2-$VERSION
tar xvf $CWD/$PRGNAM-2-$VERSION.tar.gz
cd $PRGNAM-2-$VERSION
chown -R root:root .
@@ -70,7 +70,7 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -89,7 +89,7 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
@@ -97,7 +97,7 @@ mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
# Include rc.barnyard2 file
mkdir -p $PKG/etc/rc.d
cat $CWD/rc.barnyard2 > $PKG/etc/rc.d/rc.barnyard2.new
-chmod 0755 $PKG/etc/rc.d/rc.barnyard2.new
+chmod 0644 $PKG/etc/rc.d/rc.barnyard2.new
# Create directory for log
mkdir -p $PKG/var/log/$PRGNAM
@@ -107,9 +107,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/schemas
for sc in schemas/create_*; do
cat $sc > $PKG/usr/doc/$PRGNAM-$VERSION/$sc
done
-cp -a \
- COPYING LICENSE RELEASE.NOTES doc/* \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING LICENSE RELEASE.NOTES doc/* $PKG/usr/doc/$PRGNAM-$VERSION
find $PKG/usr/doc/$PRGNAM-$VERSION -name "Makefile*" -exec rm -f {} \;
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/network/barnyard2/barnyard2.info b/network/barnyard2/barnyard2.info
index 1c6ef981dd..5600ea402c 100644
--- a/network/barnyard2/barnyard2.info
+++ b/network/barnyard2/barnyard2.info
@@ -1,7 +1,7 @@
PRGNAM="barnyard2"
VERSION="1.13"
HOMEPAGE="http://www.securixlive.com/barnyard2/"
-DOWNLOAD="https://github.com/firnsy/barnyard2/archive/v2-1.13.tar.gz"
+DOWNLOAD="https://github.com/firnsy/barnyard2/archive/v2-1.13/barnyard2-2-1.13.tar.gz"
MD5SUM="212066058364f18a4806720b271ffd87"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/network/barnyard2/doinst.sh b/network/barnyard2/doinst.sh
index 898ed74319..00c1fcd7a4 100644
--- a/network/barnyard2/doinst.sh
+++ b/network/barnyard2/doinst.sh
@@ -23,4 +23,3 @@ preserve_perms() {
preserve_perms etc/rc.d/rc.barnyard2.new
config etc/barnyard2.conf.new
-