Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

network/dansguardian: Miscellaneous cleanups and patch.

Browse source 
Cleaned up build and patched to build with gcc4.4.
This commit is contained in:
dsomero 2010-05-25 19:04:50 -04:00 committed by David Somero
parent 859bb8b2d4
commit b6b256c666
2 changed files with 71 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
network/dansguardian/dansguardian-2.10.1.1-gcc44.patch Normal file
View file

@ -0,0 +1,55 @@
diff -ruN dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp dansguardian-2.10.1.1/src/ConnectionHandler.cpp
--- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100
+++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-07-15 12:02:09.801533048 +0200
@@ -45,6 +45,7 @@
#ifdef ENABLE_ORIG_IP
#include <linux/types.h>
+#include <limits.h>
#include <linux/netfilter_ipv4.h>
#endif
diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/clamav.cpp dansguardian-2.10.1.1/src/contentscanners/clamav.cpp
--- dansguardian-2.10.1.1.orig/src/contentscanners/clamav.cpp 2008-11-18 12:27:04.000000000 +0100
+++ dansguardian-2.10.1.1/src/contentscanners/clamav.cpp 2009-07-15 11:59:12.316495912 +0200
@@ -26,6 +26,7 @@
#include "../ContentScanner.hpp"
#include "../OptionContainer.hpp"
+#include <cstdio>
#include <syslog.h>
#include <sys/time.h>
#include <sys/types.h>
diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/commandlinescan.cpp dansguardian-2.10.1.1/src/contentscanners/commandlinescan.cpp
--- dansguardian-2.10.1.1.orig/src/contentscanners/commandlinescan.cpp 2008-11-18 12:27:04.000000000 +0100
+++ dansguardian-2.10.1.1/src/contentscanners/commandlinescan.cpp 2009-07-15 11:59:12.317495697 +0200
@@ -28,6 +28,7 @@
#include "../OptionContainer.hpp"
#include "../RegExp.hpp"
+#include <cstdio>
#include <syslog.h>
#include <sys/time.h>
#include <sys/types.h>
diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/icapscan.cpp dansguardian-2.10.1.1/src/contentscanners/icapscan.cpp
--- dansguardian-2.10.1.1.orig/src/contentscanners/icapscan.cpp 2008-11-18 12:27:04.000000000 +0100
+++ dansguardian-2.10.1.1/src/contentscanners/icapscan.cpp 2009-07-15 11:59:12.318495062 +0200
@@ -29,6 +29,7 @@
#include "../ContentScanner.hpp"
#include "../OptionContainer.hpp"
+#include <cstdio>
#include <syslog.h>
#include <sys/time.h>
#include <sys/types.h>
diff -ruN dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp
--- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100
+++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-07-15 11:59:12.319495964 +0200
@@ -26,6 +26,7 @@
#include "../HTMLTemplate.hpp"
#include "../ConnectionHandler.hpp"
+#include <cstdio>
#include <syslog.h>
#include <sys/time.h>
#include <sys/types.h>

17
network/dansguardian/dansguardian.SlackBuild
View file

@ -51,10 +51,19 @@
PRGNAM=dansguardian
VERSION=${VERSION:-2.10.1.1}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) export ARCH=i486 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@ -84,6 +93,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi
set -e
@ -101,6 +113,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
# Fix building with gcc4.4.
patch -p1 < $CWD/dansguardian-2.10.1.1-gcc44.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \