← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dansguardian/trusty

~ubuntu-branches/ubuntu/trusty/dansguardian/trusty

« back to all changes in this revision

Viewing changes to debian/patches/11_FixOptionContainer.cpp_on_arm.dpatch

Committer: Bazaar Package Importer
Author(s): Alexander Wirt, Thomas Viehmann
Date: 2008-10-13 09:29:35 UTC
mfrom: (1.1.7 upstream) (7.1.1 squeeze)
Revision ID: james.westby@ubuntu.com-20081013092935-g8uz3kgfjs37ikgv

Tags: 2.9.9.7-2

http://bugs.debian.org/493047

[ Thomas Viehmann ]
OptionContainer.cpp: If you need to iterate through all lines in the
config file to find a field, at least don't abuse the configfile deque
by accessing it as if it was an array with signed index.
Works way better on arm, too, i.e. closes: #493047.

files added:
configs/lists/phraselists/goodphrases/weighted_general_polish

configs/lists/phraselists/pornography/weighted_polish

debian/patches/10_dont_ban_general.dpatch

debian/patches/11_FixOptionContainer.cpp_on_arm.dpatch

src/IPList.cpp

src/IPList.hpp

files removed:
debian/patches/09_fix_gcc4.3.dpatch

src/platform.h

src/platform.h.in

files modified:
Makefile.in

aclocal.m4

configs/Makefile.am

configs/Makefile.in

configs/authplugins/Makefile.am

configs/authplugins/Makefile.in

configs/contentscanners/Makefile.am

configs/contentscanners/Makefile.in

configs/downloadmanagers/Makefile.am

configs/downloadmanagers/Makefile.in

configs/lists/Makefile.am

configs/lists/Makefile.in

configs/lists/authplugins/Makefile.am

configs/lists/authplugins/Makefile.in

configs/lists/bannediplist

configs/lists/bannedregexpurllist

configs/lists/blacklists/Makefile.am

configs/lists/blacklists/Makefile.in

configs/lists/contentscanners/Makefile.am

configs/lists/contentscanners/Makefile.in

configs/lists/downloadmanagers/Makefile.am

configs/lists/downloadmanagers/Makefile.in

configs/lists/exceptioniplist

configs/lists/phraselists/Makefile.am

configs/lists/phraselists/Makefile.in

configure

configure.ac

data/Makefile.in

data/languages/Makefile.in

data/scripts/Makefile.in

debian/changelog

debian/patches/00list

debian/postinst

dgconfig.h.in

doc/Makefile.in

doc/Plugins

src/Auth.cpp

src/Auth.hpp

src/BaseSocket.cpp

src/BaseSocket.hpp

src/ConfigVar.cpp

src/ConnectionHandler.cpp

src/ConnectionHandler.hpp

src/ContentScanner.cpp

src/ContentScanner.hpp

src/DataBuffer.cpp

src/DataBuffer.hpp

src/DownloadManager.cpp

src/DownloadManager.hpp

src/DynamicIPList.cpp

src/DynamicIPList.hpp

src/DynamicURLList.cpp

src/DynamicURLList.hpp

src/FDFuncs.cpp

src/FDFuncs.hpp

src/FDTunnel.cpp

src/FDTunnel.hpp

src/FOptionContainer.cpp

src/FOptionContainer.hpp

src/FatController.cpp

src/HTMLTemplate.cpp

src/HTTPHeader.cpp

src/HTTPHeader.hpp

src/ImageContainer.cpp

src/ImageContainer.hpp

src/LanguageContainer.cpp

src/LanguageContainer.hpp

src/ListContainer.cpp

src/ListContainer.hpp

src/ListManager.cpp

src/ListManager.hpp

src/Makefile.am

src/Makefile.in

src/NaughtyFilter.cpp

src/NaughtyFilter.hpp

src/OptionContainer.cpp

src/OptionContainer.hpp

src/Plugin.hpp

src/RegExp.cpp

src/RegExp.hpp

src/Socket.cpp

src/Socket.hpp

src/SocketArray.cpp

src/SocketArray.hpp

src/String.cpp

src/String.hpp

src/SysV.cpp

src/SysV.hpp

src/UDSocket.cpp

src/UDSocket.hpp

src/authplugins/digest.cpp

src/authplugins/ident.cpp

src/authplugins/ip.cpp

src/authplugins/ntlm.cpp

src/authplugins/proxy.cpp

src/contentscanners/clamav.cpp

src/contentscanners/clamdscan.cpp

src/contentscanners/commandlinescan.cpp

src/contentscanners/icapscan.cpp

src/contentscanners/kavdscan.cpp

src/dansguardian.cpp

src/downloadmanagers/default.cpp

src/downloadmanagers/fancy.cpp

src/downloadmanagers/trickle.cpp

src/md5.cpp

Show diffs side-by-side

added added

removed removed

debian/patches/11_FixOptionContainer.cpp_on_arm.dpatch

1

#! /bin/sh /usr/share/dpatch/dpatch-run

2

## 11_FixOptionContainer.cpp_on_arm.dpatch by Alexander Wirt <formorer@debian.org>

3

##

4

## All lines beginning with `## DP:' are a description of the patch.

5

## DP: If you need to iterate through all lines in the

6

## config file to find a field, at least don't abuse the configfile deque

7

## by accessing it as if it was an array with signed index.

8

## Works way better on arm, too, i.e. closes: #493047.

9

10

@DPATCH@

11

diff -urNad dansguardian-2.9.9.7~/src/OptionContainer.cpp dansguardian-2.9.9.7/src/OptionContainer.cpp

12

--- dansguardian-2.9.9.7~/src/OptionContainer.cpp 2008-08-18 09:57:46.000000000 +0200

13

+++ dansguardian-2.9.9.7/src/OptionContainer.cpp 2008-10-13 09:23:20.000000000 +0200

14

@@ -662,8 +662,10 @@

15

String temp;

16

String temp2;

17

String o(option);

18

- for (int i = 0; i < (signed) conffile.size(); i++) {

19

- temp = conffile[i].c_str();

20

+ for (std::deque<std::string>::iterator i = conffile.begin(); i != conffile.end(); i++) {

21

+ if ((*i).empty())

22

+ continue;

23

+ temp = (*i).c_str();

24

temp2 = temp.before("=");

25

while (temp2.endsWith(" ")) { // get rid of tailing spaces before =

26

temp2.chop();

27

@@ -696,8 +698,10 @@

28

String temp2;

29

String o(option);

30

std::deque<String > results;

31

- for (int i = 0; i < (signed) conffile.size(); i++) {

32

- temp = conffile[i].c_str();

33

+ for (std::deque<std::string>::iterator i = conffile.begin(); i != conffile.end(); i++) {

34

+ if ((*i).empty())

35

+ continue;

36

+ temp = (*i).c_str();

37

temp2 = temp.before("=");

38

while (temp2.endsWith(" ")) { // get rid of tailing spaces before =

39

temp2.chop();

Older »