Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
This commit is contained in:
Michael Tremer
commit
cb5b1e1436
|
|
@ -1,53 +0,0 @@
|
|||
###############################################################################
|
||||
# IPFire.org - An Open Source Firewall Solution #
|
||||
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
|
||||
###############################################################################
|
||||
|
||||
name = dansguardian
|
||||
version = 2.10.1.1
|
||||
release = 1
|
||||
|
||||
groups = Networking/Proxy
|
||||
url = http://www.dansguardian.org/
|
||||
license = GPLv2+
|
||||
summary = A content filtering web proxy.
|
||||
|
||||
description
|
||||
DansGuardian filters the content of pages based on many methods including
|
||||
phrase matching, PICS filtering and URL filtering. It does not purely filter
|
||||
based on a banned list of sites.
|
||||
|
||||
It provides real-time virus scanning capabilities for content access.
|
||||
|
||||
DansGuardian is designed to be completely flexible and allows you to tailor the
|
||||
filtering to your exact needs. It can be as draconian or as unobstructive as
|
||||
you want. The default settings are geared towards what a primary school might
|
||||
want but DansGuardian puts you in control of what you want to block.
|
||||
|
||||
DansGuardian requires squid or another similar caching proxy server on your
|
||||
local network.
|
||||
end
|
||||
|
||||
source_dl =
|
||||
|
||||
build
|
||||
requires
|
||||
gcc-c++
|
||||
pcre-devel
|
||||
pkg-config
|
||||
zlib-devel
|
||||
end
|
||||
|
||||
configure_options += \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var
|
||||
end
|
||||
|
||||
packages
|
||||
package %{name}
|
||||
end
|
||||
|
||||
package %{name}-debuginfo
|
||||
template DEBUGINFO
|
||||
end
|
||||
end
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
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>
|
||||
14
sed/sed.nm
14
sed/sed.nm
|
|
@ -4,8 +4,8 @@
|
|||
###############################################################################
|
||||
|
||||
name = sed
|
||||
version = 4.2.1
|
||||
release = 3
|
||||
version = 4.2.2
|
||||
release = 1
|
||||
|
||||
groups = Applications/Text
|
||||
url = http://sed.sourceforge.net/
|
||||
|
|
@ -13,14 +13,14 @@ license = GPLv2+
|
|||
summary = A GNU stream text editor.
|
||||
|
||||
description
|
||||
The sed (Stream EDitor) editor is a stream or batch (non-interactive) \
|
||||
editor. Sed takes text as input, performs an operation or set of \
|
||||
operations on the text and outputs the modified text. The operations \
|
||||
that sed performs (substitutions, deletions, insertions, etc.) can be \
|
||||
The sed (Stream EDitor) editor is a stream or batch (non-interactive)
|
||||
editor. Sed takes text as input, performs an operation or set of
|
||||
operations on the text and outputs the modified text. The operations
|
||||
that sed performs (substitutions, deletions, insertions, etc.) can be
|
||||
specified in a script file or from the command line.
|
||||
end
|
||||
|
||||
source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
|
||||
source_dl = ftp://ftp.gnu.org/gnu/sed/
|
||||
|
||||
build
|
||||
requires
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff -urNp tar-1.26-orig/gnu/stdio.in.h tar-1.26/gnu/stdio.in.h
|
||||
--- tar-1.26-orig/gnu/stdio.in.h
|
||||
+++ tar-1.26/gnu/stdio.in.h
|
||||
@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
|
||||
so any use of gets warrants an unconditional warning. Assume it is
|
||||
always declared, since it is required by C89. */
|
||||
#undef gets
|
||||
+#if HAVE_RAW_DECL_GETS
|
||||
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
+#endif
|
||||
|
||||
#if @GNULIB_FOPEN@
|
||||
# if @REPLACE_FOPEN@
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
name = tar
|
||||
version = 1.26
|
||||
release = 4
|
||||
release = 5
|
||||
|
||||
groups = System/Packaging
|
||||
url = http://www.gnu.org/software/tar/
|
||||
|
|
|
|||
Loading…
Reference in New Issue