Commit f881839e authored by Natanael Copa's avatar Natanael Copa

main/dansguardian: build against libstdc++

uclibc++ is broken
parent 73dee2ba
......@@ -2,29 +2,29 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dansguardian
pkgver=2.10.1.1
pkgrel=4
pkgrel=5
pkgdesc="Web content filter"
url="http://dansguardian.org"
license="GPL"
depends="logrotate"
makedepends="zlib-dev uclibc++-dev pcre-dev pkgconfig libiconv-dev"
makedepends="zlib-dev pcre-dev pkgconfig libiconv-dev"
install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-doc"
source="http://dansguardian.org/downloads/2/Stable/$pkgname-$pkgver.tar.gz
dansguardian.initd
dansguardian.logrotate
ftp-credential.patch
dansguardian-2.10.1.1-gcc44.patch
"
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 -i ../ftp-credential.patch || return 1
patch -p1 -i ../dansguardian-2.10.1.1-gcc44.patch || return 1
# do not block "microsoft...clustimg=..." and similar
sed -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist
export CXX=${CXX_UC:-g++-uc}
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
......@@ -44,4 +44,5 @@ build() {
md5sums="0987a1c9bfbdf398118386f10279611a dansguardian-2.10.1.1.tar.gz
c307df7e0aba114cb6199bad48a0416a dansguardian.initd
85b6de01c9508e8ceff5ebb55752f8d3 dansguardian.logrotate
475c46026e8553181d293d5a4feaf6d9 ftp-credential.patch"
475c46026e8553181d293d5a4feaf6d9 ftp-credential.patch
2c78b5c7346b8fcb3dee352e0c53cb5a dansguardian-2.10.1.1-gcc44.patch"
diff -Nru 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-05 01:15:52.000000000 +0200
@@ -44,6 +44,7 @@
#include <istream>
#ifdef ENABLE_ORIG_IP
+#include <limits.h>
#include <linux/types.h>
#include <linux/netfilter_ipv4.h>
#endif
diff -Nru 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-05 01:15:12.000000000 +0200
@@ -26,6 +26,7 @@
#include "../HTMLTemplate.hpp"
#include "../ConnectionHandler.hpp"
+#include <stdio.h>
#include <syslog.h>
#include <sys/time.h>
#include <sys/types.h>
diff -Nru dansguardian-2.10.1.1.orig/src/String.cpp dansguardian-2.10.1.1/src/String.cpp
--- dansguardian-2.10.1.1.orig/src/String.cpp 2009-01-16 11:44:28.000000000 +0100
+++ dansguardian-2.10.1.1/src/String.cpp 2009-07-05 01:15:12.000000000 +0200
@@ -164,9 +164,9 @@
return 0;
off_t t = 0;
if (sizeof(off_t) == 4)
- sscanf(this->c_str(), "%d", &t);
+ sscanf(this->c_str(), "%d", (long *)&t);
else if (sizeof(off_t) == 8)
- sscanf(this->c_str(), "%lld", &t);
+ sscanf(this->c_str(), "%lld", (long long*)&t);
return t;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment